Changeset 16316 in josm for trunk

Timestamp:

2020-04-16T21:12:58+02:00 (4 years ago)

Author:

Klumbumbus

Message:

improve validation for the key seats

Location:

trunk/resources/data

Files:

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

trunk/resources/data/defaultpresets.xml

@@ -4242 +4242 @@
             <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
             <combo key="colour" text="Color (HTML name or hexadecimal code)" values_context="color" values="black,blue,brown,gray,green,orange,purple,red,silver,white,yellow,#CD853F" />
-            <combo key="seats" text="Amount of Seats" values="2,3,4,5,6,7,8,9,10" />
+            <combo key="seats" text="Amount of Seats" values="1,2,3,4,5,6,7,8,9,10" />
         </item> <!-- Bench -->
         <item name="Shelter" icon="presets/accommodation/shelter.svg" type="node,closedway" preset_name_label="true">

trunk/resources/data/validator/deprecated.mapcss

@@ -1967 +1967 @@
   group: tr("deprecated tagging");
 }
+
+node[amenity=bench][capacity][!seats],
+way[amenity=bench][capacity][!seats] {
+  throwWarning: tr("{0} is deprecated for {1}", "{1.key}", "{0.tag}");
+  suggestAlternative: "seats";
+  group: tr("deprecated tagging");
+  fixChangeKey: "capacity => seats";
+}
+node[amenity=bench][capacity][seats],
+way[amenity=bench][capacity][seats] {
+  throwWarning: tr("{0} is deprecated for {1}", "{1.key}", "{0.tag}");
+  suggestAlternative: "seats";
+  group: tr("deprecated tagging");
+}

trunk/resources/data/validator/ignoretags.cfg

@@ -137 +137 @@
 E:amperage
 E:capacity
+E:seats
 E:cables
 E:circuits

trunk/resources/data/validator/numeric.mapcss

@@ -254 +254 @@
 
 /* must be an integer positive number only and not 0, see #10837 (lanes), #11055 (screen) */
+node[seats][seats !~ /^[1-9]([0-9]*)$/][amenity=bench],
+way[seats][seats !~ /^[1-9]([0-9]*)$/][amenity=bench],
 way[lanes][lanes !~ /^[1-9]([0-9]*)$/][highway],
 way["lanes:backward"]["lanes:backward" !~ /^[1-9]([0-9]*)$/][highway],