Changeset 1334 in josm for trunk/styles

Timestamp:

2009-01-25T00:31:10+01:00 (15 years ago)

Author:

ulfl

Message:

use the new "integer dashed" a few times
aerialway=station is certainly an area, not a way
fix some (now displayed) syntax errors

File:

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

trunk/styles/standard/elemstyles.xml

@@ -560 +560 @@
         <rule>
                 <condition k="highway" v="steps"/>
-                <line width="1" realwidth="1" colour="foot#00ff00"/>
+                <line width="1" realwidth="1" dashed="1" colour="foot#00ff00"/>
                 <icon annotate="true" src="transport/steps.png"/>
                 <scale_min>1</scale_min>
@@ -682 +682 @@
         <rule>
                 <condition k="highway" v="turning_circle"/>
-                <area width="1" colour="turningcircle#c0c0c0"/>
+                <area colour="turningcircle#c0c0c0"/>
                 <icon annotate="true" src="vehicle/turning_circle.png"/>
                 <scale_min>1</scale_min>
@@ -700 +700 @@
         <rule>
                 <condition k="junction" v="roundabout"/>
-                <area width="1" colour="roundabout#eeeeee"/>
+                <area colour="roundabout#eeeeee"/>
                 <!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
                 <icon annotate="true" src="misc/deprecated.png"/>
@@ -753 +753 @@
         <rule>
                 <condition k="tracktype" v="grade1"/>
-                <line width="1" realwidth="3" dashed="true" colour="highway_track#006600"/>
+                <line width="1" realwidth="3" colour="highway_track#006600"/>
                 <icon annotate="true" src="misc/deprecated.png"/>
                 <scale_min>1</scale_min>
@@ -761 +761 @@
         <rule>
                 <condition k="tracktype" v="grade2"/>
-                <line width="1" realwidth="3" dashed="true" colour="highway_track#006600"/>
+                <line width="1" realwidth="3" dashed="3" colour="highway_track#006600"/>
                 <icon annotate="true" src="misc/deprecated.png"/>
                 <scale_min>1</scale_min>
@@ -769 +769 @@
         <rule>
                 <condition k="tracktype" v="grade3"/>
-                <line width="1" realwidth="3" dashed="true" colour="highway_track#006600"/>
+                <line width="1" realwidth="3" dashed="6" colour="highway_track#006600"/>
                 <icon annotate="true" src="misc/deprecated.png"/>
                 <scale_min>1</scale_min>
@@ -777 +777 @@
         <rule>
                 <condition k="tracktype" v="grade4"/>
-                <line width="1" realwidth="3" dashed="true" colour="highway_track#006600"/>
+                <line width="1" realwidth="3" dashed="9" colour="highway_track#006600"/>
                 <icon annotate="true" src="misc/deprecated.png"/>
                 <scale_min>1</scale_min>
@@ -785 +785 @@
         <rule>
                 <condition k="tracktype" v="grade5"/>
-                <line width="1" realwidth="3" dashed="true" colour="highway_track#006600"/>
+                <line width="1" realwidth="3" dashed="12" colour="highway_track#006600"/>
                 <icon annotate="true" src="misc/deprecated.png"/>
                 <scale_min>1</scale_min>
@@ -836 +836 @@
         <rule>
                 <condition k="waterway" v="dock"/>
-                <area width="1" colour="dock#0000cf"/>
+                <area colour="dock#0000cf"/>
                 <icon annotate="true" src="nautical/boatyard.png"/>
                 <scale_min>1</scale_min>
@@ -1139 +1139 @@
         <rule>
                 <condition k="aerialway" v="cable_car"/>
-                <line width="1" colour="aerialway#663300" dashed="true"/>
+                <line width="1" colour="aerialway#663300" dashed="9"/>
                 <icon annotate="true" src="transport/aerialway/cable_car.png"/>
                 <scale_min>1</scale_min>
@@ -1147 +1147 @@
         <rule>
                 <condition k="aerialway" v="chair_lift"/>
