Changeset 1118 in josm

Timestamp:

2008-12-13T16:10:58+01:00 (16 years ago)

Author:

ulfl

Message:

add parking=multi-storey (used > 500 times)

lower the prio for some stuff, so more specialised icons take precedence, e.g. place_of_worship vs. religion= (formerly, this was only working by chance)

File:

• trunk/styles/standard/elemstyles.xml (modified) (9 diffs)

trunk/styles/standard/elemstyles.xml

@@ -730 +730 @@
         <rule>
                 <condition k="waterway" v="riverbank"/>
-                <line width="1" colour="riverbank#0000cf" priority="10000"/>
-                <area colour="riverbank#0000cf" priority="10000"/>
+                <line width="1" colour="riverbank#0000cf" priority="10000"/>
+                <area colour="riverbank#0000cf" priority="10000"/>
                 <icon annotate="true" src="misc/deprecated.png"/>
                 <scale_min>1</scale_min>
@@ -1164 +1164 @@
         </rule>
 
-        <!--the power_source rules must be placed before the power=generator rule! -->
         <rule>
                 <condition k="power_source" v="wind"/>
@@ -1199 +1198 @@
         <rule>
                 <condition k="power" v="generator"/>
-                <icon annotate="true" src="misc/landmark/power.png"/>
+                <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
                 <area width="1" colour="power#eeeeee"/>
                 <scale_min>1</scale_min>
@@ -1524 +1523 @@
 
         <rule>
+                <condition k="parking" v="multi-storey"/>
+                <icon annotate="true" src="vehicle/parking/garage.png" priority="10000"/>
+                <area colour="amenity_traffic#f7efb7"/>
+                <scale_min>1</scale_min>
+                <scale_max>50000</scale_max>
+        </rule>
+
+        <rule>
                 <condition k="amenity" v="parking"/>
                 <icon annotate="true" src="vehicle/parking.png"/>
@@ -1667 +1674 @@
         </rule>
 
-        <!--the religion rules must be placed before the place_of_worship rule! -->
         <rule>
                 <condition k="religion" v="bahai"/>
@@ -1739 +1745 @@
 
         <rule>
-                <condition k="amenity" v="place_of_worship"/>
+                <condition k="amenity" v="place_of_worship" priority="-10000"/>
                 <icon annotate="true" src="religion.png"/>
                 <area colour="amenity2#f7efb7"/>
@@ -3387 +3393 @@
 
         <!-- this will badly display otherwise well tagged footways and alike, so comment it out until we have better ways to display this in JOSM!
+        XXX - maybe it's possible to use linemod's here?
         <rule>
                 <condition k="surface" v="paved"/>
@@ -3561 +3568 @@
 <!--"work in progress" tags -->
 
-        <!-- keep this generic rules at the end of the file, so more specialised rules fit first -->
         <rule>
                 <condition k="building" b="yes"/>
@@ -3678 +3684 @@
         </rule>
 
+<!-- miscellaneous other tags, not fit elsewhere -->    
         <rule>
                 <condition k="traffic_sign" v="city_limit"/>