Changeset 6157 in josm for trunk

Timestamp:

2013-08-19T17:26:02+02:00 (11 years ago)

Author:

Don-vip

Message:

fix #8962 - Deprecate fence_type=chain + new validator tests for *_type tags without main tag

Location:

trunk

Files:

• data/defaultpresets.xml (modified) (1 diff)
• data/tagchecker.cfg (modified) (1 diff)
• src/org/openstreetmap/josm/data/validation/tests/DeprecatedTags.java (modified) (1 diff)

trunk/data/defaultpresets.xml

@@ -1303 +1303 @@
             <key key="barrier" value="fence" />
             <optional>
-<!--                <combo key="fence_type" text="Type" values="barbed_wire,chain_link,electric,roundpole,split_rail,wood" /> -->
-                <combo key="fence_type" text="Type" values="barbed_wire,chain,electric,hedge,pole,split_rail,wood" />
+                <combo key="fence_type" text="Type" values="barbed_wire,chain_link,electric,metal,pole,split_rail,wire,wood" />
                 <text key="height" text="Height (meters)" length="7" />
             </optional>

trunk/data/tagchecker.cfg

@@ -146 +146 @@
 *    : W : width                == * && highway != * && railway != * && waterway != * && aeroway != * && cycleway != * && footway != * && barrier != * && man_made != * # width without physical linear feature
 *    : W : maxspeed             == * && highway != * && railway != * && traffic_sign != /(.*;)?maxspeed(;.*)?/ && type != enforcement # maxspeed without highway/railway/traffic_sign
+*    : W : fence_type           == * && barrier != fence                               # fence_type without barrier=fence
+*    : W : border_type          == * && boundary != *                                  # border_type without boundary
+*    : W : recycling_type       == * && amenity != recycling                           # recycling_type without amenity=recycling
+*    : W : board_type           == * && information != board                           # board_type without information=board
+*    : W : shelter_type         == * && amenity != shelter                             # shelter_type without amenity=shelter
+*    : W : lamp_type            == * && highway != street_lamp                         # lamp_type without highway=street_lamp
+*    : W : building_type        == * && building != *                                  # building_type without building
+*    : W : map_type             == * && information != map                             # map_type without information=map
+*    : W : site_type            == * && historic != archaeological_site                # site_type without historic=archaeological_site
+*    : W : artwork_type         == * && tourism != artwork                             # artwork_type without tourism=artwork
+*    : W : castle_type          == * && historic != castle                             # castle_type without historic=castle
+*    : W : reservoir_type       == * && landuse != reservoir && water != reservoir     # reservoir_type without landuse/water=reservoir
+*    : W : bunker_type          == * && military != bunker                             # bunker_type without military=bunker
 
 ################################

trunk/src/org/openstreetmap/josm/data/validation/tests/DeprecatedTags.java

@@ -113 +113 @@
                 testAndRemove("generator:method", "pumping").
                 add("generator:method", "water-pumped-storage"));
+        // http://wiki.openstreetmap.org/wiki/Key:fence_type
+        // see #8962
+        checks.add(new DeprecationCheck(2122).
+                test("fence_type", "chain").
+                alternative("barrier", "chain").
+                alternative("fence_type", "chain_link"));
     }