-                <line width="1" colour="aerialway#663300" dashed="true"/>
+                <line width="1" colour="aerialway#663300" dashed="6"/>
                 <icon annotate="true" src="transport/aerialway/chair_lift.png"/>
                 <scale_min>1</scale_min>
@@ -1155 +1155 @@
         <rule>
                 <condition k="aerialway" v="drag_lift"/>
-                <line width="1" colour="aerialway#663300" dashed="true"/>
+                <line width="1" colour="aerialway#663300" dashed="3"/>
                 <icon annotate="true" src="transport/aerialway/drag_lift.png"/>
                 <scale_min>1</scale_min>
@@ -1163 +1163 @@
         <rule>
                 <condition k="aerialway" v="station"/>
-                <line width="1" colour="aerialway#663300" dashed="true"/>
+                <area colour="aerialway#663300"/>
                 <icon annotate="true" src="transport/aerialway/station.png"/>
                 <scale_min>1</scale_min>
@@ -1216 +1216 @@
                 <condition k="power" v="tower"/>
                 <icon annotate="true" src="misc/landmark/power/tower_small.png"/>
-                <area width="1" colour="power#eeeeee"/>
+                <area colour="power#eeeeee"/>
                 <scale_min>1</scale_min>
                 <scale_max>50000</scale_max>
@@ -1232 +1232 @@
                 <condition k="power" v="sub_station"/>
                 <icon annotate="true" src="misc/landmark/power.png"/>
-                <area width="1" colour="power#eeeeee"/>
+                <area colour="power#eeeeee"/>
                 <scale_min>1</scale_min>
                 <scale_max>50000</scale_max>
@@ -1240 +1240 @@
                 <condition k="power_source" v="wind"/>
                 <icon annotate="true" src="misc/landmark/power/wind.png"/>
-                <area width="1" colour="power#eeeeee"/>
+                <area colour="power#eeeeee"/>
                 <scale_min>1</scale_min>
                 <scale_max>50000</scale_max>
@@ -1248 +1248 @@
                 <condition k="power_source" v="hydro"/>
                 <icon annotate="true" src="misc/landmark/power/hydro.png"/>
-                <area width="1" colour="power#eeeeee"/>
+                <area colour="power#eeeeee"/>
                 <scale_min>1</scale_min>
                 <scale_max>50000</scale_max>
@@ -1256 +1256 @@
                 <condition k="power_source" v="fossil"/>
                 <icon annotate="true" src="misc/landmark/power/fossil.png"/>
-                <area width="1" colour="power#eeeeee"/>
+                <area colour="power#eeeeee"/>
                 <scale_min>1</scale_min>
                 <scale_max>50000</scale_max>
@@ -1264 +1264 @@
                 <condition k="power_source" v="nuclear"/>
                 <icon annotate="true" src="misc/landmark/power/nuclear.png"/>
-                <area width="1" colour="power#eeeeee"/>
+                <area colour="power#eeeeee"/>
                 <scale_min>1</scale_min>
                 <scale_max>50000</scale_max>
@@ -1272 +1272 @@
                 <condition k="power" v="generator"/>
                 <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-                <area width="1" colour="power#eeeeee"/>
+                <area colour="power#eeeeee"/>
                 <scale_min>1</scale_min>
                 <scale_max>50000</scale_max>
@@ -1834 +1834 @@
 
         <rule>
-                <condition k="amenity" v="place_of_worship" priority="-10000"/>
-                <icon annotate="true" src="religion.png"/>
-                <area colour="amenity_light#f7efb7"/>
+                <condition k="amenity" v="place_of_worship"/>
+                <icon annotate="true" src="religion.png" priority="-10000"/>
+                <area colour="amenity_light#f7efb7" priority="-10000"/>
                 <scale_min>1</scale_min>
                 <scale_max>50000</scale_max>
@@ -2772 +2772 @@
         <rule>
                 <condition k="landuse" v="construction"/>
-                <area colour="construction#ffff00" dashed="true"/>
+                <area colour="construction#ffff00"/>
+                <line width="1" colour="construction#ffff00" dashed="true"/>
                 <icon src="misc/construction.png"/>
                 <scale_min>1</scale_min>