Changeset 17092 in josm for trunk/resources/data


Ignore:
Timestamp:
2020-10-07T18:46:02+02:00 (4 years ago)
Author:
Klumbumbus
Message:

clean up documentation and indentation

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/resources/data/validator/deprecated.mapcss

    r17048 r17092  
    88  assertNoMatch: "way barrier=fence";
    99}
    10  
     10
    1111*[barrier=wood_fence] {
    1212  throwWarning: tr("{0} is deprecated", "{0.tag}");
    … …  
    1616  fixAdd: "fence_type=wood";
    1717}
    18  
     18
    1919node[highway=ford] {
    2020  throwWarning: tr("{0} is deprecated", "{0.tag}");
    … …  
    2929  group: tr("deprecated tagging");
    3030}
    31  
     31
     32/* from http://wiki.openstreetmap.org/wiki/Deprecated_features */ 
    3233way[class] {
    33   /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */
    3434  throwWarning: tr("{0} is deprecated", "{0.key}");
    3535  suggestAlternative: "highway";
    3636  group: tr("deprecated tagging");
    3737}
    38  
    3938*[highway=stile] {
    40   /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */
    4139  throwWarning: tr("{0} is deprecated", "{0.tag}");
    4240  suggestAlternative: "barrier=stile";
    … …  
    4543  fixAdd: "barrier=stile";
    4644}
    47  
    4845*[highway=incline] {
    49   /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */
    5046  throwWarning: tr("{0} is deprecated", "{0.tag}");
    5147  suggestAlternative: "incline";
    5248  group: tr("deprecated tagging");
    5349}
    54  
    5550*[highway=incline_steep] {
    56   /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */
    5751  throwWarning: tr("{0} is deprecated", "{0.tag}");
    5852  suggestAlternative: "incline";
    5953  group: tr("deprecated tagging");
    6054}
    61  
    6255*[highway=unsurfaced] {
    63   /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */
    6456  throwWarning: tr("{0} is deprecated", "{0.tag}");
    6557  suggestAlternative: "highway=* + surface=unpaved";
    … …  
    6860  fixAdd: "surface=unpaved";
    6961}
    70  
    7162*[landuse=wood] {
    72   /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */
    7363  throwWarning: tr("{0} is deprecated", "{0.tag}");
    7464  suggestAlternative: "landuse=forest";
    … …  
    7666  group: tr("deprecated tagging");
    7767}
    78  
    7968*[natural=marsh] {
    80   /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */
    8169  throwWarning: tr("{0} is deprecated", "{0.tag}");
    8270  suggestAlternative: "natural=wetland + wetland=marsh";
    … …  
    8573  fixAdd: "wetland=marsh";
    8674}
    87  
    8875*[highway=byway] {
    89   /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */
    90   throwWarning: tr("{0} is deprecated", "{0.tag}");
    91   group: tr("deprecated tagging");
    92 }
    93  
     76  throwWarning: tr("{0} is deprecated", "{0.tag}");
     77  group: tr("deprecated tagging");
     78}
    9479*[power_source] {
    95   /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */
    9680  throwWarning: tr("{0} is deprecated", "{0.key}");
    9781  suggestAlternative: "generator:source";
    9882  group: tr("deprecated tagging");
    9983}
    100  
    10184*[power_rating] {
    102   /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */
    10385  throwWarning: tr("{0} is deprecated", "{0.key}");
    10486  suggestAlternative: "generator:output";
    10587  group: tr("deprecated tagging");
    10688}
    107  
     89
    10890*[shop=antique] {
    10991  throwWarning: tr("{0} is deprecated", "{0.tag}");
    … …  
    129111
    130112*[shop=organic] {
    131   /* from http://wiki.openstreetmap.org/wiki/Tag:shop=organic */
    132113  throwWarning: tr("{0} is deprecated", "{0.tag}");
    133114  suggestAlternative: "shop=* + organic=yes";
    … …  
    151132
    152133*[bicycle_parking=sheffield] {
    153   /* from http://wiki.openstreetmap.org/wiki/Key:bicycle_parking */
    154134  throwWarning: tr("{0} is deprecated", "{0.tag}");
    155135  suggestAlternative: "bicycle_parking=stands";
    … …  
    157137  fixAdd: "bicycle_parking=stands";
    158138}
    159  
     139
    160140*[amenity=emergency_phone] {
    161   /* http://wiki.openstreetmap.org/wiki/Tag:emergency=phone */
    162141  throwWarning: tr("{0} is deprecated", "{0.tag}");
    163142  suggestAlternative: "emergency=phone";
    … …  
    166145  fixAdd: "emergency=phone";
    167146}
    168  
     147 
     148/* #8132 */
    169149*[sport=gaelic_football] {
    170   /* fix #8132 - http://wiki.openstreetmap.org/wiki/Tag:sport=gaelic_football */
    171150  throwWarning: tr("{0} is deprecated", "{0.tag}");
    172151  suggestAlternative: "sport=gaelic_games";
    … …  
    174153  fixAdd: "sport=gaelic_games";
    175154}
    176  
     155
     156/* #8847, #8961 */ 
    177157*[power=station] {
    178   /* see #8847 / #8961 - http://wiki.openstreetmap.org/wiki/Tag:power=station */
    179158  throwWarning: tr("{0} is deprecated", "{0.tag}");
    180159  suggestAlternative: "power=plant";
    … …  
    210189  fixAdd: "generator:method=water-storage";
    211190}
    212  
     191
    213192*[generator:method=pumped-storage] {
    214193  throwWarning: tr("{0} is deprecated", "{0.tag}");
    … …  
    217196  fixAdd: "generator:method=water-pumped-storage";
    218197}
    219  
     198
    220199*[generator:method=pumping] {
    221200  throwWarning: tr("{0} is deprecated", "{0.tag}");
    … …  
    224203  fixAdd: "generator:method=water-pumped-storage";
    225204}
    226  
     205
     206/* #8962 */
    227207*[fence_type=chain] {
    228   /* see #8962 - http://wiki.openstreetmap.org/wiki/Key:fence_type */
    229208  throwWarning: tr("{0} is deprecated", "{0.tag}");
    230209  suggestAlternative: "barrier=chain";
    … …  
    233212}
    234213
     214/* #9000 */
    235215*[building=entrance] {
    236   /* see #9000 - http://wiki.openstreetmap.org/wiki/Key:entrance */
    237216  throwWarning: tr("{0} is deprecated", "{0.tag}");
    238217  suggestAlternative: "entrance";
    239218  group: tr("deprecated tagging");
    240219}
    241  
     220
     221/* #9213 */
    242222*[board_type=board] {
    243   /* see #9213 - Useless tag proposed in internal preset for years */
    244223  throwWarning: tr("{0} is deprecated", "{0.tag}");
    245224  group: tr("deprecated tagging");
    246225  fixRemove: "board_type";
    247226}
    248  
     227
     228/* #8434 */
    249229*[man_made=measurement_station] {
    250   /* see #8434 - http://wiki.openstreetmap.org/wiki/Proposed_features/monitoring_station */
    251230  throwWarning: tr("{0} is deprecated", "{0.tag}");
    252231  suggestAlternative: "man_made=monitoring_station";
    … …  
    254233  fixAdd: "man_made=monitoring_station";
    255234}
    256  
     235
    257236*[measurement=water_level] {
    258237  throwWarning: tr("{0} is deprecated", "{0.tag}");
    … …  
    262241  fixAdd: "monitoring:water_level=yes";
    263242}
    264  
     243
    265244*[measurement=weather] {
    266245  throwWarning: tr("{0} is deprecated", "{0.tag}");
    … …  
    270249  fixAdd: "monitoring:weather=yes";
    271250}
    272  
     251
    273252*[measurement=seismic] {
    274253  throwWarning: tr("{0} is deprecated", "{0.tag}");
    … …  
    293272}
    294273
     274/* #9554 */
    295275*[emergency=aed] {
    296   /* see #9554 - http://wiki.openstreetmap.org/wiki/Proposed_features/automated_external_defibrillator */
    297276  throwWarning: tr("{0} is deprecated", "{0.tag}");
    298277  suggestAlternative: "emergency=defibrillator";
    … …  
    314293}
    315294
    316 /* see #10000, http://wiki.openstreetmap.org/wiki/Tag%3Aaccess%3Ddesignated */
     295/* #10000 */
    317296*[access=designated] {
    318297  throwWarning: tr("''{0}'' is meaningless, use more specific tags, e.g. ''{1}''", "access=designated", "bicycle=designated");
    … …  
    324303}
    325304
    326 /* see #10085 - give warning for fixme=yes */
     305/* #10085 */
    327306*[fixme=yes], *[FIXME=yes] {
    328307  throwWarning: tr("{0}={1} is unspecific. Instead of ''{1}'' please give more information about what exactly should be fixed.", "{0.key}", "{0.value}");
    … …  
    343322}
    344323
    345 /* see #10107, #10108, #10929, #13391 - http://wiki.openstreetmap.org/wiki/Proposed_features/leaftype#Features.2FPages_affected */
     324/* #10107, #10108, #10929, #13391 - http://wiki.openstreetmap.org/wiki/Proposed_features/leaftype#Features.2FPages_affected */
    346325*[type=broad_leaved],
    347326*[type=broad_leafed] {
    … …  
    352331  fixAdd: "leaf_type=broadleaved";
    353332}
    354 
    355333*[wood=coniferous],
    356334*[type=coniferous],
    … …  
    362340  fixAdd: "leaf_type=needleleaved";
    363341}
    364 
    365342*[wood=mixed] {
    366343  throwWarning: tr("{0} is deprecated", "{0.tag}");
    … …  
    370347  fixAdd: "leaf_type=mixed";
    371348}
    372 
    373349*[wood=evergreen],
    374350*[type=evergreen] {
    … …  
    379355  fixAdd: "leaf_cycle=evergreen";
    380356}
    381 
    382357*[type=deciduous],
    383358*[type=deciduos] {
    … …  
    388363  fixAdd: "leaf_cycle=deciduous";
    389364}
    390 
    391365*[wood=deciduous] {
    392366  throwWarning: tr("{0} is deprecated", "{0.tag}");
    … …  
    394368  group: tr("deprecated tagging");
    395369}
    396 
    397370node[type=palm],
    398371way[type=palm] {
    … …  
    410383}
    411384
    412 /* see #10447 - https://wiki.openstreetmap.org/wiki/Proposed_features/Bridge_types#Deprecated_bridge_key_values */
     385/* #10447 - https://wiki.openstreetmap.org/wiki/Proposed_features/Bridge_types#Deprecated_bridge_key_values */
    413386*[bridge=causeway] {
    414387  throwWarning: tr("{0} is deprecated", "{0.tag}");
    … …  
    439412}
    440413
    441 /* See #10530 - Incorrect tag proposed in internal preset for years */
     414/* #10530 - Incorrect tag proposed in internal preset for years */
    442415*[fee=interval],
    443416*[lit=interval],
    … …  
    447420}
    448421
    449 /* See #10582 - JOSM supported this tag as "don't upload this" feature, before the introduction of upload flag at layer level */
     422/* #10582 - JOSM supported this tag as "don't upload this" feature, before the introduction of upload flag at layer level */
    450423*[/josm\/ignore/] {
    451424  throwError: tr("{0} is deprecated. Please delete this object and use a private layer instead", "{0.key}");
    … …  
    454427}
    455428
    456 /* see #8281 */
     429/* #8281 */
    457430*[sport=diving] {
    458431  throwWarning: tr("{0} is deprecated", "{0.tag}");
    … …  
    462435}
    463436
    464 /* see #8281 */
     437/* #8281 */
    465438*[parking=park_and_ride] {
    466439  throwWarning: tr("{0} is deprecated", "{0.tag}");
    … …  
    472445}
    473446
    474 /* see #19287, #18334, #17950, #10661, #10837, #11737, #12771 */
     447/* #19287, #18334, #17950, #10661, #10837, #11737, #12771 */
    475448*[playground=yes],
    476449*[manhole=plain],
    … …  
    492465}
    493466
    494 /* see #10693 - http://wiki.openstreetmap.org/wiki/Proposed_features/drop_recommendation_for_place_name , #10837 */
     467/* #10693 - http://wiki.openstreetmap.org/wiki/Proposed_features/drop_recommendation_for_place_name , #10837 */
    495468*[place_name][!name] {
    496469  throwWarning: tr("{0} should be replaced with {1}", "{0.key}", "{1.key}");
    … …  
    526499}
    527500
    528 /* see #10837 */
     501/* #10837 */
    529502*[building][levels],
    530503*[building:part=yes][levels] {
    … …  
    535508}
    536509
    537 /* see #10691 */
     510/* #10691 */
    538511*[protected_class] {
    539512  throwWarning: tr("{0} is deprecated", "{0.key}");
    … …  
    543516}
    544517
    545 /* see #11070 */
     518/* #11070 */
    546519*[kerb=unknown],
    547520*[lock=unknown],
    … …  
    557530}
    558531
    559 /* unclear definition, see #11183 */
     532/* #11183 */
    560533*[sport=skiing] {
    561534  throwWarning: tr("Definition of {0} is unclear", "{0.tag}");
    … …  
    564537}
    565538
    566 /* see #11223 */
     539/* #11223 */
    567540*[waterway=wadi] {
    568541  throwWarning: tr("{0} is deprecated", "{0.tag}");
    … …  
    572545}
    573546
    574 /* see #10346, #15667 (waterway has its own rules in unnecessary.mapcss) */
     547/* #10346, #15667 (waterway has its own rules in unnecessary.mapcss) */
    575548way[oneway=1][!waterway] {
    576549  throwWarning: tr("{0} is deprecated", "{0.tag}");
    … …  
    580553}
    581554
    582 /* see #11329, #15667 */
     555/* #11329, #15667 */
    583556way[oneway=-1][!waterway] {
    584557  throwWarning: tr("{0} is not recommended. Use the Reverse Ways function from the Tools menu.", "{0.tag}");
    … …  
    591564}
    592565
    593 /* see #10329, #15877 */
     566/* #10329, #15877 */
    594567  /* simple key change */
    595568*[color][!colour] {
    … …  
    685658}
    686659
    687 /* see #11234 */
     660/* #11234 */
    688661*[/=|\+|\/|&|<|>|;|'|"|%|#|@|\\|,|\.|\{|\}|\?|\*|\^|\$/] {
    689662  throwWarning: tr("{0}", "{0.key}");
    … …  
    691664}
    692665
    693 /* see #11330, #18642 */
     666/* #11330, #18642 */
    694667*[/^.$/],
    695668node[/^..$/],
    … …  
    706679}
    707680
    708 /* see #11439 */
     681/* #11439 */
    709682*[sport=hockey] {
    710683  throwWarning: tr("{0} is deprecated", "{0.tag}");
    … …  
    714687}
    715688
    716 /* see #11471 */
     689/* #11471 */
    717690*[sport=billard],
    718691*[sport=billards],
    … …  
    724697}
    725698
    726 /* see #11499, #16928 */
     699/* #11499, #16928 */
    727700*[payment:credit_cards=yes] {
    728701  throwWarning: tr("{0} is inaccurate. Use separate tags for each specific type, e.g. {1} or {2}.", "{0.tag}", "payment:mastercard=yes", "payment:visa=yes");
    … …  
    738711}
    739712
    740 /* defunct payment cards */
     713/* #16253 */
    741714*[payment:ep_quick],
    742715*[payment:ep_cash],
    … …  
    748721}
    749722
    750 /* see #8717 */
     723/* #8717 */
    751724*[kp][highway=milestone],
    752725*[kp][railway=milestone],
    … …  
    810783  group: tr("deprecated tagging");
    811784}
    812 /* #12135 - Tag removed rom rendering https://github.com/gravitystorm/openstreetmap-carto/pull/1830 */
     785/* #12135 */
    813786*[landuse=conservation] {
    814787  throwWarning: tr("{0} is deprecated", "{0.tag}");
Note: See TracChangeset for help on using the changeset viewer.