Changeset 14830 in josm for trunk/data

Timestamp:

2019-03-04T21:02:29+01:00 (6 years ago)

Author:

Klumbumbus

Message:

fix #17402 - warn about leisure=nature_reserve on nodes

Location:

trunk/data

Files:

• defaultpresets.xml (modified) (1 diff)
• validator/combinations.mapcss (modified) (1 diff)
• validator/geometry.mapcss (modified) (3 diffs)

trunk/data/defaultpresets.xml

@@ -6752 +6752 @@
             <combo key="grassland" text="Type" values="pampas,prairie,puszta,savanna,steppe,veld" />
         </item> <!-- Grassland -->
-        <item name="Nature Reserve" icon="presets/leisure/nature_reserve.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Nature Reserve" icon="presets/leisure/nature_reserve.svg" type="closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:leisure=nature_reserve" />
             <space />

trunk/data/validator/combinations.mapcss

@@ -547 +547 @@
   throwOther: tr("{0} together with {1}. Tag each hydrant separately.", "{0.tag}", "{1.tag}");
 }
+
+/* #12502 */
+node[leisure=park][natural=tree] {
+  throwWarning: tr("{0} together with {1} on a node. Remove {0}.", "{0.tag}", "{1.tag}");
+  group: tr("suspicious tag combination");
+  fixRemove: "leisure";
+}

trunk/data/validator/geometry.mapcss

@@ -53 +53 @@
 }
 
-/* {0} on a node, should be an area; #10679 #16528 #16792 */
+/* {0} on a node, should be an area; #10679 #16528 #16792 #12502 #17402*/
 node[golf=green],
 node[golf=bunker],
@@ -74 +74 @@
 node[natural=bare_rock],
 node[natural=glacier],
+node[leisure=park][natural!=tree], /* For nodes with both tags another warning is created in combinations.mapcss */
+node[leisure=nature_reserve],
 node[waterway=riverbank],
 node[man_made=bridge],
@@ -146 +148 @@
   throwError: tr("Object at Position 0.00E 0.00N. There is nothing at this position except an already mapped weather buoy.");
   fixDeleteObject: this;
-}
-
-/* #12502 */
-node[leisure=park][natural=tree] {
-  throwWarning: tr("{0} together with {1} on a node. Remove {0}.", "{0.tag}", "{1.tag}");
-  group: tr("suspicious tag combination");
-  fixRemove: "leisure";
-}
-node[leisure=park][natural!=tree] {
-  throwWarning: tr("{0} on a node. Should be drawn as an area.", "{0.tag}");
 }