Changeset 7235 in josm

Timestamp:

2014-06-10T01:09:36+02:00 (10 years ago)

Author:

Don-vip

Message:

fix #10127 - render type of tree (leaf_type=broadleaved/needleleaved)

Location:

trunk/styles/standard

Files:

• elemstyles.mapcss (modified) (1 diff)
• elemstyles.xml (modified) (2 diffs)

trunk/styles/standard/elemstyles.mapcss

@@ -3090 +3090 @@
     text: auto;
 }
-node[natural=tree][type=conifer] {
+node[natural=tree][type=conifer],
+node[natural=tree][leaf_type=needleleaved] {
     icon-image: "misc/landmark/trees_conifer.png";
     text: auto;
 /*    priority="10"*/
 }
-node[natural=tree][type=broad_leaved] {
+node[natural=tree][type=broad_leaved],
+node[natural=tree][leaf_type=broadleaved] {
     icon-image: "misc/landmark/trees_broad_leaved.png";
     text: auto;

trunk/styles/standard/elemstyles.xml

@@ -346 +346 @@
                 <condition k="barrier" v="swing_gate"/>
                 <icon annotate="true" src="vehicle/swing_gate.png"/>
-    </rule>
+        </rule>
         <rule>
                 <condition k="barrier" v="wall"/>
@@ -3199 +3199 @@
         <rule>
                 <condition k="natural" v="tree"/>
+                <condition k="leaf_type" v="needleleaved"/>
+                <icon src="misc/landmark/trees_conifer.png" priority="10"/>
+        </rule>
+
+        <rule>
+                <condition k="natural" v="tree"/>
                 <condition k="type" v="broad_leaved"/>
+                <icon src="misc/landmark/trees_broad_leaved.png" priority="10"/>
+        </rule>
+
+        <rule>
+                <condition k="natural" v="tree"/>
+                <condition k="leaf_type" v="broadleaved"/>
                 <icon src="misc/landmark/trees_broad_leaved.png" priority="10"/>
         </rule>