Changes between Version 15 and Version 16 of Styles/ParkingLanes


Ignore:
Timestamp:
2022-01-22T18:13:27+01:00 (4 years ago)
Author:
riiga
Comment:

Update to reflect new approved proposal on parking lanes

Legend:

Unmodified
Added
Removed
Modified

  • Styles/ParkingLanes

    v15 v16  
    1717    link: "https://wiki.openstreetmap.org/wiki/Key:parking:lane";
    1818    icon: "blue-sign-with-car.svg";
    19     author: "Sebastian Klemm, Kay Drangmeister, Jeroen Hoek";
     19    author: "Sebastian Klemm, Kay Drangmeister, Jeroen Hoek, riiga";
    2020    version: "0.[[revision]]_[[date]]";
    2121    min-josm-version: "4399";
    2222}
     23
    2324
    2425meta[lang=de]
    … …  
    4546setting::show_warnings {
    4647  type: boolean;
    47   label: tr("Show warning symbols for incompatible tag values");
     48  label: tr("Show warning symbols for deprecated or incompatible tag values");
    4849  default: true;
    4950}
    … …  
    5556}
    5657
    57 /* Mark the parking:lane types that can have parking:conditional tags. */
    58 way[highway][parking:lane:right=~/^(parallel|perpendicular|diagonal|marked)$/]::parking_lanes_right,
    59 way[highway][parking:lane:both=~/^(parallel|perpendicular|diagonal|marked)$/]::parking_lanes_right
    60 {
    61     set conditional_type;
    62 }
    63 
    64 way[highway][parking:lane:left=~/^(parallel|perpendicular|diagonal|marked)$/]::parking_lanes_left,
    65 way[highway][parking:lane:both=~/^(parallel|perpendicular|diagonal|marked)$/]::parking_lanes_left
    66 {
    67     set conditional_type;
     58/* Mark deprecated tags. */
     59way[highway][parking:lane:right=~/^(no_parking|no_standing|no_stopping|fire_lane)$/]::parking_lanes_right,
     60way[highway][parking:lane:both=~/^(no_parking|no_standing|no_stopping|fire_lane)$/]::parking_lanes_right
     61{
     62    set deprecated_type;
     63}
     64
     65way[highway][parking:lane:left=~/^(no_parking|no_standing|no_stopping|fire_lane)$/]::parking_lanes_left,
     66way[highway][parking:lane:both=~/^(no_parking|no_standing|no_stopping|fire_lane)$/]::parking_lanes_left
     67{
     68    set deprecated_type;
     69}
     70
     71way[highway][parking:condition:right:default]::parking_lanes_right,
     72way[highway][parking:condition:both:default]::parking_lanes_right,
     73way[highway][parking:condition:right:time_interval]::parking_lanes_right,
     74way[highway][parking:condition:both:time_interval]::parking_lanes_right
     75{
     76    set deprecated_type;
     77}
     78
     79way[highway][parking:condition:left:default]::parking_lanes_left,
     80way[highway][parking:condition:both:default]::parking_lanes_left,
     81way[highway][parking:condition:left:time_interval]::parking_lanes_left,
     82way[highway][parking:condition:both:time_interval]::parking_lanes_left
     83{
     84    set deprecated_type;
    6885}
    6986
    7087way[highway][parking:lane:right]::parking_lanes_right,
    71 way[highway][parking:lane:both]::parking_lanes_right
     88way[highway][parking:lane:both]::parking_lanes_right/*,
     89way[highway][parking:condition:right]::parking_lanes_right,
     90way[highway][parking:condition:both]::parking_lanes_right*/
    7291{
    7392    z-index: -3;
    … …  
    7594}
    7695way[highway][parking:lane:left]::parking_lanes_left,
    77 way[highway][parking:lane:both]::parking_lanes_left
     96way[highway][parking:lane:both]::parking_lanes_left/*,
     97way[highway][parking:condition:left]::parking_lanes_left,
     98way[highway][parking:condition:both]::parking_lanes_left*/
    7899{
    79100    z-index: -3;
    … …  
    133154}
    134155
    135 way[highway][parking:lane:right=no_parking]::parking_lanes_right,
    136 way[highway][parking:lane:both=no_parking]::parking_lanes_right
    137 {
    138     color: orange;
     156way[highway][parking:lane:right=separate]::parking_lanes_right,
     157way[highway][parking:lane:both=separate]::parking_lanes_right
     158{
     159    repeat-image: images/separate-flipped.svg;
     160}
     161way[highway][parking:lane:left=separate]::parking_lanes_left,
     162way[highway][parking:lane:both=separate]::parking_lanes_left
     163{
     164    repeat-image: images/separate.svg;
     165}
     166
     167way[highway][parking:lane:right=no]::parking_lanes_right,
     168way[highway][parking:lane:both=no]::parking_lanes_right
     169{
    139170    width: 6;
    140171    dashes: 6, 12;
    141172}
    142 way[highway][parking:lane:left=no_parking]::parking_lanes_left,
    143 way[highway][parking:lane:both=no_parking]::parking_lanes_left
    144 {
    145     color: orange;
     173way[highway][parking:lane:left=no]::parking_lanes_left,
     174way[highway][parking:lane:both=no]::parking_lanes_left
     175{
    146176    width: 6;
    147177    dashes: 6, 12;
    148178}
    149179
    150 way[highway][parking:lane:right=no_stopping]::parking_lanes_right,
    151 way[highway][parking:lane:both=no_stopping]::parking_lanes_right
    152 {
    153     color: red;
    154     width: 6;
    155     dashes: 6, 12;
    156 }
    157 way[highway][parking:lane:left=no_stopping]::parking_lanes_left,
    158 way[highway][parking:lane:both=no_stopping]::parking_lanes_left
    159 {
    160     color: red;
    161     width: 6;
    162     dashes: 6, 12;
    163 }
    164 
    165 way[highway][parking:lane:right=fire_lane]::parking_lanes_right,
    166 way[highway][parking:lane:both=fire_lane]::parking_lanes_right
    167 {
    168     color: red;
     180way[highway][parking:lane:right=yes]::parking_lanes_right,
     181way[highway][parking:lane:both=yes]::parking_lanes_right
     182{
    169183    width: 9;
    170     dashes: 9, 13;
    171 }
    172 way[highway][parking:lane:left=fire_lane]::parking_lanes_left,
    173 way[highway][parking:lane:both=fire_lane]::parking_lanes_left
    174 {
    175     color: red;
     184    dashes: 5, 5;
     185}
     186way[highway][parking:lane:left=yes]::parking_lanes_left,
     187way[highway][parking:lane:both=yes]::parking_lanes_left
     188{
    176189    width: 9;
    177     dashes: 9, 13;
    178 }
    179 
    180 way[highway][parking:lane:right=separate]::parking_lanes_right,
    181 way[highway][parking:lane:both=separate]::parking_lanes_right
    182 {
    183     repeat-image: images/separate-flipped.svg;
    184 }
    185 way[highway][parking:lane:left=separate]::parking_lanes_left,
    186 way[highway][parking:lane:both=separate]::parking_lanes_left
    187 {
    188     repeat-image: images/separate.svg;
     190    dashes: 5, 5;
     191}
     192
     193/* Support ways without lane, but with condition */
     194way[highway][parking:condition:right][!parking:lane:right]::parking_lanes_right,
     195way[highway][parking:condition:both][!parking:lane:both]::parking_lanes_right
     196{
     197    width: 4;
     198    dashes: 4;
     199}
     200way[highway][parking:condition:left][!parking:lane:left]::parking_lanes_left,
     201way[highway][parking:condition:both][!parking:lane:both]::parking_lanes_left
     202{
     203    width: 4;
     204    dashes: 4;
    189205}
    190206
    191207way[highway][parking:lane:right]::parking_lanes_right,
    192 way[highway][parking:lane:both]::parking_lanes_right
     208way[highway][parking:lane:both]::parking_lanes_right,
     209way[highway][parking:condition:right]::parking_lanes_right,
     210way[highway][parking:condition:both]::parking_lanes_right
    193211{
    194212    offset: eval(0 - 4 - (prop("width") * 0.5) - (prop("width", "default") * 0.5));
    … …  
    200218
    201219way[highway][parking:lane:left]::parking_lanes_left,
    202 way[highway][parking:lane:both]::parking_lanes_left
     220way[highway][parking:lane:both]::parking_lanes_left,
     221way[highway][parking:condition:left]::parking_lanes_left,
     222way[highway][parking:condition:both]::parking_lanes_left
    203223{
    204224    offset: eval(4 + (prop("width") * 0.5) + (prop("width", "default") * 0.5));
    … …  
    209229}
    210230
    211 /* Parking conditions tagged on the way itself only make sense for certain parking:lane types. */
    212 way[highway][parking:condition:right]!.conditional_type::parking_lanes_right,
    213 way[highway][parking:condition:both]!.conditional_type::parking_lanes_right
     231/* Set warnings for deprecated tags. */
     232way[highway][parking:lane:right].deprecated_type::parking_lanes_right,
     233way[highway][parking:lane:both].deprecated_type::parking_lanes_right,
     234way[highway][parking:condition:right].deprecated_type::parking_lanes_right,
     235way[highway][parking:condition:both].deprecated_type::parking_lanes_right
    214236{
    215237    set warning;
    216238}
    217239
    218 way[highway][parking:condition:left]!.conditional_type::parking_lanes_left,
    219 way[highway][parking:condition:both]!.conditional_type::parking_lanes_left
     240way[highway][parking:lane:left].deprecated_type::parking_lanes_left,
     241way[highway][parking:lane:both].deprecated_type::parking_lanes_left,
     242way[highway][parking:condition:left].deprecated_type::parking_lanes_left,
     243way[highway][parking:condition:both].deprecated_type::parking_lanes_left
    220244{
    221245    set warning;
    … …  
    235259}
    236260
    237 way[highway][parking:condition:right=free][setting("highlight_conditions")].conditional_type::parking_lanes_right,
    238 way[highway][parking:condition:both=free][setting("highlight_conditions")].conditional_type::parking_lanes_right
    239 {
    240     color: #7fff00;
    241 }
    242 
    243 way[highway][parking:condition:left=free][setting("highlight_conditions")].conditional_type::parking_lanes_left,
    244 way[highway][parking:condition:both=free][setting("highlight_conditions")].conditional_type::parking_lanes_left
    245 {
    246     color: #7fff00;
    247 }
    248 
    249 way[highway][parking:condition:right=disc][setting("highlight_conditions")].conditional_type::parking_lanes_right,
    250 way[highway][parking:condition:both=disc][setting("highlight_conditions")].conditional_type::parking_lanes_right
     261way[highway][parking:condition:right=free][setting("highlight_conditions")]::parking_lanes_right,
     262way[highway][parking:condition:both=free][setting("highlight_conditions")]::parking_lanes_right
     263{
     264    color: chartreuse;
     265}
     266
     267way[highway][parking:condition:left=free][setting("highlight_conditions")]::parking_lanes_left,
     268way[highway][parking:condition:both=free][setting("highlight_conditions")]::parking_lanes_left
     269{
     270    color: chartreuse;
     271}
     272
     273way[highway][parking:condition:right=disc][setting("highlight_conditions")]::parking_lanes_right,
     274way[highway][parking:condition:both=disc][setting("highlight_conditions")]::parking_lanes_right
    251275{
    252276    color: #1c86ee;
    253277}
    254 way[highway][parking:condition:left=disc][setting("highlight_conditions")].conditional_type::parking_lanes_left,
    255 way[highway][parking:condition:both=disc][setting("highlight_conditions")].conditional_type::parking_lanes_left
     278way[highway][parking:condition:left=disc][setting("highlight_conditions")]::parking_lanes_left,
     279way[highway][parking:condition:both=disc][setting("highlight_conditions")]::parking_lanes_left
    256280{
    257281    color: #1c86ee;
    258282}
    259283
    260 way[highway][parking:condition:right=ticket][setting("highlight_conditions")].conditional_type::parking_lanes_right,
    261 way[highway][parking:condition:both=ticket][setting("highlight_conditions")].conditional_type::parking_lanes_right
     284way[highway][parking:condition:right=ticket][setting("highlight_conditions")]::parking_lanes_right,
     285way[highway][parking:condition:both=ticket][setting("highlight_conditions")]::parking_lanes_right
    262286{
    263287    color: #009999;
    264288}
    265 way[highway][parking:condition:left=ticket][setting("highlight_conditions")].conditional_type::parking_lanes_left,
    266 way[highway][parking:condition:both=ticket][setting("highlight_conditions")].conditional_type::parking_lanes_left
     289way[highway][parking:condition:left=ticket][setting("highlight_conditions")]::parking_lanes_left,
     290way[highway][parking:condition:both=ticket][setting("highlight_conditions")]::parking_lanes_left
    267291{
    268292    color: #009999;
    269293}
    270294
    271 way[highway][parking:condition:right=residents][setting("highlight_conditions")].conditional_type::parking_lanes_right,
    272 way[highway][parking:condition:both=residents][setting("highlight_conditions")].conditional_type::parking_lanes_right
    273 {
    274     color: #a33600;
    275 }
    276 way[highway][parking:condition:left=residents][setting("highlight_conditions")].conditional_type::parking_lanes_left,
    277 way[highway][parking:condition:both=residents][setting("highlight_conditions")].conditional_type::parking_lanes_left
    278 {
    279     color: #a33600;
    280 }
    281 
    282 way[highway][parking:condition:right=customers][setting("highlight_conditions")].conditional_type::parking_lanes_right,
    283 way[highway][parking:condition:both=customers][setting("highlight_conditions")].conditional_type::parking_lanes_right
     295way[highway][parking:condition:right=residents][setting("highlight_conditions")]::parking_lanes_right,
     296way[highway][parking:condition:both=residents][setting("highlight_conditions")]::parking_lanes_right
     297{
     298    color: darkviolet;
     299}
     300way[highway][parking:condition:left=residents][setting("highlight_conditions")]::parking_lanes_left,
     301way[highway][parking:condition:both=residents][setting("highlight_conditions")]::parking_lanes_left
     302{
     303    color: darkviolet;
     304}
     305
     306way[highway][parking:condition:right=customers][setting("highlight_conditions")]::parking_lanes_right,
     307way[highway][parking:condition:both=customers][setting("highlight_conditions")]::parking_lanes_right
    284308{
    285309    color: #ff3399;
    286310}
    287 way[highway][parking:condition:left=customers][setting("highlight_conditions")].conditional_type::parking_lanes_left,
    288 way[highway][parking:condition:both=customers][setting("highlight_conditions")].conditional_type::parking_lanes_left
     311way[highway][parking:condition:left=customers][setting("highlight_conditions")]::parking_lanes_left,
     312way[highway][parking:condition:both=customers][setting("highlight_conditions")]::parking_lanes_left
    289313{
    290314    color: #ff3399;
    291315}
    292316
    293 way[highway][parking:condition:right=private][setting("highlight_conditions")].conditional_type::parking_lanes_right,
    294 way[highway][parking:condition:both=private][setting("highlight_conditions")].conditional_type::parking_lanes_right
    295 {
    296     color: #ff0000;
    297 }
    298 way[highway][parking:condition:left=private][setting("highlight_conditions")].conditional_type::parking_lanes_left,
    299 way[highway][parking:condition:both=private][setting("highlight_conditions")].conditional_type::parking_lanes_left
    300 {
    301     color: #ff0000;
    302 }
    303 
    304 way[highway][parking:condition:right=disabled][setting("highlight_conditions")].conditional_type::parking_lanes_right,
    305 way[highway][parking:condition:both=disabled][setting("highlight_conditions")].conditional_type::parking_lanes_right
    306 {
    307     color: #ffd800;
    308 }
    309 way[highway][parking:condition:left=disabled][setting("highlight_conditions")].conditional_type::parking_lanes_left,
    310 way[highway][parking:condition:both=disabled][setting("highlight_conditions")].conditional_type::parking_lanes_left
    311 {
    312     color: #ffd800;
     317way[highway][parking:condition:right=private][setting("highlight_conditions")]::parking_lanes_right,
     318way[highway][parking:condition:both=private][setting("highlight_conditions")]::parking_lanes_right
     319{
     320    color: gold;
     321}
     322way[highway][parking:condition:left=private][setting("highlight_conditions")]::parking_lanes_left,
     323way[highway][parking:condition:both=private][setting("highlight_conditions")]::parking_lanes_left
     324{
     325    color: gold;
     326}
     327
     328way[highway][parking:condition:right=disabled][setting("highlight_conditions")]::parking_lanes_right,
     329way[highway][parking:condition:both=disabled][setting("highlight_conditions")]::parking_lanes_right
     330{
     331    color: turquoise;
     332}
     333way[highway][parking:condition:left=disabled][setting("highlight_conditions")]::parking_lanes_left,
     334way[highway][parking:condition:both=disabled][setting("highlight_conditions")]::parking_lanes_left
     335{
     336    color: turquoise;
     337}
     338
     339way[highway][parking:condition:right=no_parking][setting("highlight_conditions")]::parking_lanes_right,
     340way[highway][parking:condition:both=no_parking][setting("highlight_conditions")]::parking_lanes_right
     341{
     342    color: orange;
     343}
     344way[highway][parking:condition:left=no_parking][setting("highlight_conditions")]::parking_lanes_left,
     345way[highway][parking:condition:both=no_parking][setting("highlight_conditions")]::parking_lanes_left
     346{
     347    color: orange;
     348}
     349
     350way[highway][parking:condition:right=no_standing][setting("highlight_conditions")]::parking_lanes_right,
     351way[highway][parking:condition:both=no_standing][setting("highlight_conditions")]::parking_lanes_right
     352{
     353    color: salmon;
     354}
     355way[highway][parking:condition:left=no_standing][setting("highlight_conditions")]::parking_lanes_left,
     356way[highway][parking:condition:both=no_standing][setting("highlight_conditions")]::parking_lanes_left
     357{
     358    color: salmon;
     359}
     360
     361way[highway][parking:condition:right=no_stopping][setting("highlight_conditions")]::parking_lanes_right,
     362way[highway][parking:condition:both=no_stopping][setting("highlight_conditions")]::parking_lanes_right
     363{
     364    color: red;
     365}
     366way[highway][parking:condition:left=no_stopping][setting("highlight_conditions")]::parking_lanes_left,
     367way[highway][parking:condition:both=no_stopping][setting("highlight_conditions")]::parking_lanes_left
     368{
     369    color: red;
     370}
     371way[highway][parking:condition:right=no][setting("highlight_conditions")]::parking_lanes_right,
     372way[highway][parking:condition:both=no][setting("highlight_conditions")]::parking_lanes_right
     373{
     374    color: maroon;
     375}
     376way[highway][parking:condition:left=no][setting("highlight_conditions")]::parking_lanes_left,
     377way[highway][parking:condition:both=no][setting("highlight_conditions")]::parking_lanes_left
     378{
     379    color: maroon;
    313380}
    314381