Changes between Version 20 and Version 21 of Styles/Maxspeed
- Timestamp:
- 2015-01-25T23:06:10+01:00 (10 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
Styles/Maxspeed
v20 v21 55 55 link: "http://josm.openstreetmap.de/wiki/De:Styles/Maxspeed"; 56 56 } 57 57 /* create settings */ 58 setting::RU { 59 type: boolean; 60 label: tr("Support maxspeed=RU:* tagging scheme"); 61 default: true; 62 } 58 63 /* disable tiger layer from default internal mappaint style */ 59 64 way["tiger:reviewed"=no]::core_tiger … … 90 95 } 91 96 way["maxspeed"="20"]::maxspeed, 92 way["maxspeed"="RU:living_street"] ::maxspeed97 way["maxspeed"="RU:living_street"][setting("RU")]::maxspeed 93 98 { 94 99 set maxspeed; … … 116 121 } 117 122 way["maxspeed"="60"]::maxspeed, 118 way["maxspeed"="RU:urban"] ::maxspeed123 way["maxspeed"="RU:urban"][setting("RU")]::maxspeed 119 124 { 120 125 set maxspeed; … … 132 137 } 133 138 way["maxspeed"="90"]::maxspeed, 134 way["maxspeed"="RU:rural"] ::maxspeed139 way["maxspeed"="RU:rural"][setting("RU")]::maxspeed 135 140 { 136 141 set maxspeed; … … 143 148 } 144 149 way["maxspeed"="110"]::maxspeed, 145 way["maxspeed"="RU:motorway"] ::maxspeed150 way["maxspeed"="RU:motorway"][setting("RU")]::maxspeed 146 151 { 147 152 set maxspeed; … … 286 291 way["maxspeed:forward"="20"]:righthandtraffic::maxspeed, 287 292 way["maxspeed:backward"="20"]!:righthandtraffic::maxspeed, 288 way["maxspeed:forward"="RU:living_street"] :righthandtraffic::maxspeed293 way["maxspeed:forward"="RU:living_street"][setting("RU")]:righthandtraffic::maxspeed 289 294 /* no left hand traffic in RU, so this selector is not needed */ 290 295 { … … 318 323 way["maxspeed:forward"="60"]:righthandtraffic::maxspeed, 319 324 way["maxspeed:backward"="60"]!:righthandtraffic::maxspeed, 320 way["maxspeed:forward"="RU:urban"] :righthandtraffic::maxspeed325 way["maxspeed:forward"="RU:urban"][setting("RU")]:righthandtraffic::maxspeed 321 326 { 322 327 set maxspeed_right; … … 337 342 way["maxspeed:forward"="90"]:righthandtraffic::maxspeed, 338 343 way["maxspeed:backward"="90"]!:righthandtraffic::maxspeed, 339 way["maxspeed:forward"="RU:rural"] :righthandtraffic::maxspeed344 way["maxspeed:forward"="RU:rural"][setting("RU")]:righthandtraffic::maxspeed 340 345 { 341 346 set maxspeed_right; … … 350 355 way["maxspeed:forward"="110"]:righthandtraffic::maxspeed, 351 356 way["maxspeed:backward"="110"]!:righthandtraffic::maxspeed, 352 way["maxspeed:forward"="RU:motorway"] :righthandtraffic::maxspeed357 way["maxspeed:forward"="RU:motorway"][setting("RU")]:righthandtraffic::maxspeed 353 358 { 354 359 set maxspeed_right; … … 511 516 way["maxspeed:forward"="20"]!:righthandtraffic::maxspeed, 512 517 way["maxspeed:backward"="20"]:righthandtraffic::maxspeed, 513 way["maxspeed:backward"="RU:living_street"] :righthandtraffic::maxspeed518 way["maxspeed:backward"="RU:living_street"][setting("RU")]:righthandtraffic::maxspeed 514 519 { 515 520 set maxspeed_left; … … 542 547 way["maxspeed:forward"="60"]!:righthandtraffic::maxspeed, 543 548 way["maxspeed:backward"="60"]:righthandtraffic::maxspeed, 544 way["maxspeed:backward"="RU:urban"] :righthandtraffic::maxspeed549 way["maxspeed:backward"="RU:urban"][setting("RU")]:righthandtraffic::maxspeed 545 550 { 546 551 set maxspeed_left; … … 561 566 way["maxspeed:forward"="90"]!:righthandtraffic::maxspeed, 562 567 way["maxspeed:backward"="90"]:righthandtraffic::maxspeed, 563 way["maxspeed:backward"="RU:rural"] :righthandtraffic::maxspeed568 way["maxspeed:backward"="RU:rural"][setting("RU")]:righthandtraffic::maxspeed 564 569 { 565 570 set maxspeed_left; … … 574 579 way["maxspeed:forward"="110"]!:righthandtraffic::maxspeed, 575 580 way["maxspeed:backward"="110"]:righthandtraffic::maxspeed, 576 way["maxspeed:backward"="RU:motorway"] :righthandtraffic::maxspeed581 way["maxspeed:backward"="RU:motorway"][setting("RU")]:righthandtraffic::maxspeed 577 582 { 578 583 set maxspeed_left; … … 714 719 way[maxspeed=~/[0-9]+ km\/h/]::maxspeed, 715 720 way[maxspeed=~/[0-9]+ knots/]::maxspeed, 716 way[maxspeed="RU:living_street"] ::maxspeed,717 way[maxspeed="RU:urban"] ::maxspeed,718 way[maxspeed="RU:rural"] ::maxspeed,719 way[maxspeed="RU:motorway"] ::maxspeed721 way[maxspeed="RU:living_street"][setting("RU")]::maxspeed, 722 way[maxspeed="RU:urban"][setting("RU")]::maxspeed, 723 way[maxspeed="RU:rural"][setting("RU")]::maxspeed, 724 way[maxspeed="RU:motorway"][setting("RU")]::maxspeed 720 725 { 721 726 set correct_value; … … 727 732 way[maxspeed:forward=~/[0-9]+ km\/h/]::maxspeed, 728 733 way[maxspeed:forward=~/[0-9]+ knots/]::maxspeed, 729 way[maxspeed:forward="RU:living_street"] ::maxspeed,730 way[maxspeed:forward="RU:urban"] ::maxspeed,731 way[maxspeed:forward="RU:rural"] ::maxspeed,732 way[maxspeed:forward="RU:motorway"] ::maxspeed734 way[maxspeed:forward="RU:living_street"][setting("RU")]::maxspeed, 735 way[maxspeed:forward="RU:urban"][setting("RU")]::maxspeed, 736 way[maxspeed:forward="RU:rural"][setting("RU")]::maxspeed, 737 way[maxspeed:forward="RU:motorway"][setting("RU")]::maxspeed 733 738 { 734 739 set correct_value_forward; … … 740 745 way[maxspeed:backward=~/[0-9]+ km\/h/]::maxspeed, 741 746 way[maxspeed:backward=~/[0-9]+ knots/]::maxspeed, 742 way[maxspeed:backward="RU:living_street"] ::maxspeed,743 way[maxspeed:backward="RU:urban"] ::maxspeed,744 way[maxspeed:backward="RU:rural"] ::maxspeed,745 way[maxspeed:backward="RU:motorway"] ::maxspeed747 way[maxspeed:backward="RU:living_street"][setting("RU")]::maxspeed, 748 way[maxspeed:backward="RU:urban"][setting("RU")]::maxspeed, 749 way[maxspeed:backward="RU:rural"][setting("RU")]::maxspeed, 750 way[maxspeed:backward="RU:motorway"][setting("RU")]::maxspeed 746 751 { 747 752 set correct_value_backward;