Changeset 7735 in josm for trunk/data

Timestamp:

2014-11-19T21:18:32+01:00 (5 years ago)

Author:

Klumbumbus

Message:

see #10679 - drop support of some natural=* on nodes in presets and mappaint style. Add validator messages, change two icons in presets, add mappaint style for some natural=*.

Location:

trunk/data

Files:

• defaultpresets.xml (modified) (8 diffs)
• validator/geometry.mapcss (modified) (2 diffs)

trunk/data/defaultpresets.xml

@@ -1765 +1765 @@
         </item> <!-- Covered Reservoir -->
         <separator/>
-        <item name="Water" icon="presets/water.png" type="node,closedway,relation" preset_name_label="true">
+        <item name="Water" icon="presets/water.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=water"
@@ -1837 +1837 @@
             <text key="name" text="Name" />
         </item> <!-- Mud -->
-        <item name="Beach" icon="presets/beach.png" type="node,closedway,relation" preset_name_label="true">
+        <item name="Beach" icon="presets/beach.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=beach"
@@ -7003 +7003 @@
             </optional>
         </item> <!-- Tree Row -->
-        <item name="Wood" icon="presets/landuse.png" type="closedway,relation" preset_name_label="true">
+        <item name="Wood" icon="styles/standard/misc/landmark/trees.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood"
@@ -7029 +7029 @@
             <reference ref="leaf" />
         </item> <!-- Forest -->
-        <item name="Grassland" icon="presets/landuse.png" type="closedway,relation" preset_name_label="true">
+        <item name="Grassland" icon="styles/standard/misc/landuse/meadow.svg" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=grassland"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=grassland"
@@ -7056 +7056 @@
         </item> <!-- Nature Reserve -->
         <separator/>
-        <item name="Scree" icon="presets/empty.png" type="node,closedway,relation" preset_name_label="true">
+        <item name="Scree" icon="presets/empty.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=scree"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=scree"
@@ -7068 +7068 @@
             <text key="name" text="Name" />
         </item> <!-- Scree -->
-        <item name="Fell" icon="presets/empty.png" type="node,closedway,relation" preset_name_label="true">
+        <item name="Fell" icon="presets/empty.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=fell"
@@ -7079 +7079 @@
             <text key="name" text="Name" />
         </item> <!-- Fell -->
-        <item name="Scrub" icon="presets/scrub.svg" type="node,closedway,relation" preset_name_label="true">
+        <item name="Scrub" icon="presets/scrub.svg" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=scrub"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=scrub"
@@ -7095 +7095 @@
             </optional>
         </item> <!-- Scrub -->
-        <item name="Heath" icon="presets/empty.png" type="node,closedway,relation" preset_name_label="true">
+        <item name="Heath" icon="presets/empty.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath"
                   bg.href="http://wiki.openstreetmap.org/wiki/Bg:Tag:natural=heath"

trunk/data/validator/geometry.mapcss

@@ -1 @@
-/* {0} on a node */
+/* {0} on a node, should be a way */
 node[oneway],
 node[bridge?],
-node[landuse],
 node[sidewalk],
-node[source:outline] {
-  throwWarning: tr("{0} on a node", "{0.key}");
+node[natural=coastline],
+node[natural=ridge],
+node[natural=tree_row] {
+  throwWarning: tr("{0} on a node. Should be used on a way.", "{0.key}");
   assertMatch: "node oneway=-1";
   assertNoMatch: "way oneway=-1";
@@ -12 +13 @@
 }
 
-node[natural=wood] {
-  throwOther: tr("{0} on a node. Should be drawn as an area", "{0.tag}");
+/* {0} on a node, should be an area; see ticket #10679 */
+node[landuse],
+node[natural=scree],
+node[natural=scrub],
+node[natural=fell],
+node[natural=heath],
+node[natural=wood],
+node[natural=grassland],
+node[natural=wetland],
+node[natural=water],
+node[natural=mud],
+node[natural=beach],
+node[natural=sand],
+node[natural=wood],
+node[natural=bare_rock],
+node[waterway=riverbank],
+node[source:outline] {
+  throwWarning: tr("{0} on a node. Should be drawn as an area.", "{0.tag}");
 }