Changeset 11138 in josm for trunk


Ignore:
Timestamp:
2016-10-17T19:09:26+02:00 (8 years ago)
Author:
Klumbumbus
Message:

fix #13804 - group deprecated tags and isolated nodes in the validator tree

Location:
trunk/data/validator
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/data/validator/deprecated.mapcss

    r11133 r11138  
    11*[barrier=wire_fence] {
    22  throwWarning: tr("{0} is deprecated", "{0.tag}");
     3  group: tr("deprecated tagging");
    34  suggestAlternative: "barrier=fence + fence_type=chain_link";
    45  fixAdd: "barrier=fence";
    … …  
    1112  throwWarning: tr("{0} is deprecated", "{0.tag}");
    1213  suggestAlternative: "barrier=fence + fence_type=wood";
     14  group: tr("deprecated tagging");
    1315  fixAdd: "barrier=fence";
    1416  fixAdd: "fence_type=wood";
    … …  
    1820  throwWarning: tr("{0} is deprecated", "{0.tag}");
    1921  suggestAlternative: "ford=yes";
     22  group: tr("deprecated tagging");
    2023  fixRemove: "highway";
    2124  fixAdd: "ford=yes";
    … …  
    2427  throwWarning: tr("{0} is deprecated", "{0.tag}");
    2528  suggestAlternative: "highway=* + ford=yes";
     29  group: tr("deprecated tagging");
    2630}
    2731 
    … …  
    3034  throwWarning: tr("{0} is deprecated", "{0.key}");
    3135  suggestAlternative: "highway";
     36  group: tr("deprecated tagging");
    3237}
    3338 
    … …  
    3641  throwWarning: tr("{0} is deprecated", "{0.tag}");
    3742  suggestAlternative: "barrier=stile";
     43  group: tr("deprecated tagging");
    3844  fixRemove: "highway";
    3945  fixAdd: "barrier=stile";
    … …  
    4450  throwWarning: tr("{0} is deprecated", "{0.tag}");
    4551  suggestAlternative: "incline";
     52  group: tr("deprecated tagging");
    4653}
    4754 
    … …  
    5057  throwWarning: tr("{0} is deprecated", "{0.tag}");
    5158  suggestAlternative: "incline";
     59  group: tr("deprecated tagging");
    5260}
    5361 
    … …  
    5664  throwWarning: tr("{0} is deprecated", "{0.tag}");
    5765  suggestAlternative: "highway=* + surface=unpaved";
     66  group: tr("deprecated tagging");
    5867  fixAdd: "highway=road";
    5968  fixAdd: "surface=unpaved";
    … …  
    6574  suggestAlternative: "landuse=forest";
    6675  suggestAlternative: "natural=wood";
     76  group: tr("deprecated tagging");
    6777}
    6878 
    … …  
    7181  throwWarning: tr("{0} is deprecated", "{0.tag}");
    7282  suggestAlternative: "natural=wetland + wetland=marsh";
     83  group: tr("deprecated tagging");
    7384  fixAdd: "natural=wetland";
    7485  fixAdd: "wetland=marsh";
    … …  
    7889  /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */
    7990  throwWarning: tr("{0} is deprecated", "{0.tag}");
     91  group: tr("deprecated tagging");
    8092}
    8193 
    … …  
    8496  throwWarning: tr("{0} is deprecated", "{0.key}");
    8597  suggestAlternative: "generator:source";
     98  group: tr("deprecated tagging");
    8699}
    87100 
    … …  
    90103  throwWarning: tr("{0} is deprecated", "{0.key}");
    91104  suggestAlternative: "generator:output";
     105  group: tr("deprecated tagging");
    92106}
    93107 
    … …  
    95109  throwWarning: tr("{0} is deprecated", "{0.tag}");
    96110  suggestAlternative: "shop=antiques";
     111  group: tr("deprecated tagging");
    97112  fixAdd: "shop=antiques";
    98113}
    … …  
    101116  throwWarning: tr("{0} is deprecated", "{0.tag}");
    102117  suggestAlternative: "shop=bag";
     118  group: tr("deprecated tagging");
    103119  fixAdd: "shop=bag";
    104120}
    … …  
    109125  suggestAlternative: "shop=* + organic=yes";
    110126  suggestAlternative: "shop=* + organic=only";
     127  group: tr("deprecated tagging");
    111128}
    112129
    … …  
    114131  throwWarning: tr("{0} is deprecated", "{0.tag}");
    115132  suggestAlternative: "shop=pet";
     133  group: tr("deprecated tagging");
    116134  fixAdd: "shop=pet";
    117135}
    … …  
    120138  throwWarning: tr("{0} is deprecated", "{0.tag}");
    121139  suggestAlternative: "amenity=pharmacy";
     140  group: tr("deprecated tagging");
    122141  fixChangeKey: "shop => amenity";
    123142}
    … …  
    127146  throwWarning: tr("{0} is deprecated", "{0.tag}");
    128147  suggestAlternative: "bicycle_parking=stands";
     148  group: tr("deprecated tagging");
    129149  fixAdd: "bicycle_parking=stands";
    130150}
    … …  
    134154  throwWarning: tr("{0} is deprecated", "{0.tag}");
    135155  suggestAlternative: "emergency=phone";
     156  group: tr("deprecated tagging");
    136157  fixRemove: "amenity";
    137158  fixAdd: "emergency=phone";
    … …  
    142163  throwWarning: tr("{0} is deprecated", "{0.tag}");
    143164  suggestAlternative: "sport=gaelic_games";
     165  group: tr("deprecated tagging");
    144166  fixAdd: "sport=gaelic_games";
    145167}
    … …  
    150172  suggestAlternative: "power=plant";
    151173  suggestAlternative: "power=substation";
     174  group: tr("deprecated tagging");
    152175}
    153176
    … …  
    155178  throwWarning: tr("{0} is deprecated", "{0.tag}");
    156179  suggestAlternative: "power=substation";
     180  group: tr("deprecated tagging");
    157181  fixAdd: "power=substation";
    158182}
    … …  
    161185  throwWarning: tr("{0} is deprecated", "{0.tag}");
    162186  suggestAlternative: "generator:method=water-storage";
     187  group: tr("deprecated tagging");
    163188  fixAdd: "generator:method=water-storage";
    164189}
    … …  
    167192  throwWarning: tr("{0} is deprecated", "{0.tag}");
    168193  suggestAlternative: "generator:method=water-pumped-storage";
     194  group: tr("deprecated tagging");
    169195  fixAdd: "generator:method=water-pumped-storage";
    170196}
    … …  
    173199  throwWarning: tr("{0} is deprecated", "{0.tag}");
    174200  suggestAlternative: "generator:method=water-pumped-storage";
     201  group: tr("deprecated tagging");
    175202  fixAdd: "generator:method=water-pumped-storage";
    176203}
    … …  
    181208  suggestAlternative: "barrier=chain";
    182209  suggestAlternative: "barrier=fence + fence_type=chain_link";
     210  group: tr("deprecated tagging");
    183211}
    184212
    … …  
    187215  throwWarning: tr("{0} is deprecated", "{0.tag}");
    188216  suggestAlternative: "entrance";
     217  group: tr("deprecated tagging");
    189218}
    190219 
    … …  
    192221  /* see #9213 - Useless tag proposed in internal preset for years */
    193222  throwWarning: tr("{0} is deprecated", "{0.tag}");
     223  group: tr("deprecated tagging");
    194224  fixRemove: "board_type";
    195225}
    … …  
    199229  throwWarning: tr("{0} is deprecated", "{0.tag}");
    200230  suggestAlternative: "man_made=monitoring_station";
     231  group: tr("deprecated tagging");
    201232  fixAdd: "man_made=monitoring_station";
    202233}
    … …  
    205236  throwWarning: tr("{0} is deprecated", "{0.tag}");
    206237  suggestAlternative: "monitoring:water_level=yes";
     238  group: tr("deprecated tagging");
    207239  fixRemove: "measurement";
    208240  fixAdd: "monitoring:water_level=yes";
    … …  
    212244  throwWarning: tr("{0} is deprecated", "{0.tag}");
    213245  suggestAlternative: "monitoring:weather=yes";
     246  group: tr("deprecated tagging");
    214247  fixRemove: "measurement";
    215248  fixAdd: "monitoring:weather=yes";
    … …  
    219252  throwWarning: tr("{0} is deprecated", "{0.tag}");
    220253  suggestAlternative: "monitoring:seismic_activity=yes";
     254  group: tr("deprecated tagging");
    221255  fixRemove: "measurement";
    222256  fixAdd: "monitoring:seismic_activity=yes";
    … …  
    226260  throwWarning: tr("{0} is deprecated", "{0.key}");
    227261  suggestAlternative: "monitoring:water_level";
     262  group: tr("deprecated tagging");
    228263  fixChangeKey: "monitoring:river_level => monitoring:water_level";
    229264}
    … …  
    232267  throwWarning: tr("{0} is deprecated", "{0.key}");
    233268  suggestAlternative: "maxstay";
     269  group: tr("deprecated tagging");
    234270  fixChangeKey: "stay => maxstay";
    235271}
    … …  
    239275  throwWarning: tr("{0} is deprecated", "{0.tag}");
    240276  suggestAlternative: "emergency=defibrillator";
     277  group: tr("deprecated tagging");
    241278  fixAdd: "emergency=defibrillator";
    242279}
    … …  
    251288  throwWarning: tr("{0} is deprecated", "{0.key}");
    252289  suggestAlternative: "*:conditional";
     290  group: tr("deprecated tagging");
    253291  assertMatch: "node day_on=0-12";
    254292}
    … …  
    288326  throwWarning: tr("{0} is deprecated", "{0.tag}");
    289327  suggestAlternative: "leaf_type=broadleaved";
     328  group: tr("deprecated tagging");
    290329  fixRemove: "{0.key}";
    291330  fixAdd: "leaf_type=broadleaved";
    … …  
    297336  throwWarning: tr("{0} is deprecated", "{0.tag}");
    298337  suggestAlternative: "leaf_type=needleleaved";
     338  group: tr("deprecated tagging");
    299339  fixRemove: "{0.key}";
    300340  fixAdd: "leaf_type=needleleaved";
    … …  
    304344  throwWarning: tr("{0} is deprecated", "{0.tag}");
    305345  suggestAlternative: "leaf_type=mixed";
     346  group: tr("deprecated tagging");
    306347  fixRemove: "wood";
    307348  fixAdd: "leaf_type=mixed";
    … …  
    312353  throwWarning: tr("{0} is deprecated", "{0.tag}");
    313354  suggestAlternative: "leaf_cycle=evergreen";
     355  group: tr("deprecated tagging");
    314356  fixRemove: "{0.key}";
    315357  fixAdd: "leaf_cycle=evergreen";
    … …  
    320362  throwWarning: tr("{0} is deprecated", "{0.tag}");
    321363  suggestAlternative: "leaf_cycle=deciduous";
     364  group: tr("deprecated tagging");
    322365  fixRemove: "type";
    323366  fixAdd: "leaf_cycle=deciduous";
    … …  
    327370  throwWarning: tr("{0} is deprecated", "{0.tag}");
    328371  suggestAlternative: "leaf_type + leaf_cycle";
     372  group: tr("deprecated tagging");
    329373}
    330374
    … …  
    335379  suggestAlternative: "trees";
    336380  suggestAlternative: "species";
     381  group: tr("deprecated tagging");
    337382}
    338383
    339384*[natural=land] {
    340385  throwWarning: tr("{0} is deprecated. Please use instead a multipolygon.", "{0.tag}");
     386  group: tr("deprecated tagging");
    341387  assertMatch: "way natural=land";
    342388}
    … …  
    348394  suggestAlternative: "bridge=low_water_crossing";
    349395  suggestAlternative: "embankment=yes";
     396  group: tr("deprecated tagging");
    350397}
    351398
    … …  
    354401  suggestAlternative: "bridge:movable=swing";
    355402  suggestAlternative: "bridge:structure=simple-suspension";
     403  group: tr("deprecated tagging");
    356404}
    357405
    … …  
    359407  throwWarning: tr("{0} is deprecated", "{0.tag}");
    360408  suggestAlternative: "bridge=yes + bridge:structure=suspension";
     409  group: tr("deprecated tagging");
    361410  fixAdd: "bridge=yes";
    362411  fixAdd: "bridge:structure=suspension";
    … …  
    368417*[supervised=interval] {
    369418  throwWarning: tr("{0} is deprecated. Please specify interval by using opening_hours syntax", "{0.tag}");
     419  group: tr("deprecated tagging");
    370420}
    371421
    … …  
    373423*[/josm\/ignore/] {
    374424  throwError: tr("{0} is deprecated. Please delete this object and use a private layer instead", "{0.key}");
     425  group: tr("deprecated tagging");
    375426  fixDeleteObject: this;
    376427}
    … …  
    381432  suggestAlternative: "sport=scuba_diving";
    382433  suggestAlternative: "sport=cliff_diving";
     434  group: tr("deprecated tagging");
    383435}
    384436
    … …  
    387439  throwWarning: tr("{0} is deprecated", "{0.tag}");
    388440  suggestAlternative: "amenity=parking + park_ride=yes";
     441  group: tr("deprecated tagging");
    389442  fixRemove: "parking";
    390443  fixAdd: "amenity=parking";
    … …  
    423476  throwWarning: tr("{0} is deprecated", "{0.tag}");
    424477  suggestAlternative: "amenity=water_point";
     478  group: tr("deprecated tagging");
    425479  fixChangeKey: "waterway => amenity";
    426480}
    … …  
    428482  throwWarning: tr("{0} is deprecated", "{0.tag}");
    429483  suggestAlternative: "amenity=waste_disposal";
     484  group: tr("deprecated tagging");
    430485  fixChangeKey: "waterway => amenity";
    431486}
    … …  
    433488  throwWarning: tr("{0} is deprecated", "{0.tag}");
    434489  suggestAlternative: "mooring=yes";
     490  group: tr("deprecated tagging");
    435491  fixRemove: "waterway";
    436492  fixAdd: "mooring=yes";
    … …  
    442498  throwWarning: tr("{0} is deprecated", "{1.key}");
    443499  suggestAlternative: "building:levels";
     500  group: tr("deprecated tagging");
    444501  fixChangeKey: "levels => building:levels";
    445502}
    … …  
    449506  throwWarning: tr("{0} is deprecated", "{0.key}");
    450507  suggestAlternative: "protect_class";
     508  group: tr("deprecated tagging");
    451509  fixChangeKey: "protected_class => protect_class";
    452510}
    … …  
    476534  suggestAlternative: "{0.key}=* + intermittent=yes";
    477535  suggestAlternative: "natural=valley";
     536  group: tr("deprecated tagging");
    478537}
    479538
    … …  
    482541  throwWarning: tr("{0} is deprecated", "{0.tag}");
    483542  suggestAlternative: "oneway=yes";
     543  group: tr("deprecated tagging");
    484544  fixAdd: "oneway=yes";
    485545}
    … …  
    493553  throwWarning: tr("{0} is deprecated", "{0.key}");
    494554  suggestAlternative: "drinking_water";
     555  group: tr("deprecated tagging");
    495556}
    496557
    … …  
    499560  throwWarning: tr("{0} is deprecated", "{0.key}");
    500561  suggestAlternative: "colour";
     562  group: tr("deprecated tagging");
    501563  fixChangeKey: "color => colour";
    502564}
    503565*[color][colour][tag(color)=tag(colour)] {
    504566  throwWarning: tr("{0} together with {1}", "{0.tag}", "{1.tag}");
     567  group: tr("deprecated tagging");
    505568  set samecolor;
    506569  fixRemove: "color";
    … …  
    510573*[color][colour]!.samecolor {
    511574  throwWarning: tr("{0} together with {1}", "{0.tag}", "{1.tag}");
     575  group: tr("deprecated tagging");
    512576  assertNoMatch: "way color=red colour=red";
    513577  assertMatch: "way color=red colour=green";
    … …  
    516580  throwWarning: tr("{0} is deprecated", "{0.key}");
    517581  suggestAlternative: ":colour";
     582  group: tr("deprecated tagging");
    518583  assertNoMatch: "way color=red";
    519584  assertMatch: "way roof:color=grey";
    … …  
    522587  throwWarning: tr("{0} is deprecated", "{0.key}");
    523588  suggestAlternative: "colour:";
     589  group: tr("deprecated tagging");
    524590}
    525591
    … …  
    547613  throwWarning: tr("{0} is deprecated", "{0.tag}");
    548614  suggestAlternative: "tower=transition";
     615  group: tr("deprecated tagging");
    549616  fixAdd: "tower=transition";
    550617}
    … …  
    552619  throwWarning: tr("{0} is deprecated", "{0.tag}");
    553620  suggestAlternative: "pole=transition";
     621  group: tr("deprecated tagging");
    554622  fixAdd: "pole=transition";
    555623}
    … …  
    557625/* see #11439 */
    558626*[sport=hockey] {
    559   throwWarning: tr("{0} is inaccurate", "{0.tag}");
     627  throwWarning: tr("{0} is deprecated", "{0.tag}");
    560628  suggestAlternative: "sport=field_hockey";
    561629  suggestAlternative: "sport=ice_hockey";
     630  group: tr("deprecated tagging");
    562631}
    563632
    … …  
    568637  throwWarning: tr("{0} is deprecated", "{0.tag}");
    569638  suggestAlternative: "sport=billiards";
     639  group: tr("deprecated tagging");
    570640  fixAdd: "sport=billiards";
    571641}
    … …  
    603673  throwWarning: tr("{0} is deprecated", "{0.key}");
    604674  suggestAlternative: "distance";
     675  group: tr("deprecated tagging");
    605676  fixChangeKey: "kp => distance";
    606677}
    … …  
    610681  throwWarning: tr("{0} is deprecated", "{0.key}");
    611682  suggestAlternative: "distance";
     683  group: tr("deprecated tagging");
    612684  fixChangeKey: "pk => distance";
    613685}
    … …  
    616688  throwWarning: tr("{0} is deprecated", "{0.key}");
    617689  suggestAlternative: "addr:postcode";
     690  group: tr("deprecated tagging");
    618691  suggestAlternative: "postal_code";
    619692}
    … …  
    622695  throwWarning: tr("{0} is deprecated", "{0.tag}");
    623696  suggestAlternative: "intermittent=yes";
     697  group: tr("deprecated tagging");
    624698  fixRemove: "water";
    625699  fixAdd: "intermittent=yes";
    … …  
    630704  throwWarning: tr("{0} is deprecated", "{0.key}");
    631705  suggestAlternative: "substance";
     706  group: tr("deprecated tagging");
    632707  fixChangeKey: "type => substance";
    633708}
    … …  
    637712  suggestAlternative: "landuse=farmland";
    638713  suggestAlternative: "landuse=farmyard";
     714  group: tr("deprecated tagging");
    639715}
    640716
    … …  
    643719  throwWarning: tr("{0} is deprecated", "{0.tag}");
    644720  suggestAlternative: "{1.tag}";
     721  group: tr("deprecated tagging");
    645722  fixRemove: "seamark";
    646723}
    … …  
    648725  throwWarning: tr("{0} is deprecated", "{0.tag}");
    649726  suggestAlternative: "{1.tag}";
     727  group: tr("deprecated tagging");
    650728}
    651729/* #12135 - Tag removed rom rendering https://github.com/gravitystorm/openstreetmap-carto/pull/1830 */
    … …  
    653731  throwWarning: tr("{0} is deprecated", "{0.tag}");
    654732  suggestAlternative: "boundary=protected_area";
     733  group: tr("deprecated tagging");
    655734  fixAdd: "boundary=protected_area";
    656735  fixRemove: "landuse";
    … …  
    661740  throwWarning: tr("{0} is deprecated", "{0.tag}");
    662741  suggestAlternative: "shop=kiosk";
     742  group: tr("deprecated tagging");
    663743  fixChangeKey: "amenity => shop";
    664744}
    … …  
    666746  throwWarning: tr("{0} is deprecated", "{0.tag}");
    667747  suggestAlternative: "shop=*";
     748  group: tr("deprecated tagging");
    668749}
    669750*[shop=fishmonger] {
    670751  throwWarning: tr("{0} is deprecated", "{0.tag}");
    671752  suggestAlternative: "shop=seafood";
     753  group: tr("deprecated tagging");
    672754  fixAdd: "shop=seafood";
    673755}
    … …  
    677759  suggestAlternative: "shop=pet";
    678760  suggestAlternative: "shop=fishing";
     761  group: tr("deprecated tagging");
    679762}
    680763*[shop=betting] {
    … …  
    686769  suggestAlternative: "leisure=adult_gaming_centre";
    687770  suggestAlternative: "amenity=gambling";
     771  group: tr("deprecated tagging");
    688772}
    689773*[shop=perfume] {
    690774  throwWarning: tr("{0} is deprecated", "{0.tag}");
    691775  suggestAlternative: "shop=perfumery";
     776  group: tr("deprecated tagging");
    692777  fixAdd: "shop=perfumery";
    693778}
    … …  
    695780  throwWarning: tr("{0} is deprecated", "{0.tag}");
    696781  suggestAlternative: "leisure=fitness_station";
     782  group: tr("deprecated tagging");
    697783  fixAdd: "leisure=fitness_station";
    698784  fixRemove: "amenity";
    … …  
    701787  throwWarning: tr("{0} is deprecated", "{0.tag}");
    702788  suggestAlternative: "shop=car_parts";
     789  group: tr("deprecated tagging");
    703790  fixAdd: "shop=car_parts";
    704791}
    … …  
    706793  throwWarning: tr("{0} is deprecated", "{0.tag}");
    707794  suggestAlternative: "shop=car_repair";
     795  group: tr("deprecated tagging");
    708796  fixChangeKey: "amenity => shop";
    709797}
    … …  
    716804  throwWarning: tr("{0} is deprecated for {1}", "{1.key}", "{0.tag}");
    717805  suggestAlternative: "studio";
     806  group: tr("deprecated tagging");
    718807  fixChangeKey: "type => studio";
    719808}
    … …  
    723812  throwWarning: tr("{0} is deprecated", "{0.tag}");
    724813  suggestAlternative: "man_made=street_cabinet + street_cabinet=power";
     814  group: tr("deprecated tagging");
    725815  fixAdd: "man_made=street_cabinet";
    726816  fixAdd: "street_cabinet=power";
    … …  
    733823  suggestAlternative: "man_made=water_well";
    734824  suggestAlternative: "man_made=petroleum_well";
     825  group: tr("deprecated tagging");
    735826}
    736827*[amenity=dog_bin],
    … …  
    738829  throwWarning: tr("{0} is deprecated", "{0.tag}");
    739830  suggestAlternative: "amenity=waste_basket + waste=dog_excrement + vending=excrement_bags";
     831  group: tr("deprecated tagging");
    740832  fixAdd: "amenity=waste_basket";
    741833  fixAdd: "waste=dog_excrement";
    … …  
    745837  throwWarning: tr("{0} is deprecated", "{0.tag}");
    746838  suggestAlternative: "tourism=artwork";
     839  group: tr("deprecated tagging");
    747840  fixAdd: "tourism=artwork";
    748841  fixRemove: "amenity";
    … …  
    751844  throwWarning: tr("{0} is deprecated", "{0.tag}");
    752845  suggestAlternative: "amenity=community_centre";
     846  group: tr("deprecated tagging");
    753847  fixAdd: "amenity=community_centre";
    754848}
    … …  
    756850  throwWarning: tr("{0} is deprecated", "{0.tag}");
    757851  suggestAlternative: "man_made=cutline";
     852  group: tr("deprecated tagging");
    758853  fixAdd: "man_made=cutline";
    759854}
    … …  
    761856  throwWarning: tr("{0} is deprecated", "{0.tag}");
    762857  suggestAlternative: "leisure=park";
     858  group: tr("deprecated tagging");
    763859  fixAdd: "leisure=park";
    764860  fixRemove: "amenity";
    … …  
    767863  throwWarning: tr("{0} is deprecated", "{0.tag}");
    768864  suggestAlternative: "tourism=hotel";
     865  group: tr("deprecated tagging");
    769866  fixAdd: "tourism=hotel";
    770867  fixRemove: "amenity";
    … …  
    774871  throwWarning: tr("{0} is deprecated", "{0.tag}");
    775872  suggestAlternative: "craft=window_construction";
     873  group: tr("deprecated tagging");
    776874  fixAdd: "craft=window_construction";
    777875  fixRemove: "shop";
    … …  
    782880  suggestAlternative: "amenity=school";
    783881  suggestAlternative: "amenity=university";
     882  group: tr("deprecated tagging");
    784883}
    785884*[shop=gallery] {
    786885  throwWarning: tr("{0} is deprecated", "{0.tag}");
    787886  suggestAlternative: "shop=art";
     887  group: tr("deprecated tagging");
    788888  fixAdd: "shop=art";
    789889}
    … …  
    796896  suggestAlternative: "leisure=amusement_arcade";
    797897  suggestAlternative: "amenity=gambling";
     898  group: tr("deprecated tagging");
    798899}
    799900*[office=real_estate_agent] {
    800901  throwWarning: tr("{0} is deprecated", "{0.tag}");
    801902  suggestAlternative: "office=estate_agent ";
     903  group: tr("deprecated tagging");
    802904  fixAdd: "office=estate_agent ";
    803905}
    … …  
    806908  suggestAlternative: "shop=glaziery";
    807909  suggestAlternative: "craft=glaziery";
     910  group: tr("deprecated tagging");
    808911}
    809912*[amenity=proposed],
    … …  
    813916*[historic=abandoned] {
    814917  throwWarning: tr("{0} is deprecated. Use the {1}: key prefix instead.", "{0.tag}", "{0.value}");
     918  group: tr("deprecated tagging");
    815919}
    816920
    … …  
    819923  throwWarning: tr("{0} is deprecated", "{0.tag}");
    820924  suggestAlternative: "leisure=swimming_pool";
     925  group: tr("deprecated tagging");
    821926  fixChangeKey: "amenity => leisure";
    822927}
    … …  
    825930*[/^[^t][^i][^g].+_[0-9]$/][!/^note_[0-9]$/][!/^description_[0-9]$/] {
    826931  throwOther: tr("questionable key (ending with a number): {0}", "{0.key}");
    827 } /*should not warn for key tiger:name_base_1 */
     932  assertMatch: "way name_1=foo";
     933  assertNoMatch: "way note_2=foo";
     934  assertNoMatch: "way description_3=foo";
     935  assertNoMatch: "way tiger:name_base_1=bar"; /*should not warn for key tiger:name_base_1 */
     936}
    828937
    829938/* #12500 */
    … …  
    832941  suggestAlternative: "sport=ice_skating";
    833942  suggestAlternative: "sport=roller_skating";
     943  group: tr("deprecated tagging");
    834944}
    835945
    … …  
    838948  throwWarning: tr("{0} is deprecated", "{1.tag}");
    839949  suggestAlternative: "wall=noise_barrier";
     950  group: tr("deprecated tagging");
    840951  fixChangeKey: "type => wall";
    841952}
    … …  
    843954  throwWarning: tr("{0} is deprecated", "{1.tag}");
    844955  suggestAlternative: "wall=noise_barrier";
     956  group: tr("deprecated tagging");
    845957}
    846958
    … …  
    856968  suggestAlternative: "building=public";
    857969  suggestAlternative: "...";
     970  group: tr("deprecated tagging");
    858971}
    859972
    … …  
    862975  throwWarning: tr("{0} is deprecated", "{0.tag}");
    863976  suggestAlternative: "vending=newspapers";
     977  group: tr("deprecated tagging");
    864978  fixAdd: "vending=newspapers";
    865979}
    … …  
    869983  throwWarning: tr("{0} is deprecated", "{0.tag}");
    870984  suggestAlternative: "service=drive-through";
     985  group: tr("deprecated tagging");
    871986  fixAdd: "service=drive-through";
    872987}
    … …  
    883998  throwWarning: tr("{0} is deprecated", "{0.key}");
    884999  suggestAlternative: "species";
     1000  group: tr("deprecated tagging");
    8851001}
    8861002
    … …  
    8891005  throwWarning: tr("{0} is deprecated", "{0.tag}");
    8901006  suggestAlternative: "location:transition=yes";
     1007  group: tr("deprecated tagging");
    8911008  fixAdd: "location:transition=yes";
    8921009  fixRemove: "pole";
    … …  
    8951012  throwWarning: tr("{0} is deprecated", "{0.tag}");
    8961013  suggestAlternative: "location:transition=yes";
     1014  group: tr("deprecated tagging");
    8971015  fixAdd: "location:transition=yes";
    8981016  fixRemove: "tower";
    … …  
    9031021  throwWarning: tr("{0} is deprecated", "{0.tag}");
    9041022  suggestAlternative: "natural=water + water=pond";
     1023  group: tr("deprecated tagging");
    9051024  fixAdd: "natural=water";
    9061025  fixAdd: "water=pond";
    … …  
    9131032  throwWarning: tr("{0} is deprecated", "{0.tag}");
    9141033  suggestAlternative: "shop=gift";
     1034  group: tr("deprecated tagging");
    9151035  fixAdd: "shop=gift";
    9161036}
    … …  
    9191039  throwWarning: tr("{0} is deprecated", "{0.tag}");
    9201040  suggestAlternative: "vending=animal_feed";
     1041  group: tr("deprecated tagging");
    9211042  fixAdd: "vending=animal_feed";
    9221043}
    … …  
    9271048  throwWarning: tr("{0} is deprecated for {1}", "{1.key}", "{0.tag}");
    9281049  suggestAlternative: "emergency_telephone_code";
     1050  group: tr("deprecated tagging");
    9291051  fixChangeKey: "phone => emergency_telephone_code";
    9301052  assertMatch:   "node highway=emergency_access_point phone=123";
    … …  
    9371059  throwWarning: tr("{0} is deprecated for {1}", "{1.key}", "{0.tag}");
    9381060  suggestAlternative: "emergency_telephone_code";
     1061  group: tr("deprecated tagging");
    9391062  fixRemove: "phone";
    9401063  assertNoMatch: "node highway=emergency_access_point phone=123";
    … …  
    9461069  throwWarning: tr("{0} is deprecated for {1}", "{1.key}", "{0.tag}");
    9471070  suggestAlternative: "emergency_telephone_code";
     1071  group: tr("deprecated tagging");
    9481072  assertNoMatch: "node highway=emergency_access_point phone=123";
    9491073  assertNoMatch: "node highway=emergency_access_point emergency_telephone_code=123";

  • trunk/data/validator/geometry.mapcss

    r11133 r11138  
    219219node:unconnected:in-downloaded-area[barrier=height_restrictor],
    220220node:unconnected:in-downloaded-area[barrier=debris] {
    221   throwWarning: tr("{0} must be connected to a way", "{2.tag}");
     221  throwWarning: tr("{0}", "{2.tag}");
     222  group: tr("isolated node which must be connected to a way");
    222223}
    223224
Note: See TracChangeset for help on using the changeset viewer.