Changeset 7735 in josm for trunk/data
- Timestamp:
- 2014-11-19T21:18:32+01:00 (11 years ago)
- Location:
- trunk/data
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/data/defaultpresets.xml
r7734 r7735 1765 1765 </item> <!-- Covered Reservoir --> 1766 1766 <separator/> 1767 <item name="Water" icon="presets/water.png" type=" node,closedway,relation" preset_name_label="true">1767 <item name="Water" icon="presets/water.png" type="closedway,relation" preset_name_label="true"> 1768 1768 <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" 1769 1769 cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=water" … … 1837 1837 <text key="name" text="Name" /> 1838 1838 </item> <!-- Mud --> 1839 <item name="Beach" icon="presets/beach.png" type=" node,closedway,relation" preset_name_label="true">1839 <item name="Beach" icon="presets/beach.png" type="closedway,relation" preset_name_label="true"> 1840 1840 <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" 1841 1841 de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=beach" … … 7003 7003 </optional> 7004 7004 </item> <!-- Tree Row --> 7005 <item name="Wood" icon=" presets/landuse.png" type="closedway,relation" preset_name_label="true">7005 <item name="Wood" icon="styles/standard/misc/landmark/trees.png" type="closedway,relation" preset_name_label="true"> 7006 7006 <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood" 7007 7007 de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" … … 7029 7029 <reference ref="leaf" /> 7030 7030 </item> <!-- Forest --> 7031 <item name="Grassland" icon=" presets/landuse.png" type="closedway,relation" preset_name_label="true">7031 <item name="Grassland" icon="styles/standard/misc/landuse/meadow.svg" type="closedway,relation" preset_name_label="true"> 7032 7032 <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=grassland" 7033 7033 de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=grassland" … … 7056 7056 </item> <!-- Nature Reserve --> 7057 7057 <separator/> 7058 <item name="Scree" icon="presets/empty.png" type=" node,closedway,relation" preset_name_label="true">7058 <item name="Scree" icon="presets/empty.png" type="closedway,relation" preset_name_label="true"> 7059 7059 <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=scree" 7060 7060 de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=scree" … … 7068 7068 <text key="name" text="Name" /> 7069 7069 </item> <!-- Scree --> 7070 <item name="Fell" icon="presets/empty.png" type=" node,closedway,relation" preset_name_label="true">7070 <item name="Fell" icon="presets/empty.png" type="closedway,relation" preset_name_label="true"> 7071 7071 <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" 7072 7072 de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=fell" … … 7079 7079 <text key="name" text="Name" /> 7080 7080 </item> <!-- Fell --> 7081 <item name="Scrub" icon="presets/scrub.svg" type=" node,closedway,relation" preset_name_label="true">7081 <item name="Scrub" icon="presets/scrub.svg" type="closedway,relation" preset_name_label="true"> 7082 7082 <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=scrub" 7083 7083 de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=scrub" … … 7095 7095 </optional> 7096 7096 </item> <!-- Scrub --> 7097 <item name="Heath" icon="presets/empty.png" type=" node,closedway,relation" preset_name_label="true">7097 <item name="Heath" icon="presets/empty.png" type="closedway,relation" preset_name_label="true"> 7098 7098 <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" 7099 7099 bg.href="http://wiki.openstreetmap.org/wiki/Bg:Tag:natural=heath" -
trunk/data/validator/geometry.mapcss
r7707 r7735 1 /* {0} on a node */ 1 /* {0} on a node, should be a way */ 2 2 node[oneway], 3 3 node[bridge?], 4 node[landuse],5 4 node[sidewalk], 6 node[source:outline] { 7 throwWarning: tr("{0} on a node", "{0.key}"); 5 node[natural=coastline], 6 node[natural=ridge], 7 node[natural=tree_row] { 8 throwWarning: tr("{0} on a node. Should be used on a way.", "{0.key}"); 8 9 assertMatch: "node oneway=-1"; 9 10 assertNoMatch: "way oneway=-1"; … … 12 13 } 13 14 14 node[natural=wood] { 15 throwOther: tr("{0} on a node. Should be drawn as an area", "{0.tag}"); 15 /* {0} on a node, should be an area; see ticket #10679 */ 16 node[landuse], 17 node[natural=scree], 18 node[natural=scrub], 19 node[natural=fell], 20 node[natural=heath], 21 node[natural=wood], 22 node[natural=grassland], 23 node[natural=wetland], 24 node[natural=water], 25 node[natural=mud], 26 node[natural=beach], 27 node[natural=sand], 28 node[natural=wood], 29 node[natural=bare_rock], 30 node[waterway=riverbank], 31 node[source:outline] { 32 throwWarning: tr("{0} on a node. Should be drawn as an area.", "{0.tag}"); 16 33 } 17 34
Note:
See TracChangeset
for help on using the changeset viewer.