Changeset 6689 in josm


Ignore:
Timestamp:
2014-01-15T11:08:51+01:00 (11 years ago)
Author:
Don-vip
Message:

see #9579 - forgot to deprecate power=sub_station + use of {0.key}, {0.value} in deprecated.mapcss

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/data/validator/deprecated.mapcss

    r6688 r6689  
    11*[barrier=wire_fence] {
    2   throwWarning: tr("{0}={1} is deprecated", "barrier", "wire_fence");
     2  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
    33  fixAdd: "barrier=fence";
    44  fixAdd: "fence_type=chain_link";
    … …  
    88 
    99*[barrier=wood_fence] {
    10   throwWarning: tr("{0}={1} is deprecated", "barrier", "wood_fence");
     10  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
    1111  fixAdd: "barrier=fence";
    1212  fixAdd: "fence_type=wood";
    … …  
    1414 
    1515*[highway=ford] {
    16   throwWarning: tr("{0}={1} is deprecated", "highway", "ford");
     16  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
    1717  fixRemove: "highway";
    1818  fixAdd: "ford=yes";
    … …  
    2121*[class] {
    2222  /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */
    23   throwWarning: tr("{0} is deprecated", "class");
     23  throwWarning: tr("{0} is deprecated", "{0.key}");
    2424  suggestAlternative: "highway";
    2525}
    … …  
    2727*[highway=stile] {
    2828  /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */
    29   throwWarning: tr("{0}={1} is deprecated", "highway", "stile");
     29  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
    3030  fixRemove: "highway";
    3131  fixAdd: "barrier=stile";
    … …  
    3434*[highway=incline] {
    3535  /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */
    36   throwWarning: tr("{0}={1} is deprecated", "highway", "incline");
     36  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
    3737  suggestAlternative: "incline";
    3838}
    … …  
    4040*[highway=incline_steep] {
    4141  /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */
    42   throwWarning: tr("{0}={1} is deprecated", "highway", "incline");
     42  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
    4343  suggestAlternative: "incline";
    4444}
    … …  
    4646*[highway=unsurfaced] {
    4747  /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */
    48   throwWarning: tr("{0}={1} is deprecated", "highway", "unsurfaced");
     48  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
    4949  fixAdd: "highway=road";
    5050  fixAdd: "incline=unpaved";
    … …  
    5353*[landuse=wood] {
    5454  /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */
    55   throwWarning: tr("{0}={1} is deprecated", "landuse", "wood");
     55  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
    5656  suggestAlternative: "landuse=forest";
    5757  suggestAlternative: "natural=wood";
    … …  
    6060*[natural=marsh] {
    6161  /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */
    62   throwWarning: tr("{0}={1} is deprecated", "natural", "marsh");
     62  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
    6363  fixAdd: "natural=wetland";
    6464  fixAdd: "wetland=marsh";
    … …  
    6767*[highway=byway] {
    6868  /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */
    69   throwWarning: tr("{0}={1} is deprecated", "highway", "byway");
     69  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
    7070}
    7171 
    7272*[power_source] {
    7373  /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */
    74   throwWarning: tr("{0} is deprecated", "power_source");
     74  throwWarning: tr("{0} is deprecated", "{0.key}");
    7575  suggestAlternative: "generator:source";
    7676}
    … …  
    7878*[power_rating] {
    7979  /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */
    80   throwWarning: tr("{0} is deprecated", "power_rating");
     80  throwWarning: tr("{0} is deprecated", "{0.key}");
    8181  suggestAlternative: "generator:output";
    8282}
    … …  
    8484*[shop=organic] {
    8585  /* from http://wiki.openstreetmap.org/wiki/Tag:shop=organic */
    86   throwWarning: tr("{0}={1} is deprecated", "shop", "organic");
     86  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
    8787  fixAdd: "shop=supermarket";
    8888  fixAdd: "organic=only";
    … …  
    9191*[bicycle_parking=sheffield] {
    9292  /* from http://wiki.openstreetmap.org/wiki/Key:bicycle_parking */
    93   throwWarning: tr("{0}={1} is deprecated", "bicycle_parking", "sheffield");
     93  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
    9494  fixAdd: "bicycle_parking=stands";
    9595}
    … …  
    9797*[amenity=emergency_phone] {
    9898  /* http://wiki.openstreetmap.org/wiki/Tag:emergency=phone */
    99   throwWarning: tr("{0}={1} is deprecated", "amenity", "emergency_phone");
     99  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
    100100  fixRemove: "amenity";
    101101  fixAdd: "emergency=phone";
    … …  
    104104*[sport=gaelic_football] {
    105105  /* fix #8132 - http://wiki.openstreetmap.org/wiki/Tag:sport=gaelic_football */
    106   throwWarning: tr("{0}={1} is deprecated", "sport", "gaelic_football");
     106  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
    107107  fixAdd: "sport=gaelic_games";
    108108}
    … …  
    110110*[power=station] {
    111111  /* see #8847 / #8961 - http://wiki.openstreetmap.org/wiki/Tag:power=station */
    112   throwWarning: tr("{0}={1} is deprecated", "power", "station");
     112  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
    113113  suggestAlternative: "power=plant";
    114114  suggestAlternative: "power=substation";
    115115}
     116
     117*[power=sub_station] {
     118  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
     119  fixAdd: "power=substation";
     120}
    116121 
    117122*[generator:method=dam] {
    118   throwWarning: tr("{0}={1} is deprecated", "generator:method", "dam");
     123  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
    119124  fixAdd: "generator:method=water-storage";
    120125}
    121126 
    122127*[generator:method=pumped-storage] {
    123   throwWarning: tr("{0}={1} is deprecated", "generator:method", "pumped-storage");
     128  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
    124129  fixAdd: "generator:method=water-pumped-storage";
    125130}
    126131 
    127132*[generator:method=pumping] {
    128   throwWarning: tr("{0}={1} is deprecated", "generator:method", "pumping");
     133  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
    129134  fixAdd: "generator:method=water-pumped-storage";
    130135}
    … …  
    132137*[fence_type=chain] {
    133138  /* see #8962 - http://wiki.openstreetmap.org/wiki/Key:fence_type */
    134   throwWarning: tr("{0}={1} is deprecated", "fence_type", "chain");
     139  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
    135140  suggestAlternative: "barrier=chain";
    136141  suggestAlternative: "fence_type=chain_link";
    … …  
    139144*[building=entrance] {
    140145  /* see #9000 - http://wiki.openstreetmap.org/wiki/Key:entrance */
    141   throwWarning: tr("{0}={1} is deprecated", "building", "entrance");
     146  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
    142147  suggestAlternative: "entrance";
    143148}
    … …  
    145150*[board_type=board] {
    146151  /* see #9213 - Useless tag proposed in internal preset for years */
    147   throwWarning: tr("{0}={1} is deprecated", "board_type", "board");
     152  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
    148153  fixRemove: "board_type";
    149154}
    … …  
    151156*[man_made=measurement_station] {
    152157  /* see #8434 - http://wiki.openstreetmap.org/wiki/Proposed_features/monitoring_station */
    153   throwWarning: tr("{0}={1} is deprecated", "man_made", "measurement_station");
     158  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
    154159  fixAdd: "man_made=monitoring_station";
    155160}
    156161 
    157162*[measurement=water_level] {
    158   throwWarning: tr("{0}={1} is deprecated", "measurement", "water_level");
     163  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
    159164  fixRemove: "measurement";
    160165  fixAdd: "monitoring:water_level=yes";
    … …  
    162167 
    163168*[measurement=weather] {
    164   throwWarning: tr("{0}={1} is deprecated", "measurement", "weather");
     169  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
    165170  fixRemove: "measurement";
    166171  fixAdd: "monitoring:weather=yes";
    … …  
    168173 
    169174*[measurement=seismic] {
    170   throwWarning: tr("{0}={1} is deprecated", "measurement", "seismic");
     175  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
    171176  fixRemove: "measurement";
    172177  fixAdd: "monitoring:seismic_activity=yes";
    … …  
    174179
    175180*[monitoring:river_level] {
    176   throwWarning: tr("{0} is deprecated", "monitoring:river_level");
     181  throwWarning: tr("{0} is deprecated", "{0.key}");
    177182  fixChangeKey: "monitoring:river_level => monitoring:water_level";
    178183}
    … …  
    180185*[emergency=aed] {
    181186  /* see #9554 - http://wiki.openstreetmap.org/wiki/Proposed_features/automated_external_defibrillator */
    182   throwWarning: tr("{0}={1} is deprecated", "emergency", "aed");
     187  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
    183188  fixAdd: "emergency=defibrillator";
    184189}
Note: See TracChangeset for help on using the changeset viewer.