Changeset 9050 in josm for trunk

Timestamp:

2015-11-21T18:12:08+01:00 (9 years ago)

Author:

Klumbumbus

Message:

see #12102 - ignore man_made=petroleum_well, add validator warning for unusual value of admin_level

Location:

trunk/data

Files:

• defaultpresets.xml (modified) (2 diffs)
• validator/ignoretags.cfg (modified) (2 diffs)
• validator/numeric.mapcss (modified) (1 diff)

trunk/data/defaultpresets.xml

@@ -7702 +7702 @@
             <key key="boundary" value="administrative" />
             <text key="name" text="Name" />
-            <combo key="admin_level" text="Administrative level" values="1,2,3,4,5,6,7,8,9,10" />
+            <combo key="admin_level" text="Administrative level" values="1,2,3,4,5,6,7,8,9,10,11" />
             <check key="maritime" text="Maritime" disable_off="true" />
         </item> <!-- Administrative -->
@@ -8867 +8867 @@
             <combo key="boundary" text="Boundary type" values="administrative,maritime,national_park,political,postal_code,protected_area" values_searchable="true" />
             <optional>
-                <combo key="admin_level" text="Administrative level" values="1,2,3,4,5,6,7,8,9,10" />
+                <combo key="admin_level" text="Administrative level" values="1,2,3,4,5,6,7,8,9,10,11" />
             </optional>
             <roles>

trunk/data/validator/ignoretags.cfg

@@ -39 +39 @@
 E:loc_name
 E:attribution
-E:admin_level
 E:heritage
 E:old_name
@@ -94 +93 @@
 K:bicycle=dismount
 K:wall=no
+K:man_made=petroleum_well
 ;
 ; Highway Key/Value Pairs

trunk/data/validator/numeric.mapcss

@@ -175 +175 @@
   assertNoMatch: "node amenity=cinema screen=8";
 }
+*[admin_level][admin_level !~ /^(1|2|3|4|5|6|7|8|9|10|11|12)$/] {
+  throwWarning: tr("unusual value of {0}", "admin_level");
+  assertMatch: "node admin_level=0";
+  assertMatch: "node admin_level=-1";
+  assertMatch: "node admin_level=13";
+  assertNoMatch: "node admin_level=5";
+}