Changeset 1099 in josm

Timestamp:

2008-12-02T19:06:01+01:00 (16 years ago)

Author:

ulfl

Message:

• don't depend on a value for "max ..." tags, show the icon if the key is there
• add a generic (low priority) barrier rule
• use the ticket-machine icon for amenity=vending_machine

File:

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

trunk/styles/standard/elemstyles.xml

@@ -228 +228 @@
 
         <rule>
-                <condition k="maxweight" v="yes"/>
+                <condition k="maxweight"/>
                 <icon src="vehicle/restrictions/maxweight.png"/>
                 <scale_min>1</scale_min>
@@ -235 +235 @@
 
         <rule>
-                <condition k="maxheight" v="yes"/>
+                <condition k="maxheight"/>
                 <icon src="vehicle/restrictions/maxheight.png"/>
                 <scale_min>1</scale_min>
@@ -242 +242 @@
 
         <rule>
-                <condition k="maxwidth" v="yes"/>
+                <condition k="maxwidth"/>
                 <icon src="vehicle/restrictions/maxwidth.png"/>
                 <scale_min>1</scale_min>
@@ -249 +249 @@
 
         <rule>
-                <condition k="maxlength" v="yes"/>
+                <condition k="maxlength"/>
                 <icon src="vehicle/restrictions/maxlength.png"/>
                 <scale_min>1</scale_min>
@@ -256 +256 @@
 
         <rule>
-                <condition k="maxspeed" v="yes"/>
+                <condition k="maxspeed"/>
                 <icon src="vehicle/restrictions/speed.png"/>
                 <scale_min>1</scale_min>
@@ -263 +263 @@
 
         <rule>
-                <condition k="minspeed" v="yes"/>
+                <condition k="minspeed"/>
                 <icon src="vehicle/restrictions/minspeed.png"/>
                 <scale_min>1</scale_min>
@@ -270 +270 @@
 
         <rule>
-                <condition k="maxstay" v="yes"/>
+                <condition k="maxstay"/>
                 <icon src="misc/no_icon.png"/>
                 <scale_min>1</scale_min>
@@ -277 +277 @@
 
         <rule>
-                <condition k="toll" v="yes"/>
+                <condition k="toll"/>
                 <icon src="misc/no_icon.png"/>
                 <scale_min>1</scale_min>
@@ -298 +298 @@
                 <condition k="barrier" v="speed_bump"/>
                 <icon annotate="true" src="misc/no_icon.png"/>
+                <scale_min>1</scale_min>
+                <scale_max>50000</scale_max>
+        </rule>
+        <rule>
+                <condition k="barrier"/>
+                <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
                 <scale_min>1</scale_min>
                 <scale_max>50000</scale_max>
@@ -2006 +2012 @@
         <rule>
                 <condition k="amenity" v="vending_machine"/>
-                <icon src="misc/no_icon.png"/>
+                <icon src="transport/ticket-machine.png"/>
                 <area colour="amenity2#f7efb7"/>
                 <scale_min>1</scale_min>