Changes between Version 8 and Version 9 of Rules/OsmoseValidations


Ignore:
Timestamp:
2019-02-09T06:57:47+01:00 (8 days ago)
Author:
abalosc1
Comment:

add osmose 3010 and fix indentation/spacing

Legend:

Unmodified
Added
Removed
Modified
  • Rules/OsmoseValidations

    v8 v9  
    1515
    1616*[amenity=chapel]{
    17         throwWarning: "{0.tag} is deprecated";
    18     group: tr("deprecated tagging - Osmose tagwatch cleaner 3030");     
    19         suggestAlternative: "amenity=place_of_worship, religion=christian";
    20         fixAdd: "amenity=place_of_worship";
    21         fixAdd: "religion=christian";
     17    throwWarning: "{0.tag} is deprecated";
     18    group: tr("deprecated tagging - Osmose tagwatch cleaner 3030");
     19    suggestAlternative: "amenity=place_of_worship, religion=christian";
     20    fixAdd: "amenity=place_of_worship";
     21    fixAdd: "religion=christian";
    2222}
    2323
    2424*[amenity = bakery]{
    25         throwWarning: "{0.tag} is deprecated";
    26     group: tr("deprecated tagging - Osmose tagwatch cleaner 3030");             
    27         suggestAlternative: "shop=bakery";
    28         fixAdd: "shop=bakery";
    29         fixRemove: "amenity"
     25    throwWarning: "{0.tag} is deprecated";
     26    group: tr("deprecated tagging - Osmose tagwatch cleaner 3030");
     27    suggestAlternative: "shop=bakery";
     28    fixAdd: "shop=bakery";
     29    fixRemove: "amenity"
    3030}
    3131
    3232*[amenity = chocolatier]{
    33         throwWarning: "{0.tag} is deprecated";
    34     group: tr("deprecated tagging - Osmose tagwatch cleaner 3030");             
    35         suggestAlternative: "shop=chocolatier";
    36         fixAdd: "shop=chocolatier";
    37         fixRemove: "amenity"
     33    throwWarning: "{0.tag} is deprecated";
     34    group: tr("deprecated tagging - Osmose tagwatch cleaner 3030");
     35    suggestAlternative: "shop=chocolatier";
     36    fixAdd: "shop=chocolatier";
     37    fixRemove: "amenity"
    3838}
    3939
    4040*[amenity = dry_cleaning]{
    41         throwWarning: "{0.tag} is deprecated";
    42     group: tr("deprecated tagging - Osmose tagwatch cleaner 3030");             
    43         suggestAlternative: "shop=dry_cleaning";
    44         fixAdd: "shop=dry_cleaning";
    45         fixRemove: "amenity"
     41    throwWarning: "{0.tag} is deprecated";
     42    group: tr("deprecated tagging - Osmose tagwatch cleaner 3030");
     43    suggestAlternative: "shop=dry_cleaning";
     44    fixAdd: "shop=dry_cleaning";
     45    fixRemove: "amenity"
    4646}
    4747
    4848*[amenity = emergency_phone]{
    49         throwWarning: "{0.tag} is deprecated";
    50     group: tr("deprecated tagging - Osmose tagwatch cleaner 3030");             
    51         suggestAlternative: "emergency=phone";
    52         fixAdd: "emergency=phone";
    53         fixRemove: "amenity"
     49    throwWarning: "{0.tag} is deprecated";
     50    group: tr("deprecated tagging - Osmose tagwatch cleaner 3030");
     51    suggestAlternative: "emergency=phone";
     52    fixAdd: "emergency=phone";
     53    fixRemove: "amenity"
    5454}
    5555
     
    5959*[shop = flower],
    6060*[shop = flowers] {
    61         throwWarning: "{0.tag} is deprecated";
    62     group: tr("deprecated tagging - Osmose tagwatch cleaner 3030");             
    63         suggestAlternative: "shop=florist";
    64         fixAdd: "shop=florist";
    65         fixRemove: "amenity"
     61    throwWarning: "{0.tag} is deprecated";
     62    group: tr("deprecated tagging - Osmose tagwatch cleaner 3030");
     63    suggestAlternative: "shop=florist";
     64    fixAdd: "shop=florist";
     65    fixRemove: "amenity"
    6666}
    6767
     
    6969*[amenity = butcher],
    7070*[shop = butchers] {
    71         throwWarning: "{0.tag} is deprecated";
    72     group: tr("deprecated tagging - Osmose tagwatch cleaner 3030");             
    73         suggestAlternative: "shop=butcher";
    74         fixAdd: "shop=butcher";
    75         fixRemove: "amenity"
     71    throwWarning: "{0.tag} is deprecated";
     72    group: tr("deprecated tagging - Osmose tagwatch cleaner 3030");
     73    suggestAlternative: "shop=butcher";
     74    fixAdd: "shop=butcher";
     75    fixRemove: "amenity"
    7676}
    7777
     
    8282*[shop *= "driving school"],
    8383*[shop *= "driver education"] {
    84         throwWarning: tr("{0}", "{0.tag}");
    85         suggestAlternative: "shop=driving_school";
    86         fixAdd: "shop=car_school";
     84  throwWarning: tr("{0}", "{0.tag}");
     85  suggestAlternative: "shop=driving_school";
     86  fixAdd: "shop=car_school";
    8787}
    8888
    8989
    9090*[shop=bakers]{
    91         throwWarning: "{0.tag} is deprecated";
    92     group: tr("deprecated tagging - Osmose tagwatch cleaner 3030");             
    93         suggestAlternative: "shop=bakery";
    94         fixAdd: "shop=bakery";
     91    throwWarning: "{0.tag} is deprecated";
     92    group: tr("deprecated tagging - Osmose tagwatch cleaner 3030");
     93    suggestAlternative: "shop=bakery";
     94    fixAdd: "shop=bakery";
    9595}
    9696
     
    9999*[shop = garden_center],
    100100*[shop = gardening]{
    101         throwWarning: "{0.tag} is deprecated";
    102     group: tr("deprecated tagging - Osmose tagwatch cleaner 3030");             
    103         suggestAlternative: "shop=garden_centre";
    104         fixAdd: "shop=garden_centre"
     101    throwWarning: "{0.tag} is deprecated";
     102    group: tr("deprecated tagging - Osmose tagwatch cleaner 3030");
     103    suggestAlternative: "shop=garden_centre";
     104    fixAdd: "shop=garden_centre"
    105105}
    106106
    107107/* Deprecated Tags-- OSMOSE disused Item 4010*/
    108 /* For deprecated tags not already found by JOSM */ 
     108/* For deprecated tags not already found by JOSM */
    109109
    110110*[aerialway=canopy]{
    111         throwWarning: "{0.tag} is deprecated";
    112     group: tr("deprecated tagging - Osmose disused 4010");
    113         suggestAlternative: "aerialway=zip_line";
    114         fixAdd: "aerialway=zipline";
    115 }
     111    throwWarning: "{0.tag} is deprecated";
     112    group: tr("deprecated tagging - Osmose disused 4010");
     113    suggestAlternative: "aerialway=zip_line";
     114    fixAdd: "aerialway=zipline";
     115}
     116
    116117*[amenity=abandoned]{
    117         throwWarning: "{0.tag} is deprecated";
    118     group: tr("deprecated tagging - Osmose disused 4010");
    119         suggestAlternative: "abandoned:amenity=*"
    120 }
     118    throwWarning: "{0.tag} is deprecated";
     119    group: tr("deprecated tagging - Osmose disused 4010");
     120    suggestAlternative: "abandoned:amenity=*"
     121}
     122
    121123*[amenity=citymap_post]{
    122         throwWarning: "{0.tag} is deprecated";
    123     group: tr("deprecated tagging - Osmose disused 4010");
    124         suggestAlternative: "tourism=information";
    125         fixRemove: "amenity";
    126         fixAdd: "tourism=information";
    127 }
     124    throwWarning: "{0.tag} is deprecated";
     125    group: tr("deprecated tagging - Osmose disused 4010");
     126    suggestAlternative: "tourism=information";
     127    fixRemove: "amenity";
     128    fixAdd: "tourism=information";
     129}
     130
    128131*[amenity=creche]{
    129         throwWarning: "{0.tag} is deprecated";
    130     group: tr("deprecated tagging - Osmose disused 4010");
    131         suggestAlternative: "amenity=childcare or amenity=kindergarten"
    132 }
     132    throwWarning: "{0.tag} is deprecated";
     133    group: tr("deprecated tagging - Osmose disused 4010");
     134    suggestAlternative: "amenity=childcare or amenity=kindergarten"
     135}
     136
    133137*[amenity=ev_charging],
    134138*[amenity=charging]{
    135         throwWarning: "{0.tag} is deprecated";
    136     group: tr("deprecated tagging - Osmose disused 4010");
    137         suggestAlternative: "amenity=charging_station";
    138         fixRemove: "amenity";
    139         fixAdd: "amenity=charging_station";
    140 }
     139    throwWarning: "{0.tag} is deprecated";
     140    group: tr("deprecated tagging - Osmose disused 4010");
     141    suggestAlternative: "amenity=charging_station";
     142    fixRemove: "amenity";
     143    fixAdd: "amenity=charging_station";
     144}
     145
    141146*[amenity=fire_hydrant]{
    142         throwWarning: "{0.tag} is deprecated";
    143     group: tr("deprecated tagging - Osmose disused 4010");   
    144         suggestAlternative: "emergency=fire_hydrant";
    145         fixRemove: "amenity";
    146         fixAdd: "emergency=fire_hydrant";
    147 }
     147    throwWarning: "{0.tag} is deprecated";
     148    group: tr("deprecated tagging - Osmose disused 4010");
     149    suggestAlternative: "emergency=fire_hydrant";
     150    fixRemove: "amenity";
     151    fixAdd: "emergency=fire_hydrant";
     152}
     153
    148154*[amenity=garages],
    149155*[amenity=garage]{
    150         throwWarning: "{0.tag} is deprecated";
    151     group: tr("deprecated tagging - Osmose disused 4010");
    152         suggestAlternative: "amenity=parking + parking=* or landuse=garages";
    153 }
     156    throwWarning: "{0.tag} is deprecated";
     157    group: tr("deprecated tagging - Osmose disused 4010");
     158    suggestAlternative: "amenity=parking + parking=* or landuse=garages";
     159}
     160
    154161*[amenity=nursery]{
    155         throwWarning: "{0.tag} is deprecated";
    156     group: tr("deprecated tagging - Osmose disused 4010");
    157         suggestAlternative: "amenity=childcare or amenity=kindergarten";
    158 }
     162    throwWarning: "{0.tag} is deprecated";
     163    group: tr("deprecated tagging - Osmose disused 4010");
     164    suggestAlternative: "amenity=childcare or amenity=kindergarten";
     165}
     166
    159167*[amenity=preschool]{
    160         throwWarning: "{0.tag} is deprecated";
    161     group: tr("deprecated tagging - Osmose disused 4010");
    162         suggestAlternative: "amenity=kindergarten";
    163         fixAdd: "amenity=kindergarten";
    164 }
     168    throwWarning: "{0.tag} is deprecated";
     169    group: tr("deprecated tagging - Osmose disused 4010");
     170    suggestAlternative: "amenity=kindergarten";
     171    fixAdd: "amenity=kindergarten";
     172}
     173
    165174*[amenity=real_estate]{
    166         throwWarning: "{0.tag} is deprecated";
    167     group: tr("deprecated tagging - Osmose disused 4010");
    168         suggestAlternative: "office=estate_agent";
    169         fixRemove: "amenity";
    170         fixAdd: "office=estate_agent";
    171 }
     175    throwWarning: "{0.tag} is deprecated";
     176    group: tr("deprecated tagging - Osmose disused 4010");
     177    suggestAlternative: "office=estate_agent";
     178    fixRemove: "amenity";
     179    fixAdd: "office=estate_agent";
     180}
     181
    172182*[office=real_estate]{
    173         throwWarning: "{0.tag} is deprecated";
    174     group: tr("deprecated tagging - Osmose disused 4010");
    175         suggestAlternative: "office=estate_agent";
    176         fixAdd: "office=estate_agent";
    177 }
     183    throwWarning: "{0.tag} is deprecated";
     184    group: tr("deprecated tagging - Osmose disused 4010");
     185    suggestAlternative: "office=estate_agent";
     186    fixAdd: "office=estate_agent";
     187}
     188
    178189*[shop=real_estate]{
    179         throwWarning: "{0.tag} is deprecated";
    180     group: tr("deprecated tagging - Osmose disused 4010");
    181         suggestAlternative: "office=estate_agent";
    182         fixRemove: "shop";
    183         fixAdd: "office=estate_agent";
    184 }
     190    throwWarning: "{0.tag} is deprecated";
     191    group: tr("deprecated tagging - Osmose disused 4010");
     192    suggestAlternative: "office=estate_agent";
     193    fixRemove: "shop";
     194    fixAdd: "office=estate_agent";
     195}
     196
    185197*[amenity=sauna]{
    186         throwWarning: "{0.tag} is deprecated";
    187     group: tr("deprecated tagging - Osmose disused 4010");
    188         suggestAlternative: "leisure=sauna";
    189         fixRemove: "amenity";
    190         fixAdd: "leisure=sauna";
    191 }
     198    throwWarning: "{0.tag} is deprecated";
     199    group: tr("deprecated tagging - Osmose disused 4010");
     200    suggestAlternative: "leisure=sauna";
     201    fixRemove: "amenity";
     202    fixAdd: "leisure=sauna";
     203}
     204
    192205*[amenity=winery]{
    193         throwWarning: "{0.tag} is deprecated";
    194     group: tr("deprecated tagging - Osmose disused 4010");
    195         suggestAlternative: "shop=winery or craft=winery";
    196 }
     206    throwWarning: "{0.tag} is deprecated";
     207    group: tr("deprecated tagging - Osmose disused 4010");
     208    suggestAlternative: "shop=winery or craft=winery";
     209}
     210
    197211*[amenity=youth_centre],
    198212*[amenity=youth_center]{
    199         throwWarning: "{0.tag} is deprecated";
    200     group: tr("deprecated tagging - Osmose disused 4010");
    201         suggestAlternative: "amenity=community_centre + community_centre:for=juvenile or community_centre:for=child;juvenile";
    202 }
     213    throwWarning: "{0.tag} is deprecated";
     214    group: tr("deprecated tagging - Osmose disused 4010");
     215    suggestAlternative: "amenity=community_centre + community_centre:for=juvenile or community_centre:for=child;juvenile";
     216}
     217
    203218*[bridge=arch],
    204219*[bridge=beam],
    205220*[bridge=humpback],
    206221*[bridge=suspension]{
    207         throwWarning: "{0.tag} is deprecated";
    208     group: tr("deprecated tagging - Osmose disused 4010");
    209         suggestAlternative: "bridge=yes + bridge:structure={0.value}";
    210         fixAdd: "bridge=yes";
    211         fixAdd: "bridge:structure={0.value}";
    212 }
     222    throwWarning: "{0.tag} is deprecated";
     223    group: tr("deprecated tagging - Osmose disused 4010");
     224    suggestAlternative: "bridge=yes + bridge:structure={0.value}";
     225    fixAdd: "bridge=yes";
     226    fixAdd: "bridge:structure={0.value}";
     227}
     228
    213229*[bridge=lift],
    214230*[bridge=swing]{
    215         throwWarning: "{0.tag} is deprecated";
     231    throwWarning: "{0.tag} is deprecated";
    216232    group: tr("deprecated tagging - Osmose disused 4010");
    217233    suggestAlternative: "bridge=movable + bridge:structure={0.value}";
     
    219235    fixAdd: "bridge:structure={0.value}";
    220236}
     237
    221238*[bridge=pontoon]{
    222         throwWarning: "{0.tag} is deprecated";
    223     group: tr("deprecated tagging - Osmose disused 4010");
    224         suggestAlternative: "bridge=yes + bridge:structure=floating";
    225         fixAdd: "bridge=yes";
    226         fixAdd: "bridge:structure=floating";
    227 }
     239    throwWarning: "{0.tag} is deprecated";
     240    group: tr("deprecated tagging - Osmose disused 4010");
     241    suggestAlternative: "bridge=yes + bridge:structure=floating";
     242    fixAdd: "bridge=yes";
     243    fixAdd: "bridge:structure=floating";
     244}
     245
    228246*[building:type]{
    229         throwWarning: "{0.tag} is deprecated";
    230     group: tr("deprecated tagging - Osmose disused 4010");
    231         suggestAlternative: "building=*";
    232 }
     247    throwWarning: "{0.tag} is deprecated";
     248    group: tr("deprecated tagging - Osmose disused 4010");
     249    suggestAlternative: "building=*";
     250}
     251
    233252*[escalator]{
    234         throwWarning: "{0.tag} is deprecated";
    235     group: tr("deprecated tagging - Osmose disused 4010");
    236         suggestAlternative: "highway=steps + conveying=*";
    237 }
     253    throwWarning: "{0.tag} is deprecated";
     254    group: tr("deprecated tagging - Osmose disused 4010");
     255    suggestAlternative: "highway=steps + conveying=*";
     256}
     257
    238258*[fenced]{
    239         throwWarning: "{0.tag} is deprecated";
    240     group: tr("deprecated tagging - Osmose disused 4010");
    241         suggestAlternative: "barrier=fence";
    242         fixRemove: "fenced";
    243         fixAdd: "barrier=fence";
    244 }
     259    throwWarning: "{0.tag} is deprecated";
     260    group: tr("deprecated tagging - Osmose disused 4010");
     261    suggestAlternative: "barrier=fence";
     262    fixRemove: "fenced";
     263    fixAdd: "barrier=fence";
     264}
     265
    245266*[highway=abandoned]{
    246         throwWarning: "{0.tag} is deprecated";
    247     group: tr("deprecated tagging - Osmose disused 4010");
    248         suggestAlternative: "abandoned:highway=*";
    249 }
     267    throwWarning: "{0.tag} is deprecated";
     268    group: tr("deprecated tagging - Osmose disused 4010");
     269    suggestAlternative: "abandoned:highway=*";
     270}
     271
    250272*[highway=minor]{
    251         throwWarning: "{0.tag} is deprecated";
    252     group: tr("deprecated tagging - Osmose disused 4010");
    253         suggestAlternative: "highway=tertiary or highway=unclassified or highway=service";
    254 }
     273    throwWarning: "{0.tag} is deprecated";
     274    group: tr("deprecated tagging - Osmose disused 4010");
     275    suggestAlternative: "highway=tertiary or highway=unclassified or highway=service";
     276}
     277
    255278*[historic_name]{
    256         throwWarning: "{0.tag} is deprecated";
    257     group: tr("deprecated tagging - Osmose disused 4010");
    258         suggestAlternative: "old_name=* or name=*";
    259 }
     279    throwWarning: "{0.tag} is deprecated";
     280    group: tr("deprecated tagging - Osmose disused 4010");
     281    suggestAlternative: "old_name=* or name=*";
     282}
     283
    260284*[historic=museum]{
    261         throwWarning: "{0.tag} is deprecated";
    262     group: tr("deprecated tagging - Osmose disused 4010");
    263         suggestAlternative: "tourism=museum";
    264         fixRemove: "historic";
    265         fixAdd: "tourism=museum";
    266 }
     285    throwWarning: "{0.tag} is deprecated";
     286    group: tr("deprecated tagging - Osmose disused 4010");
     287    suggestAlternative: "tourism=museum";
     288    fixRemove: "historic";
     289    fixAdd: "tourism=museum";
     290}
     291
    267292*[landuse=field]{
    268         throwWarning: "{0.tag} is deprecated";
    269     group: tr("deprecated tagging - Osmose disused 4010");
    270         suggestAlternative: "landuse=farmland";
    271         fixAdd: "landuse=farmland";
    272 }
     293    throwWarning: "{0.tag} is deprecated";
     294    group: tr("deprecated tagging - Osmose disused 4010");
     295    suggestAlternative: "landuse=farmland";
     296    fixAdd: "landuse=farmland";
     297}
     298
    273299*[leisure=beach]{
    274         throwWarning: "{0.tag} is deprecated";
    275     group: tr("deprecated tagging - Osmose disused 4010");
    276         suggestAlternative: "natural=beach";
    277         fixRemove: "leisure";
    278         fixAdd: "natural=beach";
    279 }
     300    throwWarning: "{0.tag} is deprecated";
     301    group: tr("deprecated tagging - Osmose disused 4010");
     302    suggestAlternative: "natural=beach";
     303    fixRemove: "leisure";
     304    fixAdd: "natural=beach";
     305}
     306
    280307*[leisure=club]{
    281         throwWarning: "{0.tag} is deprecated";
    282     group: tr("deprecated tagging - Osmose disused 4010");
    283         suggestAlternative: "club=*";
    284 }
     308    throwWarning: "{0.tag} is deprecated";
     309    group: tr("deprecated tagging - Osmose disused 4010");
     310    suggestAlternative: "club=*";
     311}
     312
    285313*[leisure=video_arcade]{
    286         throwWarning: "{0.tag} is deprecated";
    287     group: tr("deprecated tagging - Osmose disused 4010");
    288         suggestAlternative: "leisure=adult_gaming_centre or leisure=amusement_arcade";
    289 }
     314    throwWarning: "{0.tag} is deprecated";
     315    group: tr("deprecated tagging - Osmose disused 4010");
     316    suggestAlternative: "leisure=adult_gaming_centre or leisure=amusement_arcade";
     317}
     318
    290319*[man_made=cooling_tower]{
    291         throwWarning: "{0.tag} is deprecated";
    292     group: tr("deprecated tagging - Osmose disused 4010");
    293         suggestAlternative: "man_made=tower + tower:type=cooling";
    294         fixAdd: "man_made=tower";
    295         fixAdd: "tower:type=cooling";
     320    throwWarning: "{0.tag} is deprecated";
     321    group: tr("deprecated tagging - Osmose disused 4010");
     322    suggestAlternative: "man_made=tower + tower:type=cooling";
     323    fixAdd: "man_made=tower";
     324    fixAdd: "tower:type=cooling";
    296325}
    297326*[man_made=hot_water_tank]{
    298         throwWarning: "{0.tag} is deprecated";
    299     group: tr("deprecated tagging - Osmose disused 4010");
    300         suggestAlternative: "man_made=storage_tank + content=hot_water";
    301         fixAdd: "man_made=storage_tank";
    302         fixAdd: "content=hot_water";
     327    throwWarning: "{0.tag} is deprecated";
     328    group: tr("deprecated tagging - Osmose disused 4010");
     329    suggestAlternative: "man_made=storage_tank + content=hot_water";
     330    fixAdd: "man_made=storage_tank";
     331    fixAdd: "content=hot_water";
    303332}
    304333*[man_made=jetty]{
    305         throwWarning: "{0.tag} is deprecated";
    306     group: tr("deprecated tagging - Osmose disused 4010");   
    307         suggestAlternative: "man_made=pier";
    308         fixAdd: "man_made=pier";
    309 }
     334    throwWarning: "{0.tag} is deprecated";
     335    group: tr("deprecated tagging - Osmose disused 4010");
     336    suggestAlternative: "man_made=pier";
     337    fixAdd: "man_made=pier";
     338}
     339
    310340*[man_made=village_pump]{
    311         throwWarning: "{0.tag} is deprecated";
    312     group: tr("deprecated tagging - Osmose disused 4010");
    313         suggestAlternative: "man_made=water_well";
    314         fixAdd: "man_made=water_well";
    315 }
     341    throwWarning: "{0.tag} is deprecated";
     342    group: tr("deprecated tagging - Osmose disused 4010");
     343    suggestAlternative: "man_made=water_well";
     344    fixAdd: "man_made=water_well";
     345}
     346
    316347*[man_made=water_tank]{
    317             throwWarning: "{0.tag} is deprecated";
     348    throwWarning: "{0.tag} is deprecated";
    318349    group: tr("deprecated tagging - Osmose disused 4010");
    319350    suggestAlternative: "man_made=storage_tank + content=water";
     
    321352    fixAdd: "content=water";
    322353}
     354
    323355*[natural=moor]{
    324         throwWarning: "{0.tag} is deprecated";
    325     group: tr("deprecated tagging - Osmose disused 4010");
    326 }
     356    throwWarning: "{0.tag} is deprecated";
     357    group: tr("deprecated tagging - Osmose disused 4010");
     358}
     359
    327360*[noexit=no]{
    328         throwWarning: "{0.tag} is deprecated";
     361    throwWarning: "{0.tag} is deprecated";
    329362    group: tr("deprecated tagging - Osmose disused 4010");
    330363    suggestAlternative: "fixme=continue";
    331364}
     365
    332366*[office=administrative]{
    333         throwWarning: "{0.tag} is deprecated";
    334     group: tr("deprecated tagging - Osmose disused 4010");
    335         suggestAlternative: "office=government";
    336         fixAdd: "office=government";
     367    throwWarning: "{0.tag} is deprecated";
     368    group: tr("deprecated tagging - Osmose disused 4010");
     369    suggestAlternative: "office=government";
     370    fixAdd: "office=government";
    337371}
    338372*[power=underground_cable]{
    339         throwWarning: "{0.tag} is deprecated";
    340     group: tr("deprecated tagging - Osmose disused 4010");
    341         suggestAlternative: "power=cable + location=underground";
    342         fixAdd: "power=cable";
    343         fixAdd: "location=underground";
    344 }
     373    throwWarning: "{0.tag} is deprecated";
     374    group: tr("deprecated tagging - Osmose disused 4010");
     375    suggestAlternative: "power=cable + location=underground";
     376    fixAdd: "power=cable";
     377    fixAdd: "location=underground";
     378}
     379
    345380*[railway=preserved]{
    346         throwWarning: "{0.tag} is deprecated";
    347     group: tr("deprecated tagging - Osmose disused 4010");
    348         suggestAlternative: "historic=railway + railway= + railway:preserved=yes";
    349 }
     381    throwWarning: "{0.tag} is deprecated";
     382    group: tr("deprecated tagging - Osmose disused 4010");
     383    suggestAlternative: "historic=railway + railway= + railway:preserved=yes";
     384}
     385
    350386*[shop=dive]{
    351         throwWarning: "{0.tag} is deprecated";
    352     group: tr("deprecated tagging - Osmose disused 4010");
    353         suggestAlternative: "shop=scuba_diving";
    354         fixAdd: "shop=scuba_diving";
     387    throwWarning: "{0.tag} is deprecated";
     388    group: tr("deprecated tagging - Osmose disused 4010");
     389    suggestAlternative: "shop=scuba_diving";
     390    fixAdd: "shop=scuba_diving";
    355391}
    356392*[shop=furnace]{
    357         throwWarning: "{0.tag} is deprecated";
    358     group: tr("deprecated tagging - Osmose disused 4010");
    359         suggestAlternative: "shop=fireplace or shop=houseware";
    360 }
     393    throwWarning: "{0.tag} is deprecated";
     394    group: tr("deprecated tagging - Osmose disused 4010");
     395    suggestAlternative: "shop=fireplace or shop=houseware";
     396}
     397
    361398*[shop=moneylender]{
    362         throwWarning: "{0.tag} is deprecated";
    363     group: tr("deprecated tagging - Osmose disused 4010");
    364         suggestAlternative: "shop=money_lender";
    365         fixAdd: "shop=money_lender";
    366 }
     399    throwWarning: "{0.tag} is deprecated";
     400    group: tr("deprecated tagging - Osmose disused 4010");
     401    suggestAlternative: "shop=money_lender";
     402    fixAdd: "shop=money_lender";
     403}
     404
    367405*[sport=paragliding]{
    368         throwWarning: "{0.tag} is deprecated";
    369     group: tr("deprecated tagging - Osmose disused 4010");
    370         suggestAlternative: "sport=free_flying";
    371         fixAdd: "sport=free_flying";
    372 }
     406    throwWarning: "{0.tag} is deprecated";
     407    group: tr("deprecated tagging - Osmose disused 4010");
     408    suggestAlternative: "sport=free_flying";
     409    fixAdd: "sport=free_flying";
     410}
     411
    373412*[tourism=bed_and_breakfast]{
    374         throwWarning: "{0.tag} is deprecated";
    375     group: tr("deprecated tagging - Osmose disused 4010");
    376         suggestAlternative: "tourism=guest_house + guest_house=bed_and_breakfast";
    377         fixAdd: "tourism=guest_house";
    378         fixAdd: "guest_house=bed_and_breakfast";
    379 }
     413    throwWarning: "{0.tag} is deprecated";
     414    group: tr("deprecated tagging - Osmose disused 4010");
     415    suggestAlternative: "tourism=guest_house + guest_house=bed_and_breakfast";
     416    fixAdd: "tourism=guest_house";
     417    fixAdd: "guest_house=bed_and_breakfast";
     418}
     419
    380420*[wood]{
    381         throwWarning: "{0.tag} is deprecated";
    382     group: tr("deprecated tagging - Osmose disused 4010");
    383         suggestAlternative: "leaf_type=*";
    384 }
     421    throwWarning: "{0.tag} is deprecated";
     422    group: tr("deprecated tagging - Osmose disused 4010");
     423    suggestAlternative: "leaf_type=*";
     424}
     425
    385426*[man_made=MDF],
    386427*[man_made=mdf]{
    387         throwWarning: "{0.tag} is deprecated";
    388     group: tr("deprecated tagging - Osmose disused 4010");
    389         suggestAlternative: "telecom=exchange";
    390         fixRemove: "man_made";
    391         fixAdd: "telecom=exchange";
     428    throwWarning: "{0.tag} is deprecated";
     429    group: tr("deprecated tagging - Osmose disused 4010");
     430    suggestAlternative: "telecom=exchange";
     431    fixRemove: "man_made";
     432    fixAdd: "telecom=exchange";
    392433}
    393434
    394435/* elevation 2020 */
    395436node[natural=peak][!ele], node[mountain_pass=yes][!ele]{
    396         throwError: "Missing {1.key} tag (elevation)";
    397     group: tr("elevation - Osmose 2020");                       
     437    throwError: "Missing {1.key} tag (elevation)";
     438    group: tr("elevation - Osmose 2020");
    398439}
    399440
    400441/* place without name 6030 */
    401442*[place][!name]{
    402         throwError: "{0.key} without {1.key}";
    403     group: tr("place without name - Osmose 6030");                             
    404 }
    405 
    406 /* not-connected highway/cycleway -- OSMOSE Item 1210 */ 
     443    throwError: "{0.key} without {1.key}";
     444    group: tr("place without name - Osmose 6030");
     445}
     446
     447/* not-connected highway/cycleway -- OSMOSE Item 1210 */
    407448
    408449/* Set connected_node */
    409450
    410451way[highway] node:connection {
    411         set connected_node;
    412 }
    413 
    414 /* set nodes in downloaded area */ 
     452    set connected_node;
     453}
     454
     455/* set nodes in downloaded area */
    415456
    416457way[highway] node:in-downloaded-area {
    417         set downloaded;
     458    set downloaded;
    418459}
    419460
     
    422463
    423464way[highway] node:new {
    424         set new_feature;
    425 }
    426 
    427 
    428 /* Unconnected Cycleway */ 
     465    set new_feature;
     466}
     467
     468
     469/* Unconnected Cycleway */
    429470
    430471way[highway=cycleway]!:closed!.connected_node.downloaded >[index=1] node[noexit!=yes][amenity!=parking_entrance][amenity!=parking],
     
    432473way[highway=cycleway]!:closed!.connected_node.new_feature >[index=1] node[noexit!=yes][amenity!=parking_entrance][amenity!=parking],
    433474way[highway=cycleway]!:closed!.connected_node.new_feature >[index=-1] node[noexit!=yes][amenity!=parking_entrance][amenity!=parking] {
    434                 throwWarning: "Unconnected Cycleway";
    435         group: tr("Not-connected highway/cycleway -- OSMOSE Item 1210");
     475    throwWarning: "Unconnected Cycleway";
     476    group: tr("Not-connected highway/cycleway -- OSMOSE Item 1210");
    436477}
    437478
     
    442483way[highway=~/^(motorway|trunk|primary|secondary|tertiary)$/]!:closed!.connected_node.new_feature >[index=-1] node[noexit!=yes][amenity!=parking_entrance][amenity!=parking],
    443484way[highway=~/^(motorway|trunk|primary|secondary|tertiary)$/]!:closed!.connected_node.new_feature >[index=1] node[noexit!=yes][amenity!=parking_entrance][amenity!=parking] {
    444                 throwWarning: "Unconnected Major Road";
    445         group: tr("Not-connected highway/cycleway -- OSMOSE Item 1210");
     485    throwWarning: "Unconnected Major Road";
     486    group: tr("Not-connected highway/cycleway -- OSMOSE Item 1210");
    446487}
    447488
     
    449490
    450491relation[type] >[index=-1] way {
    451         set member;
     492    set member;
    452493}
    453494
    454495relation[type] >[index=1].member way {
    455                 throwWarning: "One Member Relation: Check for other members";
    456         group: "Osmose Item 1200";
     496    throwWarning: "One Member Relation: Check for other members";
     497    group: "Osmose Item 1200";
    457498}
    458499
     
    460501
    461502/*class 2*/
    462  way[highway*="_link"][eval(waylength()) > 1000] {
    463                 throwWarning: "bad highway link";
    464         group: tr("highway too long for *_link -- OSMOSE item 1110/2");
    465  }
     503way[highway*="_link"][eval(waylength()) > 1000] {
     504    throwWarning: "bad highway link";
     505    group: tr("highway too long for *_link -- OSMOSE item 1110/2");
     506}
    466507
    467508
    468509 /* Bridge to tag -- OSMOSE Item 7012 */
    469510way[bridge=yes][!/^bridge:/][eval(waylength()) > 500] {
    470                 throwWarning: "bridge deserving of more detail use bridge:structure= or bridge:support=; ";
    471         group: tr("bridge to tag -- OSMOSE Item 7012");
     511    throwWarning: "bridge deserving of more detail use bridge:structure= or bridge:support=; ";
     512    group: tr("bridge to tag -- OSMOSE Item 7012");
    472513}
    473514
     
    476517
    477518*[junction=roundabout][oneway] {
    478                 throwWarning: "Unnecessary oneway tag";
    479         group: tr("on junction=roundabout -- OSMOSE Item 4020");
    480         fixRemove: "oneway";
     519    throwWarning: "Unnecessary oneway tag";
     520    group: tr("on junction=roundabout -- OSMOSE Item 4020");
     521    fixRemove: "oneway";
    481522}
    482523
    483524*[junction=roundabout][ref] {
    484                 throwWarning: "Unnecessary ref tag";
    485         group: tr("on junction=roundabout -- OSMOSE Item 4020");
    486         fixRemove: "ref";
     525    throwWarning: "Unnecessary ref tag";
     526    group: tr("on junction=roundabout -- OSMOSE Item 4020");
     527    fixRemove: "ref";
    487528}
    488529
    489530*[junction=roundabout][area] {
    490                 throwWarning: "Unnecessary area tag";
    491         group: tr("on junction=roundabout -- OSMOSE Item 4020");
    492         fixRemove: "area";
     531    throwWarning: "Unnecessary area tag";
     532    group: tr("on junction=roundabout -- OSMOSE Item 4020");
     533    fixRemove: "area";
    493534}
    494535
     
    499540
    500541way[highway] node:connection {
    501         set highway_node;
     542    set highway_node;
    502543}
    503544
    504545way[junction=roundabout] node.highway_node {
    505         set junc_node
     546    set junc_node
    506547}
    507548
     
    510551Typically does not apply
    511552node[junction=roundabout] < way[highway][!oneway][eval(waylength()) < 100] {
    512                 throwError: "Missing Oneway - Check highway entering/exiting roundabout";
    513         group: tr("oneway -- OSMOSE Item 2030/2")
     553    throwError: "Missing Oneway - Check highway entering/exiting roundabout";
     554    group: tr("oneway -- OSMOSE Item 2030/2")
    514555}
    515556*/
     
    517558
    518559way[highway][!junction][!oneway][eval(waylength()) < 100]  node.junc_node {
    519                 throwWarning: "Missing Oneway - Check highway entering/exiting roundabout";
    520         group: tr("oneway -- OSMOSE Item 2030/2")
     560    throwWarning: "Missing Oneway - Check highway entering/exiting roundabout";
     561    group: tr("oneway -- OSMOSE Item 2030/2")
    521562}
    522563
     
    526567way[cycleway=opposite][!oneway],
    527568way[cycleway=opposite_lane][!oneway] {
    528                 throwWarning: "Opposite cycleway without oneway";
    529         group: tr("oneway -- OSMOSE Item 2030/20301");
     569    throwWarning: "Opposite cycleway without oneway";
     570    group: tr("oneway -- OSMOSE Item 2030/20301");
    530571}
    531572
    532573/* source -- OSMOSE Item 2040 -- administrative boundary does not contain tag source=* */
    533574way[boundary=administrative][!source]{
    534                 throwError: "administrative boundary does not have source tag";
    535         group: "source -- OSMOSE Item 2040";
    536 }
     575    throwError: "administrative boundary does not have source tag";
     576    group: "source -- OSMOSE Item 2040";
     577}
     578
     579
    537580
    538581/* OSMOSE sudden highway type change -- Item 1090 */
     
    541584
    542585way[highway=primary] node:connection {
    543         set hwy_cont_primary;
     586    set hwy_cont_primary;
    544587}
    545588
    546589way[highway=secondary] node:connection {
    547         set hwy_cont_secondary;
     590    set hwy_cont_secondary;
    548591}
    549592
    550593way[highway=tertiary] node:connection {
    551         set hwy_cont_tertiary;
     594    set hwy_cont_tertiary;
    552595}
    553596
    554597way[highway=unclassified] node:connection {
    555         set hwy_cont_unclassified;
     598    set hwy_cont_unclassified;
    556599}
    557600
    558601way[highway=residential] node:connection,
    559602way[highway=living_street] node:connection {
    560         set hwy_cont_residential;
     603    set hwy_cont_residential;
    561604}
    562605
     
    567610way[highway=motorway].hwy_cont_primary >[index=-1] node,
    568611way[highway=motorway].hwy_cont_primary >[index=1] node {
    569                 throwWarning: "motorway connected to primary road - check for sudden highway type change";
    570         group: tr("Sudden highway type change -- OSMOSE Item 1090/1");
     612    throwWarning: "motorway connected to primary road - check for sudden highway type change";
     613    group: tr("Sudden highway type change -- OSMOSE Item 1090/1");
    571614}
    572615
    573616way[highway=motorway].hwy_cont_secondary >[index=-1] node,
    574617way[highway=motorway].hwy_cont_secondary >[index=1] node {
    575                 throwWarning: "motorway connected to secondary road - check for sudden highway type change";
    576         group: tr("Sudden highway type change -- OSMOSE Item 1090/1");
     618    throwWarning: "motorway connected to secondary road - check for sudden highway type change";
     619    group: tr("Sudden highway type change -- OSMOSE Item 1090/1");
    577620}
    578621
    579622way[highway=motorway].hwy_cont_tertiary >[index=-1] node,
    580623way[highway=motorway].hwy_cont_tertiary >[index=1] node {
    581                 throwWarning: "motorway connected to tertiary road - check for sudden highway type change";
    582         group: tr("Sudden highway type change -- OSMOSE Item 1090/1");
     624    throwWarning: "motorway connected to tertiary road - check for sudden highway type change";
     625    group: tr("Sudden highway type change -- OSMOSE Item 1090/1");
    583626}
    584627
    585628way[highway=motorway].hwy_cont_unclassified >[index=-1] node,
    586629way[highway=motorway].hwy_cont_unclassified >[index=1] node {
    587                 throwWarning: "motorway connected to unclassified road - check for sudden highway type change";
    588         group: tr("Sudden highway type change -- OSMOSE Item 1090/1");
     630    throwWarning: "motorway connected to unclassified road - check for sudden highway type change";
     631    group: tr("Sudden highway type change -- OSMOSE Item 1090/1");
    589632}
    590633
    591634way[highway=motorway].hwy_cont_residential >[index=-1] node,
    592635way[highway=motorway].hwy_cont_residential >[index=1] node {
    593                 throwWarning: "motorway connected to residential road - check for sudden highway type change";
    594         group: tr("Sudden highway type change -- OSMOSE Item 1090/1");
     636    throwWarning: "motorway connected to residential road - check for sudden highway type change";
     637    group: tr("Sudden highway type change -- OSMOSE Item 1090/1");
    595638}
    596639
     
    599642way[highway=trunk].hwy_cont_secondary >[index=-1] node,
    600643way[highway=trunk].hwy_cont_secondary >[index=1] node {
    601                 throwWarning: "trunk connected to secondary road - check for sudden highway type change";
    602         group: tr("Sudden highway type change -- OSMOSE Item 1090/1");
     644    throwWarning: "trunk connected to secondary road - check for sudden highway type change";
     645    group: tr("Sudden highway type change -- OSMOSE Item 1090/1");
    603646}
    604647
    605648way[highway=trunk].hwy_cont_tertiary >[index=-1] node,
    606649way[highway=trunk].hwy_cont_tertiary >[index=1] node {
    607                 throwWarning: "trunk connected to tertiary road - check for sudden highway type change";
    608         group: tr("Sudden highway type change -- OSMOSE Item 1090/1");
     650    throwWarning: "trunk connected to tertiary road - check for sudden highway type change";
     651    group: tr("Sudden highway type change -- OSMOSE Item 1090/1");
    609652}
    610653
    611654way[highway=trunk].hwy_cont_unclassified >[index=-1] node,
    612655way[highway=trunk].hwy_cont_unclassified >[index=1] node {
    613                 throwWarning: "trunk connected to unclassified road - check for sudden highway type change";
    614         group: tr("Sudden highway type change -- OSMOSE Item 1090/1");
     656    throwWarning: "trunk connected to unclassified road - check for sudden highway type change";
     657    group: tr("Sudden highway type change -- OSMOSE Item 1090/1");
    615658}
    616659
    617660way[highway=trunk].hwy_cont_residential >[index=-1] node,
    618661way[highway=trunk].hwy_cont_residential >[index=1] node {
    619                 throwWarning: "trunk connected to residential road - check for sudden highway type change";
    620         group: tr("Sudden highway type change -- OSMOSE Item 1090/1");
     662    throwWarning: "trunk connected to residential road - check for sudden highway type change";
     663    group: tr("Sudden highway type change -- OSMOSE Item 1090/1");
    621664}
    622665
     
    625668way[highway=primary].hwy_cont_tertiary >[index=-1] node,
    626669way[highway=primary].hwy_cont_tertiary >[index=1] node {
    627                 throwWarning: "primary connected to tertiary road - check for sudden highway type change";
    628         group: tr("Sudden highway type change -- OSMOSE Item 1090/1");
     670    throwWarning: "primary connected to tertiary road - check for sudden highway type change";
     671    group: tr("Sudden highway type change -- OSMOSE Item 1090/1");
    629672}
    630673
    631674way[highway=primary].hwy_cont_unclassified >[index=-1] node,
    632675way[highway=primary].hwy_cont_unclassified >[index=1] node {
    633                 throwWarning: "primary connected to unclassified road - check for sudden highway type change";
    634         group: tr("Sudden highway type change -- OSMOSE Item 1090/1");
     676    throwWarning: "primary connected to unclassified road - check for sudden highway type change";
     677    group: tr("Sudden highway type change -- OSMOSE Item 1090/1");
    635678}
    636679
    637680way[highway=primary].hwy_cont_residential >[index=-1] node,
    638681way[highway=primary].hwy_cont_residential >[index=1] node {
    639                 throwWarning: "primary connected to residential road - check for sudden highway type change";
    640         group: tr("Sudden highway type change -- OSMOSE Item 1090/1");
     682    throwWarning: "primary connected to residential road - check for sudden highway type change";
     683    group: tr("Sudden highway type change -- OSMOSE Item 1090/1");
    641684}
    642685
     
    645688way[highway=secondary].hwy_cont_unclassified >[index=-1] node,
    646689way[highway=secondary].hwy_cont_unclassified >[index=1] node {
    647                 throwWarning: "secondary connected to unclassified road - check for sudden highway type change";
    648         group: tr("Sudden highway type change -- OSMOSE Item 1090/2");
     690    throwWarning: "secondary connected to unclassified road - check for sudden highway type change";
     691    group: tr("Sudden highway type change -- OSMOSE Item 1090/2");
    649692}
    650693
    651694way[highway=secondary].hwy_cont_residential >[index=-1] node,
    652695way[highway=secondary].hwy_cont_residential >[index=1] node {
    653                 throwWarning: "secondary connected to residential road - check for sudden highway type change";
    654         group: tr("Sudden highway type change -- OSMOSE Item 1090/2");
     696    throwWarning: "secondary connected to residential road - check for sudden highway type change";
     697    group: tr("Sudden highway type change -- OSMOSE Item 1090/2");
     698}
     699
     700/* Highway Roundabout OSMOSE Item 3010 */
     701
     702/*  Class 1 -- Wrong highway on roundabout  */
     703/*---------- SET CLASSES ---------- */
     704
     705way[highway=primary] node:connection,
     706way[highway=primary_link] node:connection {
     707    set primary_junc;
     708}
     709
     710way[highway=secondary] node:connection,
     711way[highway=secondary_link] node:connection {
     712    set secondary_junc;
     713}
     714
     715way[highway=tertiary] node:connection,
     716way[highway=tertiary_link] node:connection {
     717    set tertiary_junc;
     718}
     719
     720/*---------- VALIDATIONS ---------- */
     721
     722
     723/*Primary*/
     724way[highway=secondary][junction=roundabout] node:connection.primary_junc,
     725way[highway=tertiary][junction=roundabout] node:connection.primary_junc,
     726way[highway=unclassified][junction=roundabout] node:connection.primary_junc,
     727way[highway=residential][junction=roundabout] node:connection.primary_junc,
     728way[highway=living_street][junction=roundabout] node:connection.primary_junc {
     729    throwWarning: "Wrong highway on roundabout: it must match the highest level of connected routes";
     730    group: tr("Highway Roundabout -- OSMOSE Item 3010/1");
     731}
     732
     733/*Secondary*/
     734way[highway=tertiary][junction=roundabout] node:connection.secondary_junc,
     735way[highway=unclassified][junction=roundabout] node:connection.secondary_junc,
     736way[highway=residential][junction=roundabout] node:connection.secondary_junc,
     737way[highway=living_street][junction=roundabout] node:connection.secondary_junc {
     738    throwWarning: "Wrong highway on roundabout: it must match the highest level of connected routes";
     739    group: tr("Highway Roundabout -- OSMOSE Item 3010/1");
     740}
     741
     742/*Tertiary*/
     743way[highway=unclassified][junction=roundabout] node:connection.tertiary_junc,
     744way[highway=residential][junction=roundabout] node:connection.tertiary_junc,
     745way[highway=living_street][junction=roundabout] node:connection.tertiary_junc {
     746    throwWarning: "Wrong highway on roundabout: it must match the highest level of connected routes";
     747    group: tr("Highway Roundabout -- OSMOSE Item 3010/1");
     748}
     749
     750
     751/*  Class 4 -- Roundabout crossing  */
     752
     753way[highway][!junction] >[index=-1] node,
     754way[highway][!junction] >[index=1] node {
     755    set crossing;
     756}
     757
     758way[highway][junction] >[index=-1] node,
     759way[highway][junction] >[index=1] node {
     760    set junc_to_junc;
     761}
     762
     763way[highway][junction] node:connection!.crossing!.junc_to_junc {
     764    throwWarning: "Roundabout crossing. way through roundabout without stopping";
     765    group: tr("Highway Roundabout -- OSMOSE Item 3010/4");
    655766}
    656767