Changes between Version 24 and Version 25 of Styles/Maxspeed


Ignore:
Timestamp:
2015-10-19T21:27:56+02:00 (10 years ago)
Author:
Klumbumbus
Comment:

change name of layer from "maxspeed" to "maxspeedlayer" for better understandablility of upcoming changes

Legend:

Unmodified
Added
Removed
Modified

  • Styles/Maxspeed

    v24 v25  
    7878
    7979/* display maxspeed=* */
    80 way["maxspeed"="none"]::maxspeed
     80way["maxspeed"="none"]::maxspeedlayer
    8181{
    8282        set maxspeed;
    … …  
    8484}
    8585        /* km/h */
    86 way["maxspeed"="5"]::maxspeed
     86way["maxspeed"="5"]::maxspeedlayer
    8787{
    8888        set maxspeed;
    8989        color: speed_5#ff5656;
    9090}
    91 way["maxspeed"="10"]::maxspeed
     91way["maxspeed"="10"]::maxspeedlayer
    9292{
    9393        set maxspeed;
    9494        color: speed_10#b80022;
    9595}
    96 way["maxspeed"="15"]::maxspeed
     96way["maxspeed"="15"]::maxspeedlayer
    9797{
    9898        set maxspeed;
    9999        color: speed_15#00da8b;
    100100}
    101 way["maxspeed"="20"]::maxspeed,
    102 way["maxspeed"="RU:living_street"][setting("RU")]::maxspeed
     101way["maxspeed"="20"]::maxspeedlayer,
     102way["maxspeed"="RU:living_street"][setting("RU")]::maxspeedlayer
    103103{
    104104        set maxspeed;
    105105        color: speed_20#e3cc82;
    106106}
    107 way["maxspeed"="30"]::maxspeed
     107way["maxspeed"="30"]::maxspeedlayer
    108108{
    109109        set maxspeed;
    110110        color: speed_30#4d4dff;
    111111}
    112 way["maxspeed"="40"]::maxspeed
     112way["maxspeed"="40"]::maxspeedlayer
    113113{
    114114        set maxspeed;
    115115        color: speed_40#4d4d00;
    116116}
    117 way["maxspeed"="45"]::maxspeed
     117way["maxspeed"="45"]::maxspeedlayer
    118118{
    119119        set maxspeed;
    120120        color: speed_45#ff529a;
    121121}
    122 way["maxspeed"="50"]::maxspeed
     122way["maxspeed"="50"]::maxspeedlayer
    123123{
    124124        set maxspeed;
    125125        color: speed_50#07f807;
    126126}
    127 way["maxspeed"="60"]::maxspeed,
    128 way["maxspeed"="RU:urban"][setting("RU")]::maxspeed
     127way["maxspeed"="60"]::maxspeedlayer,
     128way["maxspeed"="RU:urban"][setting("RU")]::maxspeedlayer
    129129{
    130130        set maxspeed;
    131131        color: speed_60#9f9fff;
    132132}
    133 way["maxspeed"="70"]::maxspeed
     133way["maxspeed"="70"]::maxspeedlayer
    134134{
    135135        set maxspeed;
    136136        color: speed_70#ee8b00;
    137137}
    138 way["maxspeed"="80"]::maxspeed
     138way["maxspeed"="80"]::maxspeedlayer
    139139{
    140140        set maxspeed;
    141141        color: speed_80#f90808;
    142142}
    143 way["maxspeed"="90"]::maxspeed,
    144 way["maxspeed"="RU:rural"][setting("RU")]::maxspeed
     143way["maxspeed"="90"]::maxspeedlayer,
     144way["maxspeed"="RU:rural"][setting("RU")]::maxspeedlayer
    145145{
    146146        set maxspeed;
    147147        color: speed_90#07f8f8;
    148148}
    149 way["maxspeed"="100"]::maxspeed
     149way["maxspeed"="100"]::maxspeedlayer
    150150{
    151151        set maxspeed;
    152152        color: speed_100#f807f8;
    153153}
    154 way["maxspeed"="110"]::maxspeed,
    155 way["maxspeed"="RU:motorway"][setting("RU")]::maxspeed
     154way["maxspeed"="110"]::maxspeedlayer,
     155way["maxspeed"="RU:motorway"][setting("RU")]::maxspeedlayer
    156156{
    157157        set maxspeed;
    158158        color: speed_110#7807f8;
    159159}
    160 way["maxspeed"="120"]::maxspeed
     160way["maxspeed"="120"]::maxspeedlayer
    161161{
    162162        set maxspeed;
    163163        color: speed_120#ccad24;
    164164}
    165 way["maxspeed"="130"]::maxspeed
     165way["maxspeed"="130"]::maxspeedlayer
    166166{
    167167        set maxspeed;
    … …  
    169169}
    170170        /* mph */
    171 way["maxspeed"="5 mph"]::maxspeed
     171way["maxspeed"="5 mph"]::maxspeedlayer
    172172{
    173173        set maxspeed;
    174174        color: speed_5_mph#b80022;
    175175}
    176 way["maxspeed"="10 mph"]::maxspeed
     176way["maxspeed"="10 mph"]::maxspeedlayer
    177177{
    178178        set maxspeed;
    179179        color: speed_10_mph#00da8b;
    180180}
    181 way["maxspeed"="15 mph"]::maxspeed
     181way["maxspeed"="15 mph"]::maxspeedlayer
    182182{
    183183        set maxspeed;
    184184        color: speed_15_mph#e3cc82;
    185185}
    186 way["maxspeed"="20 mph"]::maxspeed
     186way["maxspeed"="20 mph"]::maxspeedlayer
    187187{
    188188        set maxspeed;
    189189        color: speed_20_mph#4d4dff;
    190190}
    191 way["maxspeed"="25 mph"]::maxspeed
     191way["maxspeed"="25 mph"]::maxspeedlayer
    192192{
    193193        set maxspeed;
    194194        color: speed_25_mph#4d4d00;
    195195}
    196 way["maxspeed"="30 mph"]::maxspeed
     196way["maxspeed"="30 mph"]::maxspeedlayer
    197197{
    198198        set maxspeed;
    199199        color: speed_30_mph#ff529a;
    200200}
    201 way["maxspeed"="35 mph"]::maxspeed
     201way["maxspeed"="35 mph"]::maxspeedlayer
    202202{
    203203        set maxspeed;
    204204        color: speed_35_mph#07f807;
    205205}
    206 way["maxspeed"="40 mph"]::maxspeed
     206way["maxspeed"="40 mph"]::maxspeedlayer
    207207{
    208208        set maxspeed;
    209209        color: speed_40_mph#9f9fff;
    210210}
    211 way["maxspeed"="45 mph"]::maxspeed
     211way["maxspeed"="45 mph"]::maxspeedlayer
    212212{
    213213        set maxspeed;
    214214        color: speed_45_mph#ee8b00;
    215215}
    216 way["maxspeed"="50 mph"]::maxspeed
     216way["maxspeed"="50 mph"]::maxspeedlayer
    217217{
    218218        set maxspeed;
    219219        color: speed_50_mph#f90808;
    220220}
    221 way["maxspeed"="55 mph"]::maxspeed
     221way["maxspeed"="55 mph"]::maxspeedlayer
    222222{
    223223        set maxspeed;
    224224        color: speed_55_mph#07f8f8;
    225225}
    226 way["maxspeed"="60 mph"]::maxspeed
     226way["maxspeed"="60 mph"]::maxspeedlayer
    227227{
    228228        set maxspeed;
    229229        color: speed_60_mph#f807f8;
    230230}
    231 way["maxspeed"="65 mph"]::maxspeed
     231way["maxspeed"="65 mph"]::maxspeedlayer
    232232{
    233233        set maxspeed;
    234234        color: speed_65_mph#7807f8;
    235235}
    236 way["maxspeed"="70 mph"]::maxspeed
     236way["maxspeed"="70 mph"]::maxspeedlayer
    237237{
    238238        set maxspeed;
    239239        color: speed_70_mph#ccad24;
    240240}
    241 way["maxspeed"="75 mph"]::maxspeed
     241way["maxspeed"="75 mph"]::maxspeedlayer
    242242{
    243243        set maxspeed;
    … …  
    245245}
    246246
    247 way.maxspeed::maxspeed
     247way.maxspeed::maxspeedlayer
    248248{
    249249        opacity: 0.75;
    … …  
    251251        z-index: -1;
    252252}
    253 way|z16.maxspeed::maxspeed
     253way|z16.maxspeed::maxspeedlayer
    254254{
    255255        width: 12;
    256256}
    257 way|z-15.maxspeed::maxspeed
     257way|z-15.maxspeed::maxspeedlayer
    258258{
    259259        width:10;
    260260}
    261 way.maxspeed[maxspeed:variable]::maxspeed
     261way.maxspeed[maxspeed:variable]::maxspeedlayer
    262262{
    263263        dashes: 34,6;
    … …  
    269269/* display maxspeed:backward=* for lefthandtraffic */
    270270
    271 way["maxspeed:forward"="none"]:righthandtraffic::maxspeed,
    272 way["maxspeed:backward"="none"]!:righthandtraffic::maxspeed
     271way["maxspeed:forward"="none"]:righthandtraffic::maxspeedlayer,
     272way["maxspeed:backward"="none"]!:righthandtraffic::maxspeedlayer
    273273{
    274274        set maxspeed_right;
    … …  
    276276}
    277277        /* km/h */
    278 way["maxspeed:forward"="5"]:righthandtraffic::maxspeed,
    279 way["maxspeed:backward"="5"]!:righthandtraffic::maxspeed
     278way["maxspeed:forward"="5"]:righthandtraffic::maxspeedlayer,
     279way["maxspeed:backward"="5"]!:righthandtraffic::maxspeedlayer
    280280{
    281281        set maxspeed_right;
    282282        right-casing-color: speed_5#ff5656;
    283283}
    284 way["maxspeed:forward"="10"]:righthandtraffic::maxspeed,
    285 way["maxspeed:backward"="10"]!:righthandtraffic::maxspeed
     284way["maxspeed:forward"="10"]:righthandtraffic::maxspeedlayer,
     285way["maxspeed:backward"="10"]!:righthandtraffic::maxspeedlayer
    286286{
    287287        set maxspeed_right;
    288288        right-casing-color: speed_10#b80022;
    289289}
    290 way["maxspeed:forward"="15"]:righthandtraffic::maxspeed,
    291 way["maxspeed:backward"="15"]!:righthandtraffic::maxspeed
     290way["maxspeed:forward"="15"]:righthandtraffic::maxspeedlayer,
     291way["maxspeed:backward"="15"]!:righthandtraffic::maxspeedlayer
    292292{
    293293        set maxspeed_right;
    294294        right-casing-color: speed_15#00da8b;
    295295}
    296 way["maxspeed:forward"="20"]:righthandtraffic::maxspeed,
    297 way["maxspeed:backward"="20"]!:righthandtraffic::maxspeed,
    298 way["maxspeed:forward"="RU:living_street"][setting("RU")]:righthandtraffic::maxspeed
     296way["maxspeed:forward"="20"]:righthandtraffic::maxspeedlayer,
     297way["maxspeed:backward"="20"]!:righthandtraffic::maxspeedlayer,
     298way["maxspeed:forward"="RU:living_street"][setting("RU")]:righthandtraffic::maxspeedlayer
    299299/* no left hand traffic in RU, so this selector is not needed */
    300300{
    … …  
    302302        right-casing-color: speed_20#e3cc82;
    303303}
    304 way["maxspeed:forward"="30"]:righthandtraffic::maxspeed,
    305 way["maxspeed:backward"="30"]!:righthandtraffic::maxspeed
     304way["maxspeed:forward"="30"]:righthandtraffic::maxspeedlayer,
     305way["maxspeed:backward"="30"]!:righthandtraffic::maxspeedlayer
    306306{
    307307        set maxspeed_right;
    308308        right-casing-color: speed_30#4d4dff;
    309309}
    310 way["maxspeed:forward"="40"]:righthandtraffic::maxspeed,
    311 way["maxspeed:backward"="40"]!:righthandtraffic::maxspeed
     310way["maxspeed:forward"="40"]:righthandtraffic::maxspeedlayer,
     311way["maxspeed:backward"="40"]!:righthandtraffic::maxspeedlayer
    312312{
    313313        set maxspeed_right;
    314314        right-casing-color: speed_40#4d4d00;
    315315}
    316 way["maxspeed:forward"="45"]:righthandtraffic::maxspeed,
    317 way["maxspeed:backward"="45"]!:righthandtraffic::maxspeed
     316way["maxspeed:forward"="45"]:righthandtraffic::maxspeedlayer,
     317way["maxspeed:backward"="45"]!:righthandtraffic::maxspeedlayer
    318318{
    319319        set maxspeed_right;
    320320        right-casing-color: speed_45#ff529a;
    321321}
    322 way["maxspeed:forward"="50"]:righthandtraffic::maxspeed,
    323 way["maxspeed:backward"="50"]!:righthandtraffic::maxspeed
     322way["maxspeed:forward"="50"]:righthandtraffic::maxspeedlayer,
     323way["maxspeed:backward"="50"]!:righthandtraffic::maxspeedlayer
    324324{
    325325        set maxspeed_right;
    326326        right-casing-color: speed_50#07f807;
    327327}
    328 way["maxspeed:forward"="60"]:righthandtraffic::maxspeed,
    329 way["maxspeed:backward"="60"]!:righthandtraffic::maxspeed,
    330 way["maxspeed:forward"="RU:urban"][setting("RU")]:righthandtraffic::maxspeed
     328way["maxspeed:forward"="60"]:righthandtraffic::maxspeedlayer,
     329way["maxspeed:backward"="60"]!:righthandtraffic::maxspeedlayer,
     330way["maxspeed:forward"="RU:urban"][setting("RU")]:righthandtraffic::maxspeedlayer
    331331{
    332332        set maxspeed_right;
    333333        right-casing-color: speed_60#9f9fff;
    334334}
    335 way["maxspeed:forward"="70"]:righthandtraffic::maxspeed,
    336 way["maxspeed:backward"="70"]!:righthandtraffic::maxspeed
     335way["maxspeed:forward"="70"]:righthandtraffic::maxspeedlayer,
     336way["maxspeed:backward"="70"]!:righthandtraffic::maxspeedlayer
    337337{
    338338        set maxspeed_right;
    339339        right-casing-color: speed_70#ee8b00;
    340340}
    341 way["maxspeed:forward"="80"]:righthandtraffic::maxspeed,
    342 way["maxspeed:backward"="80"]!:righthandtraffic::maxspeed
     341way["maxspeed:forward"="80"]:righthandtraffic::maxspeedlayer,
     342way["maxspeed:backward"="80"]!:righthandtraffic::maxspeedlayer
    343343{
    344344        set maxspeed_right;
    345345        right-casing-color: speed_80#f90808;
    346346}
    347 way["maxspeed:forward"="90"]:righthandtraffic::maxspeed,
    348 way["maxspeed:backward"="90"]!:righthandtraffic::maxspeed,
    349 way["maxspeed:forward"="RU:rural"][setting("RU")]:righthandtraffic::maxspeed
     347way["maxspeed:forward"="90"]:righthandtraffic::maxspeedlayer,
     348way["maxspeed:backward"="90"]!:righthandtraffic::maxspeedlayer,
     349way["maxspeed:forward"="RU:rural"][setting("RU")]:righthandtraffic::maxspeedlayer
    350350{
    351351        set maxspeed_right;
    352352        right-casing-color: speed_90#07f8f8;
    353353}
    354 way["maxspeed:forward"="100"]:righthandtraffic::maxspeed,
    355 way["maxspeed:backward"="100"]!:righthandtraffic::maxspeed
     354way["maxspeed:forward"="100"]:righthandtraffic::maxspeedlayer,
     355way["maxspeed:backward"="100"]!:righthandtraffic::maxspeedlayer
    356356{
    357357        set maxspeed_right;
    358358        right-casing-color: speed_100#f807f8;
    359359}
    360 way["maxspeed:forward"="110"]:righthandtraffic::maxspeed,
    361 way["maxspeed:backward"="110"]!:righthandtraffic::maxspeed,
    362 way["maxspeed:forward"="RU:motorway"][setting("RU")]:righthandtraffic::maxspeed
     360way["maxspeed:forward"="110"]:righthandtraffic::maxspeedlayer,
     361way["maxspeed:backward"="110"]!:righthandtraffic::maxspeedlayer,
     362way["maxspeed:forward"="RU:motorway"][setting("RU")]:righthandtraffic::maxspeedlayer
    363363{
    364364        set maxspeed_right;
    365365        right-casing-color: speed_110#7807f8;
    366366}
    367 way["maxspeed:forward"="120"]:righthandtraffic::maxspeed,
    368 way["maxspeed:backward"="120"]!:righthandtraffic::maxspeed
     367way["maxspeed:forward"="120"]:righthandtraffic::maxspeedlayer,
     368way["maxspeed:backward"="120"]!:righthandtraffic::maxspeedlayer
    369369{
    370370        set maxspeed_right;
    371371        right-casing-color: speed_120#ccad24;
    372372}
    373 way["maxspeed:forward"="130"]:righthandtraffic::maxspeed,
    374 way["maxspeed:backward"="130"]!:righthandtraffic::maxspeed
     373way["maxspeed:forward"="130"]:righthandtraffic::maxspeedlayer,
     374way["maxspeed:backward"="130"]!:righthandtraffic::maxspeedlayer
    375375{
    376376        set maxspeed_right;
    … …  
    378378}
    379379        /* mph */
    380 way["maxspeed:forward"="5 mph"]:righthandtraffic::maxspeed,
    381 way["maxspeed:backward"="5 mph"]!:righthandtraffic::maxspeed
     380way["maxspeed:forward"="5 mph"]:righthandtraffic::maxspeedlayer,
     381way["maxspeed:backward"="5 mph"]!:righthandtraffic::maxspeedlayer
    382382{
    383383        set maxspeed_right;
    384384        right-casing-color: speed_5_mph#b80022;
    385385}
    386 way["maxspeed:forward"="10 mph"]:righthandtraffic::maxspeed,
    387 way["maxspeed:backward"="10 mph"]!:righthandtraffic::maxspeed
     386way["maxspeed:forward"="10 mph"]:righthandtraffic::maxspeedlayer,
     387way["maxspeed:backward"="10 mph"]!:righthandtraffic::maxspeedlayer
    388388{
    389389        set maxspeed_right;
    390390        right-casing-color: speed_10_mph#00da8b;
    391391}
    392 way["maxspeed:forward"="15 mph"]:righthandtraffic::maxspeed,
    393 way["maxspeed:backward"="15 mph"]!:righthandtraffic::maxspeed
     392way["maxspeed:forward"="15 mph"]:righthandtraffic::maxspeedlayer,
     393way["maxspeed:backward"="15 mph"]!:righthandtraffic::maxspeedlayer
    394394{
    395395        set maxspeed_right;
    396396        right-casing-color: speed_15_mph#e3cc82;
    397397}
    398 way["maxspeed:forward"="20 mph"]:righthandtraffic::maxspeed,
    399 way["maxspeed:backward"="20 mph"]!:righthandtraffic::maxspeed
     398way["maxspeed:forward"="20 mph"]:righthandtraffic::maxspeedlayer,
     399way["maxspeed:backward"="20 mph"]!:righthandtraffic::maxspeedlayer
    400400{
    401401        set maxspeed_right;
    402402        right-casing-color: speed_20_mph#4d4dff;
    403403}
    404 way["maxspeed:forward"="25 mph"]:righthandtraffic::maxspeed,
    405 way["maxspeed:backward"="25 mph"]!:righthandtraffic::maxspeed
     404way["maxspeed:forward"="25 mph"]:righthandtraffic::maxspeedlayer,
     405way["maxspeed:backward"="25 mph"]!:righthandtraffic::maxspeedlayer
    406406{
    407407        set maxspeed_right;
    408408        right-casing-color: speed_25_mph#4d4d00;
    409409}
    410 way["maxspeed:forward"="30 mph"]:righthandtraffic::maxspeed,
    411 way["maxspeed:backward"="30 mph"]!:righthandtraffic::maxspeed
     410way["maxspeed:forward"="30 mph"]:righthandtraffic::maxspeedlayer,
     411way["maxspeed:backward"="30 mph"]!:righthandtraffic::maxspeedlayer
    412412{
    413413        set maxspeed_right;
    414414        right-casing-color: speed_30_mph#ff529a;
    415415}
    416 way["maxspeed:forward"="35 mph"]:righthandtraffic::maxspeed,
    417 way["maxspeed:backward"="35 mph"]!:righthandtraffic::maxspeed
     416way["maxspeed:forward"="35 mph"]:righthandtraffic::maxspeedlayer,
     417way["maxspeed:backward"="35 mph"]!:righthandtraffic::maxspeedlayer
    418418{
    419419        set maxspeed_right;
    420420        right-casing-color: speed_35_mph#07f807;
    421421}
    422 way["maxspeed:forward"="40 mph"]:righthandtraffic::maxspeed,
    423 way["maxspeed:backward"="40 mph"]!:righthandtraffic::maxspeed
     422way["maxspeed:forward"="40 mph"]:righthandtraffic::maxspeedlayer,
     423way["maxspeed:backward"="40 mph"]!:righthandtraffic::maxspeedlayer
    424424{
    425425        set maxspeed_right;
    426426        right-casing-color: speed_40_mph#9f9fff;
    427427}
    428 way["maxspeed:forward"="45 mph"]:righthandtraffic::maxspeed,
    429 way["maxspeed:backward"="45 mph"]!:righthandtraffic::maxspeed
     428way["maxspeed:forward"="45 mph"]:righthandtraffic::maxspeedlayer,
     429way["maxspeed:backward"="45 mph"]!:righthandtraffic::maxspeedlayer
    430430{
    431431        set maxspeed_right;
    432432        right-casing-color: speed_45_mph#ee8b00;
    433433}
    434 way["maxspeed:forward"="50 mph"]:righthandtraffic::maxspeed,
    435 way["maxspeed:backward"="50 mph"]!:righthandtraffic::maxspeed
     434way["maxspeed:forward"="50 mph"]:righthandtraffic::maxspeedlayer,
     435way["maxspeed:backward"="50 mph"]!:righthandtraffic::maxspeedlayer
    436436{
    437437        set maxspeed_right;
    438438        right-casing-color: speed_50_mph#f90808;
    439439}
    440 way["maxspeed:forward"="55 mph"]:righthandtraffic::maxspeed,
    441 way["maxspeed:backward"="55 mph"]!:righthandtraffic::maxspeed
     440way["maxspeed:forward"="55 mph"]:righthandtraffic::maxspeedlayer,
     441way["maxspeed:backward"="55 mph"]!:righthandtraffic::maxspeedlayer
    442442{
    443443        set maxspeed_right;
    444444        right-casing-color: speed_55_mph#07f8f8;
    445445}
    446 way["maxspeed:forward"="60 mph"]:righthandtraffic::maxspeed,
    447 way["maxspeed:backward"="60 mph"]!:righthandtraffic::maxspeed
     446way["maxspeed:forward"="60 mph"]:righthandtraffic::maxspeedlayer,
     447way["maxspeed:backward"="60 mph"]!:righthandtraffic::maxspeedlayer
    448448{
    449449        set maxspeed_right;
    450450        right-casing-color: speed_60_mph#f807f8;
    451451}
    452 way["maxspeed:forward"="65 mph"]:righthandtraffic::maxspeed,
    453 way["maxspeed:backward"="65 mph"]!:righthandtraffic::maxspeed
     452way["maxspeed:forward"="65 mph"]:righthandtraffic::maxspeedlayer,
     453way["maxspeed:backward"="65 mph"]!:righthandtraffic::maxspeedlayer
    454454{
    455455        set maxspeed_right;
    456456        right-casing-color: speed_65_mph#7807f8;
    457457}
    458 way["maxspeed:forward"="70 mph"]:righthandtraffic::maxspeed,
    459 way["maxspeed:backward"="70 mph"]!:righthandtraffic::maxspeed
     458way["maxspeed:forward"="70 mph"]:righthandtraffic::maxspeedlayer,
     459way["maxspeed:backward"="70 mph"]!:righthandtraffic::maxspeedlayer
    460460{
    461461        set maxspeed_right;
    462462        right-casing-color: speed_70_mph#ccad24;
    463463}
    464 way["maxspeed:forward"="75 mph"]:righthandtraffic::maxspeed,
    465 way["maxspeed:backward"="75 mph"]!:righthandtraffic::maxspeed
     464way["maxspeed:forward"="75 mph"]:righthandtraffic::maxspeedlayer,
     465way["maxspeed:backward"="75 mph"]!:righthandtraffic::maxspeedlayer
    466466{
    467467        set maxspeed_right;
    … …  
    469469}
    470470
    471 way.maxspeed_right::maxspeed
     471way.maxspeed_right::maxspeedlayer
    472472{
    473473        right-casing-opacity: 0.75;
    … …  
    475475        right-casing-offset: 0;
    476476}
    477 way|z16.maxspeed_right::maxspeed
     477way|z16.maxspeed_right::maxspeedlayer
    478478{
    479479        right-casing-width: 5;
    480480}
    481 way|z-15.maxspeed_right::maxspeed
     481way|z-15.maxspeed_right::maxspeedlayer
    482482{
    483483        right-casing-width: 4;
    484484}
    485 way.maxspeed_right[maxspeed:variable:forward]:righthandtraffic::maxspeed,
    486 way.maxspeed_right[maxspeed:variable:backward]!:righthandtraffic::maxspeed
     485way.maxspeed_right[maxspeed:variable:forward]:righthandtraffic::maxspeedlayer,
     486way.maxspeed_right[maxspeed:variable:backward]!:righthandtraffic::maxspeedlayer
    487487{
    488488        right-casing-dashes: 34,6;
    … …  
    494494/* display maxspeed:backward=* for righthandtraffic */
    495495
    496 way["maxspeed:forward"="none"]!:righthandtraffic::maxspeed,
    497 way["maxspeed:backward"="none"]:righthandtraffic::maxspeed
     496way["maxspeed:forward"="none"]!:righthandtraffic::maxspeedlayer,
     497way["maxspeed:backward"="none"]:righthandtraffic::maxspeedlayer
    498498{
    499499        set maxspeed_left;
    … …  
    501501}
    502502        /* km/h */
    503 way["maxspeed:forward"="5"]!:righthandtraffic::maxspeed,
    504 way["maxspeed:backward"="5"]:righthandtraffic::maxspeed
     503way["maxspeed:forward"="5"]!:righthandtraffic::maxspeedlayer,
     504way["maxspeed:backward"="5"]:righthandtraffic::maxspeedlayer
    505505{
    506506        set maxspeed_left;
    507507        left-casing-color: speed_5#ff5656;
    508508}
    509 way["maxspeed:forward"="10"]!:righthandtraffic::maxspeed,
    510 way["maxspeed:backward"="10"]:righthandtraffic::maxspeed
     509way["maxspeed:forward"="10"]!:righthandtraffic::maxspeedlayer,
     510way["maxspeed:backward"="10"]:righthandtraffic::maxspeedlayer
    511511{
    512512        set maxspeed_left;
    513513        left-casing-color: speed_10#b80022;
    514514}
    515 way["maxspeed:forward"="15"]!:righthandtraffic::maxspeed,
    516 way["maxspeed:backward"="15"]:righthandtraffic::maxspeed
     515way["maxspeed:forward"="15"]!:righthandtraffic::maxspeedlayer,
     516way["maxspeed:backward"="15"]:righthandtraffic::maxspeedlayer
    517517{
    518518        set maxspeed_left;
    519519        left-casing-color: speed_15#00da8b;
    520520}
    521 way["maxspeed:forward"="20"]!:righthandtraffic::maxspeed,
    522 way["maxspeed:backward"="20"]:righthandtraffic::maxspeed,
    523 way["maxspeed:backward"="RU:living_street"][setting("RU")]:righthandtraffic::maxspeed
     521way["maxspeed:forward"="20"]!:righthandtraffic::maxspeedlayer,
     522way["maxspeed:backward"="20"]:righthandtraffic::maxspeedlayer,
     523way["maxspeed:backward"="RU:living_street"][setting("RU")]:righthandtraffic::maxspeedlayer
    524524{
    525525        set maxspeed_left;
    526526        left-casing-color: speed_20#e3cc82;
    527527}
    528 way["maxspeed:forward"="30"]!:righthandtraffic::maxspeed,
    529 way["maxspeed:backward"="30"]:righthandtraffic::maxspeed
     528way["maxspeed:forward"="30"]!:righthandtraffic::maxspeedlayer,
     529way["maxspeed:backward"="30"]:righthandtraffic::maxspeedlayer
    530530{
    531531        set maxspeed_left;
    532532        left-casing-color: speed_30#4d4dff;
    533533}
    534 way["maxspeed:forward"="40"]!:righthandtraffic::maxspeed,
    535 way["maxspeed:backward"="40"]:righthandtraffic::maxspeed
     534way["maxspeed:forward"="40"]!:righthandtraffic::maxspeedlayer,
     535way["maxspeed:backward"="40"]:righthandtraffic::maxspeedlayer
    536536{
    537537        set maxspeed_left;
    538538        left-casing-color: speed_40#4d4d00;
    539539}
    540 way["maxspeed:forward"="45"]!:righthandtraffic::maxspeed,
    541 way["maxspeed:backward"="45"]:righthandtraffic::maxspeed
     540way["maxspeed:forward"="45"]!:righthandtraffic::maxspeedlayer,
     541way["maxspeed:backward"="45"]:righthandtraffic::maxspeedlayer
    542542{
    543543        set maxspeed_left;
    544544        left-casing-color: speed_45#ff529a;
    545545}
    546 way["maxspeed:forward"="50"]!:righthandtraffic::maxspeed,
    547 way["maxspeed:backward"="50"]:righthandtraffic::maxspeed
     546way["maxspeed:forward"="50"]!:righthandtraffic::maxspeedlayer,
     547way["maxspeed:backward"="50"]:righthandtraffic::maxspeedlayer
    548548{
    549549        set maxspeed_left;
    550550        left-casing-color: speed_50#07f807;
    551551}
    552 way["maxspeed:forward"="60"]!:righthandtraffic::maxspeed,
    553 way["maxspeed:backward"="60"]:righthandtraffic::maxspeed,
    554 way["maxspeed:backward"="RU:urban"][setting("RU")]:righthandtraffic::maxspeed
     552way["maxspeed:forward"="60"]!:righthandtraffic::maxspeedlayer,
     553way["maxspeed:backward"="60"]:righthandtraffic::maxspeedlayer,
     554way["maxspeed:backward"="RU:urban"][setting("RU")]:righthandtraffic::maxspeedlayer
    555555{
    556556        set maxspeed_left;
    557557        left-casing-color: speed_60#9f9fff;
    558558}
    559 way["maxspeed:forward"="70"]!:righthandtraffic::maxspeed,
    560 way["maxspeed:backward"="70"]:righthandtraffic::maxspeed
     559way["maxspeed:forward"="70"]!:righthandtraffic::maxspeedlayer,
     560way["maxspeed:backward"="70"]:righthandtraffic::maxspeedlayer
    561561{
    562562        set maxspeed_left;
    563563        left-casing-color: speed_70#ee8b00;
    564564}
    565 way["maxspeed:forward"="80"]!:righthandtraffic::maxspeed,
    566 way["maxspeed:backward"="80"]:righthandtraffic::maxspeed
     565way["maxspeed:forward"="80"]!:righthandtraffic::maxspeedlayer,
     566way["maxspeed:backward"="80"]:righthandtraffic::maxspeedlayer
    567567{
    568568        set maxspeed_left;
    569569        left-casing-color: speed_80#f90808;
    570570}
    571 way["maxspeed:forward"="90"]!:righthandtraffic::maxspeed,
    572 way["maxspeed:backward"="90"]:righthandtraffic::maxspeed,
    573 way["maxspeed:backward"="RU:rural"][setting("RU")]:righthandtraffic::maxspeed
     571way["maxspeed:forward"="90"]!:righthandtraffic::maxspeedlayer,
     572way["maxspeed:backward"="90"]:righthandtraffic::maxspeedlayer,
     573way["maxspeed:backward"="RU:rural"][setting("RU")]:righthandtraffic::maxspeedlayer
    574574{
    575575        set maxspeed_left;
    576576        left-casing-color: speed_90#07f8f8;
    577577}
    578 way["maxspeed:forward"="100"]!:righthandtraffic::maxspeed,
    579 way["maxspeed:backward"="100"]:righthandtraffic::maxspeed
     578way["maxspeed:forward"="100"]!:righthandtraffic::maxspeedlayer,
     579way["maxspeed:backward"="100"]:righthandtraffic::maxspeedlayer
    580580{
    581581        set maxspeed_left;
    582582        left-casing-color: speed_100#f807f8;
    583583}
    584 way["maxspeed:forward"="110"]!:righthandtraffic::maxspeed,
    585 way["maxspeed:backward"="110"]:righthandtraffic::maxspeed,
    586 way["maxspeed:backward"="RU:motorway"][setting("RU")]:righthandtraffic::maxspeed
     584way["maxspeed:forward"="110"]!:righthandtraffic::maxspeedlayer,
     585way["maxspeed:backward"="110"]:righthandtraffic::maxspeedlayer,
     586way["maxspeed:backward"="RU:motorway"][setting("RU")]:righthandtraffic::maxspeedlayer
    587587{
    588588        set maxspeed_left;
    589589        left-casing-color: speed_110#7807f8;
    590590}
    591 way["maxspeed:forward"="120"]!:righthandtraffic::maxspeed,
    592 way["maxspeed:backward"="120"]:righthandtraffic::maxspeed
     591way["maxspeed:forward"="120"]!:righthandtraffic::maxspeedlayer,
     592way["maxspeed:backward"="120"]:righthandtraffic::maxspeedlayer
    593593{
    594594        set maxspeed_left;
    595595        left-casing-color: speed_120#ccad24;
    596596}
    597 way["maxspeed:forward"="130"]!:righthandtraffic::maxspeed,
    598 way["maxspeed:backward"="130"]:righthandtraffic::maxspeed
     597way["maxspeed:forward"="130"]!:righthandtraffic::maxspeedlayer,
     598way["maxspeed:backward"="130"]:righthandtraffic::maxspeedlayer
    599599{
    600600        set maxspeed_left;
    … …  
    602602}
    603603        /* mph */
    604 way["maxspeed:forward"="5 mph"]!:righthandtraffic::maxspeed,
    605 way["maxspeed:backward"="5 mph"]:righthandtraffic::maxspeed
     604way["maxspeed:forward"="5 mph"]!:righthandtraffic::maxspeedlayer,
     605way["maxspeed:backward"="5 mph"]:righthandtraffic::maxspeedlayer
    606606{
    607607        set maxspeed_left;
    608608        left-casing-color: speed_5_mph#b80022;
    609609}
    610 way["maxspeed:forward"="10 mph"]!:righthandtraffic::maxspeed,
    611 way["maxspeed:backward"="10 mph"]:righthandtraffic::maxspeed
     610way["maxspeed:forward"="10 mph"]!:righthandtraffic::maxspeedlayer,
     611way["maxspeed:backward"="10 mph"]:righthandtraffic::maxspeedlayer
    612612{
    613613        set maxspeed_left;
    614614        left-casing-color: speed_10_mph#00da8b;
    615615}
    616 way["maxspeed:forward"="15 mph"]!:righthandtraffic::maxspeed,
    617 way["maxspeed:backward"="15 mph"]:righthandtraffic::maxspeed
     616way["maxspeed:forward"="15 mph"]!:righthandtraffic::maxspeedlayer,
     617way["maxspeed:backward"="15 mph"]:righthandtraffic::maxspeedlayer
    618618{
    619619        set maxspeed_left;
    620620        left-casing-color: speed_15_mph#e3cc82;
    621621}
    622 way["maxspeed:forward"="20 mph"]!:righthandtraffic::maxspeed,
    623 way["maxspeed:backward"="20 mph"]:righthandtraffic::maxspeed
     622way["maxspeed:forward"="20 mph"]!:righthandtraffic::maxspeedlayer,
     623way["maxspeed:backward"="20 mph"]:righthandtraffic::maxspeedlayer
    624624{
    625625        set maxspeed_left;
    626626        left-casing-color: speed_20_mph#4d4dff;
    627627}
    628 way["maxspeed:forward"="25 mph"]!:righthandtraffic::maxspeed,
    629 way["maxspeed:backward"="25 mph"]:righthandtraffic::maxspeed
     628way["maxspeed:forward"="25 mph"]!:righthandtraffic::maxspeedlayer,
     629way["maxspeed:backward"="25 mph"]:righthandtraffic::maxspeedlayer
    630630{
    631631        set maxspeed_left;
    632632        left-casing-color: speed_25_mph#4d4d00;
    633633}
    634 way["maxspeed:forward"="30 mph"]!:righthandtraffic::maxspeed,
    635 way["maxspeed:backward"="30 mph"]:righthandtraffic::maxspeed
     634way["maxspeed:forward"="30 mph"]!:righthandtraffic::maxspeedlayer,
     635way["maxspeed:backward"="30 mph"]:righthandtraffic::maxspeedlayer
    636636{
    637637        set maxspeed_left;
    638638        left-casing-color: speed_30_mph#ff529a;
    639639}
    640 way["maxspeed:forward"="35 mph"]!:righthandtraffic::maxspeed,
    641 way["maxspeed:backward"="35 mph"]:righthandtraffic::maxspeed
     640way["maxspeed:forward"="35 mph"]!:righthandtraffic::maxspeedlayer,
     641way["maxspeed:backward"="35 mph"]:righthandtraffic::maxspeedlayer
    642642{
    643643        set maxspeed_left;
    644644        left-casing-color: speed_35_mph#07f807;
    645645}
    646 way["maxspeed:forward"="40 mph"]!:righthandtraffic::maxspeed,
    647 way["maxspeed:backward"="40 mph"]:righthandtraffic::maxspeed
     646way["maxspeed:forward"="40 mph"]!:righthandtraffic::maxspeedlayer,
     647way["maxspeed:backward"="40 mph"]:righthandtraffic::maxspeedlayer
    648648{
    649649        set maxspeed_left;
    650650        left-casing-color: speed_40_mph#9f9fff;
    651651}
    652 way["maxspeed:forward"="45 mph"]!:righthandtraffic::maxspeed,
    653 way["maxspeed:backward"="45 mph"]:righthandtraffic::maxspeed
     652way["maxspeed:forward"="45 mph"]!:righthandtraffic::maxspeedlayer,
     653way["maxspeed:backward"="45 mph"]:righthandtraffic::maxspeedlayer
    654654{
    655655        set maxspeed_left;
    656656        left-casing-color: speed_45_mph#ee8b00;
    657657}
    658 way["maxspeed:forward"="50 mph"]!:righthandtraffic::maxspeed,
    659 way["maxspeed:backward"="50 mph"]:righthandtraffic::maxspeed
     658way["maxspeed:forward"="50 mph"]!:righthandtraffic::maxspeedlayer,
     659way["maxspeed:backward"="50 mph"]:righthandtraffic::maxspeedlayer
    660660{
    661661        set maxspeed_left;
    662662        left-casing-color: speed_50_mph#f90808;
    663663}
    664 way["maxspeed:forward"="55 mph"]!:righthandtraffic::maxspeed,
    665 way["maxspeed:backward"="55 mph"]:righthandtraffic::maxspeed
     664way["maxspeed:forward"="55 mph"]!:righthandtraffic::maxspeedlayer,
     665way["maxspeed:backward"="55 mph"]:righthandtraffic::maxspeedlayer
    666666{
    667667        set maxspeed_left;
    668668        left-casing-color: speed_55_mph#07f8f8;
    669669}
    670 way["maxspeed:forward"="60 mph"]!:righthandtraffic::maxspeed,
    671 way["maxspeed:backward"="60 mph"]:righthandtraffic::maxspeed
     670way["maxspeed:forward"="60 mph"]!:righthandtraffic::maxspeedlayer,
     671way["maxspeed:backward"="60 mph"]:righthandtraffic::maxspeedlayer
    672672{
    673673        set maxspeed_left;
    674674        left-casing-color: speed_60_mph#f807f8;
    675675}
    676 way["maxspeed:forward"="65 mph"]!:righthandtraffic::maxspeed,
    677 way["maxspeed:backward"="65 mph"]:righthandtraffic::maxspeed
     676way["maxspeed:forward"="65 mph"]!:righthandtraffic::maxspeedlayer,
     677way["maxspeed:backward"="65 mph"]:righthandtraffic::maxspeedlayer
    678678{
    679679        set maxspeed_left;
    680680        left-casing-color: speed_65_mph#7807f8;
    681681}
    682 way["maxspeed:forward"="70 mph"]!:righthandtraffic::maxspeed,
    683 way["maxspeed:backward"="70 mph"]:righthandtraffic::maxspeed
     682way["maxspeed:forward"="70 mph"]!:righthandtraffic::maxspeedlayer,
     683way["maxspeed:backward"="70 mph"]:righthandtraffic::maxspeedlayer
    684684{
    685685        set maxspeed_left;
    686686        left-casing-color: speed_70_mph#ccad24;
    687687}
    688 way["maxspeed:forward"="75 mph"]!:righthandtraffic::maxspeed,
    689 way["maxspeed:backward"="75 mph"]:righthandtraffic::maxspeed
     688way["maxspeed:forward"="75 mph"]!:righthandtraffic::maxspeedlayer,
     689way["maxspeed:backward"="75 mph"]:righthandtraffic::maxspeedlayer
    690690{
    691691        set maxspeed_left;
    … …  
    693693}
    694694
    695 way.maxspeed_left::maxspeed
     695way.maxspeed_left::maxspeedlayer
    696696{
    697697        left-casing-opacity: 0.75;
    … …  
    699699        left-casing-offset: 0;
    700700}
    701 way|z16.maxspeed_left::maxspeed
     701way|z16.maxspeed_left::maxspeedlayer
    702702{
    703703        left-casing-width: 5;
    704704}
    705 way|z-15.maxspeed_left::maxspeed
     705way|z-15.maxspeed_left::maxspeedlayer
    706706{
    707707        left-casing-width: 4;
    708708}
    709 way.maxspeed_left[maxspeed:variable:forward]!:righthandtraffic::maxspeed,
    710 way.maxspeed_left[maxspeed:variable:backward]:righthandtraffic::maxspeed
     709way.maxspeed_left[maxspeed:variable:forward]!:righthandtraffic::maxspeedlayer,
     710way.maxspeed_left[maxspeed:variable:backward]:righthandtraffic::maxspeedlayer
    711711{
    712712        left-casing-dashes: 34,6;
    … …  
    718718
    719719/* report wrong value of maxspeed */
    720 way[maxspeed=~/^[0-9]+$/]::maxspeed,
    721 way[maxspeed=signals]::maxspeed,
    722 way[maxspeed=none]::maxspeed,
    723 way[maxspeed=~/^[0-9]+ mph/]::maxspeed,
    724 way[maxspeed=~/[0-9]+ km\/h/]::maxspeed,
    725 way[maxspeed=~/[0-9]+ knots/]::maxspeed,
    726 way[maxspeed="RU:living_street"][setting("RU")]::maxspeed,
    727 way[maxspeed="RU:urban"][setting("RU")]::maxspeed,
    728 way[maxspeed="RU:rural"][setting("RU")]::maxspeed,
    729 way[maxspeed="RU:motorway"][setting("RU")]::maxspeed
     720way[maxspeed=~/^[0-9]+$/]::maxspeedlayer,
     721way[maxspeed=signals]::maxspeedlayer,
     722way[maxspeed=none]::maxspeedlayer,
     723way[maxspeed=~/^[0-9]+ mph/]::maxspeedlayer,
     724way[maxspeed=~/[0-9]+ km\/h/]::maxspeedlayer,
     725way[maxspeed=~/[0-9]+ knots/]::maxspeedlayer,
     726way[maxspeed="RU:living_street"][setting("RU")]::maxspeedlayer,
     727way[maxspeed="RU:urban"][setting("RU")]::maxspeedlayer,
     728way[maxspeed="RU:rural"][setting("RU")]::maxspeedlayer,
     729way[maxspeed="RU:motorway"][setting("RU")]::maxspeedlayer
    730730{
    731731        set correct_value;
    732732}
    733 way[maxspeed:forward=~/^[0-9]+$/]::maxspeed,
    734 way[maxspeed:forward=signals]::maxspeed,
    735 way[maxspeed:forward=none]::maxspeed,
    736 way[maxspeed:forward=~/^[0-9]+ mph/]::maxspeed,
    737 way[maxspeed:forward=~/[0-9]+ km\/h/]::maxspeed,
    738 way[maxspeed:forward=~/[0-9]+ knots/]::maxspeed,
    739 way[maxspeed:forward="RU:living_street"][setting("RU")]::maxspeed,
    740 way[maxspeed:forward="RU:urban"][setting("RU")]::maxspeed,
    741 way[maxspeed:forward="RU:rural"][setting("RU")]::maxspeed,
    742 way[maxspeed:forward="RU:motorway"][setting("RU")]::maxspeed
     733way[maxspeed:forward=~/^[0-9]+$/]::maxspeedlayer,
     734way[maxspeed:forward=signals]::maxspeedlayer,
     735way[maxspeed:forward=none]::maxspeedlayer,
     736way[maxspeed:forward=~/^[0-9]+ mph/]::maxspeedlayer,
     737way[maxspeed:forward=~/[0-9]+ km\/h/]::maxspeedlayer,
     738way[maxspeed:forward=~/[0-9]+ knots/]::maxspeedlayer,
     739way[maxspeed:forward="RU:living_street"][setting("RU")]::maxspeedlayer,
     740way[maxspeed:forward="RU:urban"][setting("RU")]::maxspeedlayer,
     741way[maxspeed:forward="RU:rural"][setting("RU")]::maxspeedlayer,
     742way[maxspeed:forward="RU:motorway"][setting("RU")]::maxspeedlayer
    743743{
    744744        set correct_value_forward;
    745745}
    746 way[maxspeed:backward=~/^[0-9]+$/]::maxspeed,
    747 way[maxspeed:backward=signals]::maxspeed,
    748 way[maxspeed:backward=none]::maxspeed,
    749 way[maxspeed:backward=~/^[0-9]+ mph/]::maxspeed,
    750 way[maxspeed:backward=~/[0-9]+ km\/h/]::maxspeed,
    751 way[maxspeed:backward=~/[0-9]+ knots/]::maxspeed,
    752 way[maxspeed:backward="RU:living_street"][setting("RU")]::maxspeed,
    753 way[maxspeed:backward="RU:urban"][setting("RU")]::maxspeed,
    754 way[maxspeed:backward="RU:rural"][setting("RU")]::maxspeed,
    755 way[maxspeed:backward="RU:motorway"][setting("RU")]::maxspeed
     746way[maxspeed:backward=~/^[0-9]+$/]::maxspeedlayer,
     747way[maxspeed:backward=signals]::maxspeedlayer,
     748way[maxspeed:backward=none]::maxspeedlayer,
     749way[maxspeed:backward=~/^[0-9]+ mph/]::maxspeedlayer,
     750way[maxspeed:backward=~/[0-9]+ km\/h/]::maxspeedlayer,
     751way[maxspeed:backward=~/[0-9]+ knots/]::maxspeedlayer,
     752way[maxspeed:backward="RU:living_street"][setting("RU")]::maxspeedlayer,
     753way[maxspeed:backward="RU:urban"][setting("RU")]::maxspeedlayer,
     754way[maxspeed:backward="RU:rural"][setting("RU")]::maxspeedlayer,
     755way[maxspeed:backward="RU:motorway"][setting("RU")]::maxspeedlayer
    756756{
    757757        set correct_value_backward;
    758758}
    759759
    760 way["maxspeed"]!.correct_value::maxspeed,
    761 way["maxspeed:forward"]!.correct_value_forward::maxspeed,
    762 way["maxspeed:backward"]!.correct_value_backward::maxspeed
     760way["maxspeed"]!.correct_value::maxspeedlayer,
     761way["maxspeed:forward"]!.correct_value_forward::maxspeedlayer,
     762way["maxspeed:backward"]!.correct_value_backward::maxspeedlayer
    763763{
    764764        color: yellow;