Changes between Version 41 and Version 42 of Styles/Maxspeed


Ignore:
Timestamp:
2024-04-09T23:03:04+02:00 (21 months ago)
Author:
Klumbumbus
Comment:

update to version 2.8 - code

Legend:

Unmodified
Added
Removed
Modified

  • Styles/Maxspeed

    v41 v42  
    121121{
    122122        title: "Maxspeed";
    123         version: "2.7.[[revision]]_[[date]]";
     123        version: "2.8.[[revision]]_[[date]]";
    124124        description: "Display maxspeed values of ways in the map view.";
    125125        icon: "maxspeed_icon.svg";
    … …  
    139139/* 2 - general settings */
    140140/* 2.1 - create user settings */
    141 setting::RU {
     141setting::implicit {
    142142  type: boolean;
    143   label: tr("Support maxspeed=RU:* tagging scheme");
    144   default: true;
     143  label: tr("Support implicit maxspeed values, e.g. RO:urban (selected countries only)"); /* currently supported: BY, FR, RO, RU, RS*/
     144  default: false;
    145145}
    146146
    … …  
    207207        color: speed_5#ff5656;
    208208}
    209 way["maxspeed"="10"]::maxspeedlayer
     209way["maxspeed"="10"]::maxspeedlayer,
     210way["maxspeed"="RS:living_street"][setting("implicit")]::maxspeedlayer
    210211{
    211212        set maxspeed;
    … …  
    218219}
    219220way["maxspeed"="20"]::maxspeedlayer,
    220 way["maxspeed"="RU:living_street"][setting("RU")]::maxspeedlayer
     221way["maxspeed"="BY:living_street"][setting("implicit")]::maxspeedlayer,
     222way["maxspeed"="RU:living_street"][setting("implicit")]::maxspeedlayer
    221223{
    222224        set maxspeed;
    223225        color: speed_20#e3cc82;
    224226}
    225 way["maxspeed"="30"]::maxspeedlayer
     227way["maxspeed"="30"]::maxspeedlayer,
     228way["maxspeed"="FR:zone30"][setting("implicit")]::maxspeedlayer
    226229{
    227230        set maxspeed;
    … …  
    238241        color: speed_45#ff529a;
    239242}
    240 way["maxspeed"="50"]::maxspeedlayer
     243way["maxspeed"="50"]::maxspeedlayer,
     244way["maxspeed"="FR:urban"][setting("implicit")]::maxspeedlayer,
     245way["maxspeed"="RO:urban"][setting("implicit")]::maxspeedlayer,
     246way["maxspeed"="RS:urban"][setting("implicit")]::maxspeedlayer
    241247{
    242248        set maxspeed;
    … …  
    244250}
    245251way["maxspeed"="60"]::maxspeedlayer,
    246 way["maxspeed"="RU:urban"][setting("RU")]::maxspeedlayer
     252way["maxspeed"="BY:urban"][setting("implicit")]::maxspeedlayer,
     253way["maxspeed"="RU:urban"][setting("implicit")]::maxspeedlayer
    247254{
    248255        set maxspeed;
    … …  
    254261        color: speed_70#ee8b00;
    255262}
    256 way["maxspeed"="80"]::maxspeedlayer
     263way["maxspeed"="80"]::maxspeedlayer,
     264way["maxspeed"="FR:rural"][setting("implicit")]::maxspeedlayer,
     265way["maxspeed"="RS:rural"][setting("implicit")]::maxspeedlayer
    257266{
    258267        set maxspeed;
    … …  
    260269}
    261270way["maxspeed"="90"]::maxspeedlayer,
    262 way["maxspeed"="RU:rural"][setting("RU")]::maxspeedlayer
     271way["maxspeed"="BY:rural"][setting("implicit")]::maxspeedlayer,
     272way["maxspeed"="RO:rural"][setting("implicit")]::maxspeedlayer,
     273way["maxspeed"="RU:rural"][setting("implicit")]::maxspeedlayer
    263274{
    264275        set maxspeed;
    265276        color: speed_90#07f8f8;
    266277}
    267 way["maxspeed"="100"]::maxspeedlayer
     278way["maxspeed"="100"]::maxspeedlayer,
     279way["maxspeed"="RO:trunk"][setting("implicit")]::maxspeedlayer,
     280way["maxspeed"="RS:trunk"][setting("implicit")]::maxspeedlayer
    268281{
    269282        set maxspeed;
    … …  
    271284}
    272285way["maxspeed"="110"]::maxspeedlayer,
    273 way["maxspeed"="RU:motorway"][setting("RU")]::maxspeedlayer
     286way["maxspeed"="BY:motorway"][setting("implicit")]::maxspeedlayer,
     287way["maxspeed"="RU:motorway"][setting("implicit")]::maxspeedlayer
    274288{
    275289        set maxspeed;
    … …  
    281295        color: speed_120#b69b20;
    282296}
    283 way["maxspeed"="130"]::maxspeedlayer
     297way["maxspeed"="130"]::maxspeedlayer,
     298way["maxspeed"="FR:motorway"][setting("implicit")]::maxspeedlayer,
     299way["maxspeed"="RO:motorway"][setting("implicit")]::maxspeedlayer,
     300way["maxspeed"="RS:motorway"][setting("implicit")]::maxspeedlayer
    284301{
    285302        set maxspeed;
    … …  
    392409}
    393410way.cond_kmh[prop(maxsp_cond, maxspeedlayer)="20"]::maxspeedlayer
    394 /* A selector for RU scheme is not needed here because "maxspeed:conditional=RU:living_street @ (...)" is nonsense, better use the actual maxspeed value in this case. The same is true for the others (rural, urban, motorway).  */
     411/* A selector for implicit scheme is not needed here because e.g. "maxspeed:conditional=RU:living_street @ (...)" is nonsense, better use the actual maxspeed value in this case. The same is true for the others (rural, urban, motorway, ...).  */
    395412{
    396413        dashes-background-color:  speed_20#e3cc82;
    … …  
    548565}
    549566way["maxspeed:forward"="10"]:righthandtraffic::maxspeedcasinglayer,
    550 way["maxspeed:backward"="10"]!:righthandtraffic::maxspeedcasinglayer
     567way["maxspeed:backward"="10"]!:righthandtraffic::maxspeedcasinglayer,
     568way["maxspeed:forward"="RS:living_street"][setting("implicit")]:righthandtraffic::maxspeedcasinglayer
    551569{
    552570        set maxspeed_right;
    … …  
    561579way["maxspeed:forward"="20"]:righthandtraffic::maxspeedcasinglayer,
    562580way["maxspeed:backward"="20"]!:righthandtraffic::maxspeedcasinglayer,
    563 way["maxspeed:forward"="RU:living_street"][setting("RU")]:righthandtraffic::maxspeedcasinglayer
    564 /* no left hand traffic in RU, so a selector is not needed */
     581way["maxspeed:forward"="BY:living_street"][setting("implicit")]:righthandtraffic::maxspeedcasinglayer,
     582way["maxspeed:forward"="RU:living_street"][setting("implicit")]:righthandtraffic::maxspeedcasinglayer
     583/* no left hand traffic in BY, FR, RO, RU, RS, so a selector is not needed here and the similar rules in chapter 5.1 */
    565584{
    566585        set maxspeed_right;
    … …  
    568587}
    569588way["maxspeed:forward"="30"]:righthandtraffic::maxspeedcasinglayer,
    570 way["maxspeed:backward"="30"]!:righthandtraffic::maxspeedcasinglayer
     589way["maxspeed:backward"="30"]!:righthandtraffic::maxspeedcasinglayer,
     590way["maxspeed:forward"="FR:zone30"][setting("implicit")]:righthandtraffic::maxspeedcasinglayer
    571591{
    572592        set maxspeed_right;
    … …  
    586606}
    587607way["maxspeed:forward"="50"]:righthandtraffic::maxspeedcasinglayer,
    588 way["maxspeed:backward"="50"]!:righthandtraffic::maxspeedcasinglayer
     608way["maxspeed:backward"="50"]!:righthandtraffic::maxspeedcasinglayer,
     609way["maxspeed:forward"="FR:urban"][setting("implicit")]:righthandtraffic::maxspeedcasinglayer,
     610way["maxspeed:forward"="RO:urban"][setting("implicit")]:righthandtraffic::maxspeedcasinglayer,
     611way["maxspeed:forward"="RS:urban"][setting("implicit")]:righthandtraffic::maxspeedcasinglayer
    589612{
    590613        set maxspeed_right;
    … …  
    593616way["maxspeed:forward"="60"]:righthandtraffic::maxspeedcasinglayer,
    594617way["maxspeed:backward"="60"]!:righthandtraffic::maxspeedcasinglayer,
    595 way["maxspeed:forward"="RU:urban"][setting("RU")]:righthandtraffic::maxspeedcasinglayer
     618way["maxspeed:forward"="BY:urban"][setting("implicit")]:righthandtraffic::maxspeedcasinglayer,
     619way["maxspeed:forward"="RU:urban"][setting("implicit")]:righthandtraffic::maxspeedcasinglayer
    596620{
    597621        set maxspeed_right;
    … …  
    605629}
    606630way["maxspeed:forward"="80"]:righthandtraffic::maxspeedcasinglayer,
    607 way["maxspeed:backward"="80"]!:righthandtraffic::maxspeedcasinglayer
     631way["maxspeed:backward"="80"]!:righthandtraffic::maxspeedcasinglayer,
     632way["maxspeed:forward"="FR:rural"][setting("implicit")]:righthandtraffic::maxspeedcasinglayer,
     633way["maxspeed:forward"="RS:rural"][setting("implicit")]:righthandtraffic::maxspeedcasinglayer
    608634{
    609635        set maxspeed_right;
    … …  
    612638way["maxspeed:forward"="90"]:righthandtraffic::maxspeedcasinglayer,
    613639way["maxspeed:backward"="90"]!:righthandtraffic::maxspeedcasinglayer,
    614 way["maxspeed:forward"="RU:rural"][setting("RU")]:righthandtraffic::maxspeedcasinglayer
     640way["maxspeed:forward"="BY:rural"][setting("implicit")]:righthandtraffic::maxspeedcasinglayer,
     641way["maxspeed:forward"="RO:rural"][setting("implicit")]:righthandtraffic::maxspeedcasinglayer,
     642way["maxspeed:forward"="RU:rural"][setting("implicit")]:righthandtraffic::maxspeedcasinglayer
    615643{
    616644        set maxspeed_right;
    … …  
    618646}
    619647way["maxspeed:forward"="100"]:righthandtraffic::maxspeedcasinglayer,
    620 way["maxspeed:backward"="100"]!:righthandtraffic::maxspeedcasinglayer
     648way["maxspeed:backward"="100"]!:righthandtraffic::maxspeedcasinglayer,
     649way["maxspeed:forward"="RO:trunk"][setting("implicit")]:righthandtraffic::maxspeedcasinglayer,
     650way["maxspeed:forward"="RS:trunk"][setting("implicit")]:righthandtraffic::maxspeedcasinglayer
    621651{
    622652        set maxspeed_right;
    … …  
    625655way["maxspeed:forward"="110"]:righthandtraffic::maxspeedcasinglayer,
    626656way["maxspeed:backward"="110"]!:righthandtraffic::maxspeedcasinglayer,
    627 way["maxspeed:forward"="RU:motorway"][setting("RU")]:righthandtraffic::maxspeedcasinglayer
     657way["maxspeed:forward"="BY:motorway"][setting("implicit")]:righthandtraffic::maxspeedcasinglayer,
     658way["maxspeed:forward"="RU:motorway"][setting("implicit")]:righthandtraffic::maxspeedcasinglayer
    628659{
    629660        set maxspeed_right;
    … …  
    637668}
    638669way["maxspeed:forward"="130"]:righthandtraffic::maxspeedcasinglayer,
    639 way["maxspeed:backward"="130"]!:righthandtraffic::maxspeedcasinglayer
     670way["maxspeed:backward"="130"]!:righthandtraffic::maxspeedcasinglayer,
     671way["maxspeed:forward"="FR:motorway"][setting("implicit")]:righthandtraffic::maxspeedcasinglayer,
     672way["maxspeed:forward"="RO:motorway"][setting("implicit")]:righthandtraffic::maxspeedcasinglayer,
     673way["maxspeed:forward"="RS:motorway"][setting("implicit")]:righthandtraffic::maxspeedcasinglayer
    640674{
    641675        set maxspeed_right;
    … …  
    9661000}
    9671001way["maxspeed:forward"="10"]!:righthandtraffic::maxspeedcasinglayer,
    968 way["maxspeed:backward"="10"]:righthandtraffic::maxspeedcasinglayer
     1002way["maxspeed:backward"="10"]:righthandtraffic::maxspeedcasinglayer,
     1003way["maxspeed:backward"="RS:living_street"][setting("implicit")]:righthandtraffic::maxspeedcasinglayer
    9691004{
    9701005        set maxspeed_left;
    … …  
    9791014way["maxspeed:forward"="20"]!:righthandtraffic::maxspeedcasinglayer,
    9801015way["maxspeed:backward"="20"]:righthandtraffic::maxspeedcasinglayer,
    981 way["maxspeed:backward"="RU:living_street"][setting("RU")]:righthandtraffic::maxspeedcasinglayer
     1016way["maxspeed:backward"="BY:living_street"][setting("implicit")]:righthandtraffic::maxspeedcasinglayer,
     1017way["maxspeed:backward"="RU:living_street"][setting("implicit")]:righthandtraffic::maxspeedcasinglayer
    9821018{
    9831019        set maxspeed_left;
    … …  
    9851021}
    9861022way["maxspeed:forward"="30"]!:righthandtraffic::maxspeedcasinglayer,
    987 way["maxspeed:backward"="30"]:righthandtraffic::maxspeedcasinglayer
     1023way["maxspeed:backward"="30"]:righthandtraffic::maxspeedcasinglayer,
     1024way["maxspeed:backward"="FR:zone30"][setting("implicit")]:righthandtraffic::maxspeedcasinglayer
    9881025{
    9891026        set maxspeed_left;
    … …  
    10031040}
    10041041way["maxspeed:forward"="50"]!:righthandtraffic::maxspeedcasinglayer,
    1005 way["maxspeed:backward"="50"]:righthandtraffic::maxspeedcasinglayer
     1042way["maxspeed:backward"="50"]:righthandtraffic::maxspeedcasinglayer,
     1043way["maxspeed:backward"="FR:urban"][setting("implicit")]:righthandtraffic::maxspeedcasinglayer,
     1044way["maxspeed:backward"="RO:urban"][setting("implicit")]:righthandtraffic::maxspeedcasinglayer,
     1045way["maxspeed:backward"="RS:urban"][setting("implicit")]:righthandtraffic::maxspeedcasinglayer
    10061046{
    10071047        set maxspeed_left;
    … …  
    10101050way["maxspeed:forward"="60"]!:righthandtraffic::maxspeedcasinglayer,
    10111051way["maxspeed:backward"="60"]:righthandtraffic::maxspeedcasinglayer,
    1012 way["maxspeed:backward"="RU:urban"][setting("RU")]:righthandtraffic::maxspeedcasinglayer
     1052way["maxspeed:backward"="BY:urban"][setting("implicit")]:righthandtraffic::maxspeedcasinglayer,
     1053way["maxspeed:backward"="RU:urban"][setting("implicit")]:righthandtraffic::maxspeedcasinglayer
    10131054{
    10141055        set maxspeed_left;
    … …  
    10221063}
    10231064way["maxspeed:forward"="80"]!:righthandtraffic::maxspeedcasinglayer,
    1024 way["maxspeed:backward"="80"]:righthandtraffic::maxspeedcasinglayer
     1065way["maxspeed:backward"="80"]:righthandtraffic::maxspeedcasinglayer,
     1066way["maxspeed:backward"="FR:rural"][setting("implicit")]:righthandtraffic::maxspeedcasinglayer,
     1067way["maxspeed:backward"="RS:rural"][setting("implicit")]:righthandtraffic::maxspeedcasinglayer
    10251068{
    10261069        set maxspeed_left;
    … …  
    10291072way["maxspeed:forward"="90"]!:righthandtraffic::maxspeedcasinglayer,
    10301073way["maxspeed:backward"="90"]:righthandtraffic::maxspeedcasinglayer,
    1031 way["maxspeed:backward"="RU:rural"][setting("RU")]:righthandtraffic::maxspeedcasinglayer
     1074way["maxspeed:backward"="BY:rural"][setting("implicit")]:righthandtraffic::maxspeedcasinglayer,
     1075way["maxspeed:backward"="RO:rural"][setting("implicit")]:righthandtraffic::maxspeedcasinglayer,
     1076way["maxspeed:backward"="RU:rural"][setting("implicit")]:righthandtraffic::maxspeedcasinglayer
    10321077{
    10331078        set maxspeed_left;
    … …  
    10351080}
    10361081way["maxspeed:forward"="100"]!:righthandtraffic::maxspeedcasinglayer,
    1037 way["maxspeed:backward"="100"]:righthandtraffic::maxspeedcasinglayer
     1082way["maxspeed:backward"="100"]:righthandtraffic::maxspeedcasinglayer,
     1083way["maxspeed:backward"="RO:trunk"][setting("implicit")]:righthandtraffic::maxspeedcasinglayer,
     1084way["maxspeed:backward"="RS:trunk"][setting("implicit")]:righthandtraffic::maxspeedcasinglayer
    10381085{
    10391086        set maxspeed_left;
    … …  
    10421089way["maxspeed:forward"="110"]!:righthandtraffic::maxspeedcasinglayer,
    10431090way["maxspeed:backward"="110"]:righthandtraffic::maxspeedcasinglayer,
    1044 way["maxspeed:backward"="RU:motorway"][setting("RU")]:righthandtraffic::maxspeedcasinglayer
     1091way["maxspeed:backward"="BY:motorway"][setting("implicit")]:righthandtraffic::maxspeedcasinglayer,
     1092way["maxspeed:backward"="RU:motorway"][setting("implicit")]:righthandtraffic::maxspeedcasinglayer
    10451093{
    10461094        set maxspeed_left;
    … …  
    10541102}
    10551103way["maxspeed:forward"="130"]!:righthandtraffic::maxspeedcasinglayer,
    1056 way["maxspeed:backward"="130"]:righthandtraffic::maxspeedcasinglayer
     1104way["maxspeed:backward"="130"]:righthandtraffic::maxspeedcasinglayer,
     1105way["maxspeed:backward"="FR:motorway"][setting("implicit")]:righthandtraffic::maxspeedcasinglayer,
     1106way["maxspeed:backward"="RO:motorway"][setting("implicit")]:righthandtraffic::maxspeedcasinglayer,
     1107way["maxspeed:backward"="RS:motorway"][setting("implicit")]:righthandtraffic::maxspeedcasinglayer
    10571108{
    10581109        set maxspeed_left;
    … …  
    13731424way[maxspeed=signals]::maxspeedlayer,
    13741425way[maxspeed=none]::maxspeedlayer,
    1375 way[maxspeed=~/^[0-9]+ mph/]::maxspeedlayer,
    1376 way[maxspeed=~/[0-9]+ km\/h/]::maxspeedlayer,
    1377 way[maxspeed=~/[0-9]+ knots/]::maxspeedlayer,
    1378 way[maxspeed="RU:living_street"][setting("RU")]::maxspeedlayer,
    1379 way[maxspeed="RU:urban"][setting("RU")]::maxspeedlayer,
    1380 way[maxspeed="RU:rural"][setting("RU")]::maxspeedlayer,
    1381 way[maxspeed="RU:motorway"][setting("RU")]::maxspeedlayer
     1426way[maxspeed=~/^[0-9]+ mph$/]::maxspeedlayer,
     1427way[maxspeed=~/^[0-9]+ km\/h$/]::maxspeedlayer,
     1428way[maxspeed=~/^[0-9]+ knots$/]::maxspeedlayer,
     1429way[maxspeed=~/^(BY|FR|RO|RS|RU):(urban|rural|motorway)/][setting("implicit")]::maxspeedlayer,
     1430way[maxspeed=~/^(FR):(zone30)/][setting("implicit")]::maxspeedlayer,
     1431way[maxspeed=~/^(RO|RS):(trunk)/][setting("implicit")]::maxspeedlayer,
     1432way[maxspeed=~/^(BY|RS|RU):(living_street)/][setting("implicit")]::maxspeedlayer
    13821433{
    13831434        set correct_value;
    … …  
    13861437way[maxspeed:forward=signals]::maxspeedcasinglayer,
    13871438way[maxspeed:forward=none]::maxspeedcasinglayer,
    1388 way[maxspeed:forward=~/^[0-9]+ mph/]::maxspeedcasinglayer,
    1389 way[maxspeed:forward=~/[0-9]+ km\/h/]::maxspeedcasinglayer,
    1390 way[maxspeed:forward=~/[0-9]+ knots/]::maxspeedcasinglayer,
    1391 way[maxspeed:forward="RU:living_street"][setting("RU")]::maxspeedcasinglayer,
    1392 way[maxspeed:forward="RU:urban"][setting("RU")]::maxspeedcasinglayer,
    1393 way[maxspeed:forward="RU:rural"][setting("RU")]::maxspeedcasinglayer,
    1394 way[maxspeed:forward="RU:motorway"][setting("RU")]::maxspeedcasinglayer
     1439way[maxspeed:forward=~/^[0-9]+ mph$/]::maxspeedcasinglayer,
     1440way[maxspeed:forward=~/^[0-9]+ km\/h$/]::maxspeedcasinglayer,
     1441way[maxspeed:forward=~/^[0-9]+ knots$/]::maxspeedcasinglayer,
     1442way[maxspeed:forward=~/^(BY|FR|RO|RS|RU):(urban|rural|motorway)/][setting("implicit")]::maxspeedcasinglayer,
     1443way[maxspeed:forward=~/^(FR):(zone30)/][setting("implicit")]::maxspeedcasinglayer,
     1444way[maxspeed:forward=~/^(RO|RS):(trunk)/][setting("implicit")]::maxspeedcasinglayer,
     1445way[maxspeed:forward=~/^(BY|RS|RU):(living_street)/][setting("implicit")]::maxspeedcasinglayer
    13951446{
    13961447        set correct_value_forward;
    … …  
    13991450way[maxspeed:backward=signals]::maxspeedcasinglayer,
    14001451way[maxspeed:backward=none]::maxspeedcasinglayer,
    1401 way[maxspeed:backward=~/^[0-9]+ mph/]::maxspeedcasinglayer,
    1402 way[maxspeed:backward=~/[0-9]+ km\/h/]::maxspeedcasinglayer,
    1403 way[maxspeed:backward=~/[0-9]+ knots/]::maxspeedcasinglayer,
    1404 way[maxspeed:backward="RU:living_street"][setting("RU")]::maxspeedcasinglayer,
    1405 way[maxspeed:backward="RU:urban"][setting("RU")]::maxspeedcasinglayer,
    1406 way[maxspeed:backward="RU:rural"][setting("RU")]::maxspeedcasinglayer,
    1407 way[maxspeed:backward="RU:motorway"][setting("RU")]::maxspeedcasinglayer
     1452way[maxspeed:backward=~/^[0-9]+ mph$/]::maxspeedcasinglayer,
     1453way[maxspeed:backward=~/^[0-9]+ km\/h$/]::maxspeedcasinglayer,
     1454way[maxspeed:backward=~/^[0-9]+ knots$/]::maxspeedcasinglayer,
     1455way[maxspeed:backward=~/^(BY|FR|RO|RS|RU):(urban|rural|motorway)/][setting("implicit")]::maxspeedcasinglayer,
     1456way[maxspeed:backward=~/^(FR):(zone30)/][setting("implicit")]::maxspeedcasinglayer,
     1457way[maxspeed:backward=~/^(RO|RS):(trunk)/][setting("implicit")]::maxspeedcasinglayer,
     1458way[maxspeed:backward=~/^(BY|RS|RU):(living_street)/][setting("implicit")]::maxspeedcasinglayer
    14081459{
    14091460        set correct_value_backward;