Changeset 6218 in josm for trunk

Timestamp:

2013-09-06T01:14:51+02:00 (11 years ago)

Author:

Don-vip

Message:

fix #9056 - add support for natural=tree_row

Location:

trunk

Files:

• data/defaultpresets.xml (modified) (1 diff)
• styles/standard/elemstyles.xml (modified) (8 diffs)

trunk/data/defaultpresets.xml

@@ -6013 +6013 @@
             <text key="name:botanical" text="Botanical Name" />
         </item>
+        <item name="Tree Row" icon="presets/tree.png" type="way">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree_row"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=tree_row"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:natural=tree_row"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:natural=tree_row"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:natural=tree_row"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=tree_row" />
+            <key key="natural" value="tree_row" />
+        </item>
         <item name="Wood" icon="presets/landuse.png" type="node,closedway,relation">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"

trunk/styles/standard/elemstyles.xml

@@ -3016 +3016 @@
 
         <rule>
+                <condition k="natural" v="tree_row"/>
+                <icon src="misc/no_icon.png"/>
+                <line width="2" colour="woodarea#008000"/>
+        </rule>
+        
+        <rule>
                 <condition k="natural" v="wood"/>
                 <icon src="misc/landmark/trees.png"/>
@@ -3721 +3727 @@
         </rule>
 
-    <rule>
-        <condition k="building" v="garage"/>
-        <icon annotate="true" src="misc/landuse/garages.png"/>
-    </rule>
-
-    <rule>
-        <condition k="building" v="garages"/>
-        <icon annotate="true" src="misc/landuse/garages.png"/>
-    </rule>
+        <rule>
+                <condition k="building" v="garage"/>
+                <icon annotate="true" src="misc/landuse/garages.png"/>
+        </rule>
+
+        <rule>
+                <condition k="building" v="garages"/>
+                <icon annotate="true" src="misc/landuse/garages.png"/>
+        </rule>
 
         <rule>
@@ -3854 +3860 @@
                 <icon annotate="true" src="transport/railway_station.png"  priority="10" />
                 <line width="1" realwidth="1" colour="service#809bc0" dashed="9" dashedcolour="livingdashed#00ff00"/>
-        <area colour="service#809bc0" closed="true" />
+                <area colour="service#809bc0" closed="true" />
         </rule>
 
@@ -3862 +3868 @@
                 <icon annotate="true" src="transport/railway_station.png"  priority="8" />
                 <line width="1" realwidth="1" colour="service#809bc0" dashed="9" dashedcolour="livingdashed#00ff00"/>
-        <area colour="service#809bc0" closed="true" />
+                <area colour="service#809bc0" closed="true" />
         </rule>
 
@@ -3870 +3876 @@
                 <icon annotate="true" src="transport/ferry.png"  priority="7" />
                 <line width="1" realwidth="1" colour="service#809bc0" dashed="9" dashedcolour="livingdashed#00ff00"/>
-        <area colour="service#809bc0" closed="true" />
+                <area colour="service#809bc0" closed="true" />
         </rule>
 
@@ -3878 +3884 @@
                 <icon annotate="true" src="transport/aerialway/station.png"  priority="6" />
                 <line width="1" realwidth="1" colour="service#809bc0" dashed="9" dashedcolour="livingdashed#00ff00"/>
-        <area colour="service#809bc0" closed="true" />
+                <area colour="service#809bc0" closed="true" />
         </rule>
 
@@ -3886 +3892 @@
                 <icon annotate="true" src="transport/bus_small.png"  priority="4" />
                 <line width="1" realwidth="1" colour="service#809bc0" dashed="9" dashedcolour="livingdashed#00ff00"/>
-        <area colour="service#809bc0" closed="true" />
+                <area colour="service#809bc0" closed="true" />
         </rule>
 
@@ -3893 +3899 @@
                 <icon annotate="true" src="transport/bus_small.png" priority="-10"/>
                 <line width="1" realwidth="1" colour="service#809bc0" dashed="9" dashedcolour="livingdashed#00ff00"/>
-        <area colour="service#809bc0" closed="true" />
+                <area colour="service#809bc0" closed="true" />
         </rule>