Changes between Version 20 and Version 21 of Styles/Maxspeed


Ignore:
Timestamp:
2015-01-25T23:06:10+01:00 (10 years ago)
Author:
Klumbumbus
Comment:

add an option to disable the RU:* tagging scheme, as this scheme is used only by a minority. see taginfo

Legend:

Unmodified
Added
Removed
Modified
  • Styles/Maxspeed

    v20 v21  
    5555        link: "http://josm.openstreetmap.de/wiki/De:Styles/Maxspeed";
    5656}
    57 
     57/* create settings */
     58setting::RU {
     59  type: boolean;
     60  label: tr("Support maxspeed=RU:* tagging scheme");
     61  default: true;
     62}
    5863/* disable tiger layer from default internal mappaint style */
    5964way["tiger:reviewed"=no]::core_tiger
     
    9095}
    9196way["maxspeed"="20"]::maxspeed,
    92 way["maxspeed"="RU:living_street"]::maxspeed
     97way["maxspeed"="RU:living_street"][setting("RU")]::maxspeed
    9398{
    9499        set maxspeed;
     
    116121}
    117122way["maxspeed"="60"]::maxspeed,
    118 way["maxspeed"="RU:urban"]::maxspeed
     123way["maxspeed"="RU:urban"][setting("RU")]::maxspeed
    119124{
    120125        set maxspeed;
     
    132137}
    133138way["maxspeed"="90"]::maxspeed,
    134 way["maxspeed"="RU:rural"]::maxspeed
     139way["maxspeed"="RU:rural"][setting("RU")]::maxspeed
    135140{
    136141        set maxspeed;
     
    143148}
    144149way["maxspeed"="110"]::maxspeed,
    145 way["maxspeed"="RU:motorway"]::maxspeed
     150way["maxspeed"="RU:motorway"][setting("RU")]::maxspeed
    146151{
    147152        set maxspeed;
     
    286291way["maxspeed:forward"="20"]:righthandtraffic::maxspeed,
    287292way["maxspeed:backward"="20"]!:righthandtraffic::maxspeed,
    288 way["maxspeed:forward"="RU:living_street"]:righthandtraffic::maxspeed
     293way["maxspeed:forward"="RU:living_street"][setting("RU")]:righthandtraffic::maxspeed
    289294/* no left hand traffic in RU, so this selector is not needed */
    290295{
     
    318323way["maxspeed:forward"="60"]:righthandtraffic::maxspeed,
    319324way["maxspeed:backward"="60"]!:righthandtraffic::maxspeed,
    320 way["maxspeed:forward"="RU:urban"]:righthandtraffic::maxspeed
     325way["maxspeed:forward"="RU:urban"][setting("RU")]:righthandtraffic::maxspeed
    321326{
    322327        set maxspeed_right;
     
    337342way["maxspeed:forward"="90"]:righthandtraffic::maxspeed,
    338343way["maxspeed:backward"="90"]!:righthandtraffic::maxspeed,
    339 way["maxspeed:forward"="RU:rural"]:righthandtraffic::maxspeed
     344way["maxspeed:forward"="RU:rural"][setting("RU")]:righthandtraffic::maxspeed
    340345{
    341346        set maxspeed_right;
     
    350355way["maxspeed:forward"="110"]:righthandtraffic::maxspeed,
    351356way["maxspeed:backward"="110"]!:righthandtraffic::maxspeed,
    352 way["maxspeed:forward"="RU:motorway"]:righthandtraffic::maxspeed
     357way["maxspeed:forward"="RU:motorway"][setting("RU")]:righthandtraffic::maxspeed
    353358{
    354359        set maxspeed_right;
     
    511516way["maxspeed:forward"="20"]!:righthandtraffic::maxspeed,
    512517way["maxspeed:backward"="20"]:righthandtraffic::maxspeed,
    513 way["maxspeed:backward"="RU:living_street"]:righthandtraffic::maxspeed
     518way["maxspeed:backward"="RU:living_street"][setting("RU")]:righthandtraffic::maxspeed
    514519{
    515520        set maxspeed_left;
     
    542547way["maxspeed:forward"="60"]!:righthandtraffic::maxspeed,
    543548way["maxspeed:backward"="60"]:righthandtraffic::maxspeed,
    544 way["maxspeed:backward"="RU:urban"]:righthandtraffic::maxspeed
     549way["maxspeed:backward"="RU:urban"][setting("RU")]:righthandtraffic::maxspeed
    545550{
    546551        set maxspeed_left;
     
    561566way["maxspeed:forward"="90"]!:righthandtraffic::maxspeed,
    562567way["maxspeed:backward"="90"]:righthandtraffic::maxspeed,
    563 way["maxspeed:backward"="RU:rural"]:righthandtraffic::maxspeed
     568way["maxspeed:backward"="RU:rural"][setting("RU")]:righthandtraffic::maxspeed
    564569{
    565570        set maxspeed_left;
     
    574579way["maxspeed:forward"="110"]!:righthandtraffic::maxspeed,
    575580way["maxspeed:backward"="110"]:righthandtraffic::maxspeed,
    576 way["maxspeed:backward"="RU:motorway"]:righthandtraffic::maxspeed
     581way["maxspeed:backward"="RU:motorway"][setting("RU")]:righthandtraffic::maxspeed
    577582{
    578583        set maxspeed_left;
     
    714719way[maxspeed=~/[0-9]+ km\/h/]::maxspeed,
    715720way[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"]::maxspeed
     721way[maxspeed="RU:living_street"][setting("RU")]::maxspeed,
     722way[maxspeed="RU:urban"][setting("RU")]::maxspeed,
     723way[maxspeed="RU:rural"][setting("RU")]::maxspeed,
     724way[maxspeed="RU:motorway"][setting("RU")]::maxspeed
    720725{
    721726        set correct_value;
     
    727732way[maxspeed:forward=~/[0-9]+ km\/h/]::maxspeed,
    728733way[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"]::maxspeed
     734way[maxspeed:forward="RU:living_street"][setting("RU")]::maxspeed,
     735way[maxspeed:forward="RU:urban"][setting("RU")]::maxspeed,
     736way[maxspeed:forward="RU:rural"][setting("RU")]::maxspeed,
     737way[maxspeed:forward="RU:motorway"][setting("RU")]::maxspeed
    733738{
    734739        set correct_value_forward;
     
    740745way[maxspeed:backward=~/[0-9]+ km\/h/]::maxspeed,
    741746way[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"]::maxspeed
     747way[maxspeed:backward="RU:living_street"][setting("RU")]::maxspeed,
     748way[maxspeed:backward="RU:urban"][setting("RU")]::maxspeed,
     749way[maxspeed:backward="RU:rural"][setting("RU")]::maxspeed,
     750way[maxspeed:backward="RU:motorway"][setting("RU")]::maxspeed
    746751{
    747752        set correct_value_backward;