Index: trunk/styles/standard/elemstyles.xml
===================================================================
--- trunk/styles/standard/elemstyles.xml	(revision 5590)
+++ trunk/styles/standard/elemstyles.xml	(revision 5591)
@@ -1179,5 +1179,13 @@
 	<rule>
 		<condition k="piste:difficulty" v="easy"/>
-		<line width="6" colour="piste_easy#0000ff"/>
+		<!--
+		    Show piste indication as linemod if there is already another line
+		    style in place (e.g. from highway=track), otherwise add a proper line
+		    style that looks the same.
+		    If the proper line style applies, the linemod is suppressed, so it
+		    renders only one style for each way.
+		-->
+		<line width="6" colour="piste_easy#0000ff" priority="-100000"/>
+		<linemod width="6" mode="under" colour="piste_easy#0000ff"/>
 		<area colour="piste_easy#0000ff" closed="true"/>
 		<icon src="sport/skiing.png"/>
@@ -1186,5 +1194,6 @@
 	<rule>
 		<condition k="piste:difficulty" v="intermediate"/>
-		<line width="6" colour="piste_intermediate#ff0000"/>
+		<line width="6" colour="piste_intermediate#ff0000" priority="-100000"/>
+		<linemod width="6" mode="under" colour="piste_intermediate#ff0000"/>
 		<area colour="piste_intermediate#ff0000" closed="true"/>
 		<icon src="sport/skiing.png"/>
@@ -1193,5 +1202,6 @@
 	<rule>
 		<condition k="piste:difficulty" v="advanced"/>
-		<line width="6" colour="piste_advanced#606060"/>
+		<line width="6" colour="piste_advanced#606060" priority="-100000"/>
+		<linemod width="6" mode="under" colour="piste_advanced#606060"/>
 		<area colour="piste_advanced#606060" closed="true"/>
 		<icon src="sport/skiing.png"/>
@@ -1200,5 +1210,6 @@
 	<rule>
 		<condition k="piste:difficulty" v="expert"/>
-		<line width="6" colour="piste_expert#606060"/>
+		<line width="6" colour="piste_expert#606060" priority="-100000"/>
+		<linemod width="6" mode="under" colour="piste_expert#606060"/>
 		<area colour="piste_expert#606060" closed="true"/>
 		<icon src="sport/skiing.png"/>
@@ -1207,5 +1218,6 @@
 	<rule>
 		<condition k="piste:difficulty" v="freeride"/>
-		<line width="6" colour="piste_freeride#ffff00"/>
+		<line width="6" colour="piste_freeride#ffff00" priority="-100000"/>
+		<linemod width="6" mode="under" colour="piste_freeride#ffff00"/>
 		<area colour="piste_freeride#ffff00" closed="true"/>
 		<icon src="sport/skiing.png"/>
@@ -1214,5 +1226,6 @@
 	<rule>
 		<condition k="piste:difficulty" v="novice"/>
-		<line width="6" colour="piste_novice#00ff00"/>
+		<line width="6" colour="piste_novice#00ff00" priority="-100000"/>
+		<linemod width="6" mode="under" colour="piste_novice#00ff00"/>
 		<area colour="piste_novice#00ff00" closed="true"/>
 		<icon src="sport/skiing.png"/>