Changeset 1534 in josm for trunk

Timestamp:

2009-04-19T11:56:17+02:00 (15 years ago)

Author:

ulfl

Message:

sync piste:difficulty rules

Location:

trunk

Files:

• presets/presets.xml (modified) (1 diff)
• styles/standard/elemstyles.xml (modified) (5 diffs)

trunk/presets/presets.xml

@@ -1925 +1925 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
             <combo key="piste:type" text="Piste type" values="downhill,nordic,snow_park" default="" delete_if_empty="true" />
-            <combo key="piste:difficulty" text="Difficulty" values="novice,easy,intermedia,advance,expert,freeride" default="" delete_if_empty="true" />
+            <combo key="piste:difficulty" text="Difficulty" values="novice,easy,intermediate,advanced,expert,freeride" default="" delete_if_empty="true" />
             <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
         </item>

trunk/styles/standard/elemstyles.xml

@@ -1224 +1224 @@
                 <condition k="piste:difficulty" v="easy"/>
                 <line width="6" colour="piste_easy#0000ff"/>
+                <area colour="piste_easy#0000ff"/>
                 <icon src="sport/skiing.png"/>
                 <scale_min>1</scale_min>
@@ -1232 +1233 @@
                 <condition k="piste:difficulty" v="intermediate"/>
                 <line width="6" colour="piste_intermediate#ff0000"/>
+                <area colour="piste_intermediate#ff0000"/>
                 <icon src="sport/skiing.png"/>
                 <scale_min>1</scale_min>
@@ -1240 +1242 @@
                 <condition k="piste:difficulty" v="advanced"/>
                 <line width="6" colour="piste_advanced#606060"/>
+                <area colour="piste_advanced#606060"/>
+                <icon src="sport/skiing.png"/>
+                <scale_min>1</scale_min>
+                <scale_max>30000</scale_max>
+        </rule>
+
+        <rule>
+                <condition k="piste:difficulty" v="expert"/>
+                <line width="6" colour="piste_expert#606060"/>
+                <area colour="piste_expert#606060"/>
                 <icon src="sport/skiing.png"/>
                 <scale_min>1</scale_min>
@@ -1248 +1260 @@
                 <condition k="piste:difficulty" v="freeride"/>
                 <line width="6" colour="piste_freeride#ffff00"/>
+                <area colour="piste_freeride#ffff00"/>
                 <icon src="sport/skiing.png"/>
                 <scale_min>1</scale_min>
@@ -1256 +1269 @@
                 <condition k="piste:difficulty" v="novice"/>
                 <line width="6" colour="piste_novice#00ff00"/>
+                <area colour="piste_novice#00ff00"/>
                 <icon src="sport/skiing.png"/>
                 <scale_min>1</scale_min>