Changeset 9551 in josm


Ignore:
Timestamp:
2016-01-20T22:37:01+01:00 (8 years ago)
Author:
Klumbumbus
Message:

fix #12404 - add suggestAlternative to validator rules with FixAdd or FixChangeKey; replace tr("{0}={1} is deprecated", "{0.key}", "{0.value}"); by shorter tr("{0} is deprecated", "{0.tag}");

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/data/validator/deprecated.mapcss

    r9506 r9551  
    11*[barrier=wire_fence] {
    2   throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
     2  throwWarning: tr("{0} is deprecated", "{0.tag}");
    33  fixAdd: "barrier=fence";
    44  fixAdd: "fence_type=chain_link";
    … …  
    88 
    99*[barrier=wood_fence] {
    10   throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
     10  throwWarning: tr("{0} is deprecated", "{0.tag}");
     11  suggestAlternative: "barrier=fence + fence_type=wood";
    1112  fixAdd: "barrier=fence";
    1213  fixAdd: "fence_type=wood";
    … …  
    1415 
    1516*[highway=ford] {
    16   throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
     17  throwWarning: tr("{0} is deprecated", "{0.tag}");
     18  suggestAlternative: "ford=yes";
    1719  fixRemove: "highway";
    1820  fixAdd: "ford=yes";
    … …  
    2729*[highway=stile] {
    2830  /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */
    29   throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
     31  throwWarning: tr("{0} is deprecated", "{0.tag}");
     32  suggestAlternative: "barrier=stile";
    3033  fixRemove: "highway";
    3134  fixAdd: "barrier=stile";
    … …  
    3437*[highway=incline] {
    3538  /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */
    36   throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
     39  throwWarning: tr("{0} is deprecated", "{0.tag}");
    3740  suggestAlternative: "incline";
    3841}
    … …  
    4043*[highway=incline_steep] {
    4144  /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */
    42   throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
     45  throwWarning: tr("{0} is deprecated", "{0.tag}");
    4346  suggestAlternative: "incline";
    4447}
    … …  
    4649*[highway=unsurfaced] {
    4750  /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */
    48   throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
     51  throwWarning: tr("{0} is deprecated", "{0.tag}");
     52  suggestAlternative: "highway=* + surface=unpaved";
    4953  fixAdd: "highway=road";
    5054  fixAdd: "surface=unpaved";
    … …  
    5357*[landuse=wood] {
    5458  /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */
    55   throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
     59  throwWarning: tr("{0} is deprecated", "{0.tag}");
    5660  suggestAlternative: "landuse=forest";
    5761  suggestAlternative: "natural=wood";
    … …  
    6064*[natural=marsh] {
    6165  /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */
    62   throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
     66  throwWarning: tr("{0} is deprecated", "{0.tag}");
     67  suggestAlternative: "natural=wetland + wetland=marsh";
    6368  fixAdd: "natural=wetland";
    6469  fixAdd: "wetland=marsh";
    … …  
    6772*[highway=byway] {
    6873  /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */
    69   throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
     74  throwWarning: tr("{0} is deprecated", "{0.tag}");
    7075}
    7176 
    … …  
    8388 
    8489*[shop=antique] {
    85   throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
     90  throwWarning: tr("{0} is deprecated", "{0.tag}");
     91  suggestAlternative: "shop=antiques";
    8692  fixAdd: "shop=antiques";
    8793}
    8894
    8995*[shop=bags] {
    90   throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
     96  throwWarning: tr("{0} is deprecated", "{0.tag}");
     97  suggestAlternative: "shop=bag";
    9198  fixAdd: "shop=bag";
    9299}
    … …  
    94101*[shop=organic] {
    95102  /* from http://wiki.openstreetmap.org/wiki/Tag:shop=organic */
    96   throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
     103  throwWarning: tr("{0} is deprecated", "{0.tag}");
     104  suggestAlternative: "shop=supermarket + organic=only";
    97105  fixAdd: "shop=supermarket";
    98106  fixAdd: "organic=only";
    … …  
    100108
    101109*[shop=pets] {
    102   throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
     110  throwWarning: tr("{0} is deprecated", "{0.tag}");
     111  suggestAlternative: "shop=pet";
    103112  fixAdd: "shop=pet";
    104113}
    105114
    106115*[shop=pharmacy] {
    107   throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
     116  throwWarning: tr("{0} is deprecated", "{0.tag}");
     117  suggestAlternative: "amenity=pharmacy";
    108118  fixChangeKey: "shop => amenity";
    109119}
    … …  
    111121*[bicycle_parking=sheffield] {
    112122  /* from http://wiki.openstreetmap.org/wiki/Key:bicycle_parking */
    113   throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
     123  throwWarning: tr("{0} is deprecated", "{0.tag}");
     124  suggestAlternative: "bicycle_parking=stands";
    114125  fixAdd: "bicycle_parking=stands";
    115126}
    … …  
    117128*[amenity=emergency_phone] {
    118129  /* http://wiki.openstreetmap.org/wiki/Tag:emergency=phone */
    119   throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
     130  throwWarning: tr("{0} is deprecated", "{0.tag}");
     131  suggestAlternative: "emergency=phone";
    120132  fixRemove: "amenity";
    121133  fixAdd: "emergency=phone";
    … …  
    124136*[sport=gaelic_football] {
    125137  /* fix #8132 - http://wiki.openstreetmap.org/wiki/Tag:sport=gaelic_football */
    126   throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
     138  throwWarning: tr("{0} is deprecated", "{0.tag}");
     139  suggestAlternative: "sport=gaelic_games";
    127140  fixAdd: "sport=gaelic_games";
    128141}
    … …  
    130143*[power=station] {
    131144  /* see #8847 / #8961 - http://wiki.openstreetmap.org/wiki/Tag:power=station */
    132   throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
     145  throwWarning: tr("{0} is deprecated", "{0.tag}");
    133146  suggestAlternative: "power=plant";
    134147  suggestAlternative: "power=substation";
    … …  
    136149
    137150*[power=sub_station] {
    138   throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
     151  throwWarning: tr("{0} is deprecated", "{0.tag}");
     152  suggestAlternative: "power=substation";
    139153  fixAdd: "power=substation";
    140154}
    141155 
    142156*[generator:method=dam] {
    143   throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
     157  throwWarning: tr("{0} is deprecated", "{0.tag}");
     158  suggestAlternative: "generator:method=water-storage";
    144159  fixAdd: "generator:method=water-storage";
    145160}
    146161 
    147162*[generator:method=pumped-storage] {
    148   throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
     163  throwWarning: tr("{0} is deprecated", "{0.tag}");
     164  suggestAlternative: "generator:method=water-pumped-storage";
    149165  fixAdd: "generator:method=water-pumped-storage";
    150166}
    151167 
    152168*[generator:method=pumping] {
    153   throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
     169  throwWarning: tr("{0} is deprecated", "{0.tag}");
     170  suggestAlternative: "generator:method=water-pumped-storage";
    154171  fixAdd: "generator:method=water-pumped-storage";
    155172}
    … …  
    157174*[fence_type=chain] {
    158175  /* see #8962 - http://wiki.openstreetmap.org/wiki/Key:fence_type */
    159   throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
     176  throwWarning: tr("{0} is deprecated", "{0.tag}");
    160177  suggestAlternative: "barrier=chain";
    161178  suggestAlternative: "fence_type=chain_link";
    … …  
    164181*[building=entrance] {
    165182  /* see #9000 - http://wiki.openstreetmap.org/wiki/Key:entrance */
    166   throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
     183  throwWarning: tr("{0} is deprecated", "{0.tag}");
    167184  suggestAlternative: "entrance";
    168185}
    … …  
    170187*[board_type=board] {
    171188  /* see #9213 - Useless tag proposed in internal preset for years */
    172   throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
     189  throwWarning: tr("{0} is deprecated", "{0.tag}");
    173190  fixRemove: "board_type";
    174191}
    … …  
    176193*[man_made=measurement_station] {
    177194  /* see #8434 - http://wiki.openstreetmap.org/wiki/Proposed_features/monitoring_station */
    178   throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
     195  throwWarning: tr("{0} is deprecated", "{0.tag}");
     196  suggestAlternative: "man_made=monitoring_station";
    179197  fixAdd: "man_made=monitoring_station";
    180198}
    181199 
    182200*[measurement=water_level] {
    183   throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
     201  throwWarning: tr("{0} is deprecated", "{0.tag}");
     202  suggestAlternative: "monitoring:water_level=yes";
    184203  fixRemove: "measurement";
    185204  fixAdd: "monitoring:water_level=yes";
    … …  
    187206 
    188207*[measurement=weather] {
    189   throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
     208  throwWarning: tr("{0} is deprecated", "{0.tag}");
     209  suggestAlternative: "monitoring:weather=yes";
    190210  fixRemove: "measurement";
    191211  fixAdd: "monitoring:weather=yes";
    … …  
    193213 
    194214*[measurement=seismic] {
    195   throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
     215  throwWarning: tr("{0} is deprecated", "{0.tag}");
     216  suggestAlternative: "monitoring:seismic_activity=yes";
    196217  fixRemove: "measurement";
    197218  fixAdd: "monitoring:seismic_activity=yes";
    … …  
    200221*[monitoring:river_level] {
    201222  throwWarning: tr("{0} is deprecated", "{0.key}");
     223  suggestAlternative: "monitoring:water_level";
    202224  fixChangeKey: "monitoring:river_level => monitoring:water_level";
    203225}
    … …  
    205227*[stay] {
    206228  throwWarning: tr("{0} is deprecated", "{0.key}");
     229  suggestAlternative: "maxstay";
    207230  fixChangeKey: "stay => maxstay";
    208231}
    … …  
    210233*[emergency=aed] {
    211234  /* see #9554 - http://wiki.openstreetmap.org/wiki/Proposed_features/automated_external_defibrillator */
    212   throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
     235  throwWarning: tr("{0} is deprecated", "{0.tag}");
     236  suggestAlternative: "emergency=defibrillator";
    213237  fixAdd: "emergency=defibrillator";
    214238}
    … …  
    255279*[type=broad_leaved],
    256280*[type=broad_leafed] {
    257   throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
     281  throwWarning: tr("{0} is deprecated", "{0.tag}");
     282  suggestAlternative: "leaf_type=broadleaved";
    258283  fixRemove: "{0.key}";
    259284  fixAdd: "leaf_type=broadleaved";
    260 }
     285}<
    261286
    262287*[wood=coniferous],
    263288*[type=coniferous],
    264289*[type=conifer] {
    265   throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
     290  throwWarning: tr("{0} is deprecated", "{0.tag}");
     291  suggestAlternative: "leaf_type=needleleaved";
    266292  fixRemove: "{0.key}";
    267293  fixAdd: "leaf_type=needleleaved";
    … …  
    269295
    270296*[wood=mixed] {
    271   throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
     297  throwWarning: tr("{0} is deprecated", "{0.tag}");
     298  suggestAlternative: "leaf_type=mixed";
    272299  fixRemove: "wood";
    273300  fixAdd: "leaf_type=mixed";
    … …  
    276303*[wood=evergreen],
    277304*[type=evergreen] {
    278   throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
     305  throwWarning: tr("{0} is deprecated", "{0.tag}");
     306  suggestAlternative: "leaf_cycle=evergreen";
    279307  fixRemove: "{0.key}";
    280308  fixAdd: "leaf_cycle=evergreen";
    … …  
    283311*[type=deciduous],
    284312*[type=deciduos] {
    285   throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
     313  throwWarning: tr("{0} is deprecated", "{0.tag}");
     314  suggestAlternative: "leaf_cycle=deciduous";
    286315  fixRemove: "type";
    287316  fixAdd: "leaf_cycle=deciduous";
    … …  
    289318
    290319*[natural=land] {
    291   throwWarning: tr("{0}={1} is deprecated. Please use instead a multipolygon.", "{0.key}", "{0.value}");
     320  throwWarning: tr("{0} is deprecated. Please use instead a multipolygon.", "{0.tag}");
    292321  assertMatch: "way natural=land";
    293322}
    … …  
    295324/* see #10447 - https://wiki.openstreetmap.org/wiki/Proposed_features/Bridge_types#Deprecated_bridge_key_values */
    296325*[bridge=causeway] {
    297   throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
     326  throwWarning: tr("{0} is deprecated", "{0.tag}");
    298327  suggestAlternative: "ford=yes";
    299328  suggestAlternative: "bridge=low_water_crossing";
    … …  
    302331
    303332*[bridge=swing] {
    304   throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
     333  throwWarning: tr("{0} is deprecated", "{0.tag}");
    305334  suggestAlternative: "bridge:movable=swing";
    306335  suggestAlternative: "bridge:structure=simple-suspension";
    … …  
    308337
    309338*[bridge=suspension] {
    310   throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
     339  throwWarning: tr("{0} is deprecated", "{0.tag}");
     340  suggestAlternative: "bridge=yes + bridge:structure=suspension";
    311341  fixAdd: "bridge=yes";
    312342  fixAdd: "bridge:structure=suspension";
    … …  
    336366*[parking=park_and_ride] {
    337367  throwWarning: tr("{0} is deprecated", "{0.tag}");
     368  suggestAlternative: "amenity=parking + park_ride=yes";
    338369  fixRemove: "parking";
    339370  fixAdd: "amenity=parking";
    … …  
    366397}
    367398
    368 *[waterway=water_point],
     399*[waterway=water_point] {
     400  throwWarning: tr("{0} is deprecated", "{0.tag}");
     401  suggestAlternative: "amenity=water_point";
     402  fixChangeKey: "waterway => amenity";
     403}
    369404*[waterway=waste_disposal] {
    370405  throwWarning: tr("{0} is deprecated", "{0.tag}");
     406  suggestAlternative: "amenity=waste_disposal";
    371407  fixChangeKey: "waterway => amenity";
    372408}
    373409*[waterway=mooring] {
    374410  throwWarning: tr("{0} is deprecated", "{0.tag}");
     411  suggestAlternative: "mooring=yes";
    375412  fixRemove: "waterway";
    376413  fixAdd: "mooring=yes";
Note: See TracChangeset for help on using the changeset viewer.