Index: trunk/styles/standard/elemstyles.xml
===================================================================
--- trunk/styles/standard/elemstyles.xml	(revision 706)
+++ trunk/styles/standard/elemstyles.xml	(revision 707)
@@ -20,4 +20,5 @@
 		<condition k="highway" v="motorway"/>
         <line width="3" realwidth="8" colour="#809bc0"  width_bg="5" colour_bg="#FFFF00"/>
+		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
         <scale_max>200000000</scale_max>
@@ -27,4 +28,5 @@
 		<condition k="highway" v="motorway_link"/>
         <line width="3" colour="#809bc0"/>
+		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -34,4 +36,5 @@
 		<condition k="highway" v="trunk"/>
 		<line width="3" colour="#7fc97f"/>
+		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
         <scale_max>20000</scale_max>
@@ -41,4 +44,5 @@
 		<condition k="highway" v="trunk_link"/>
         <line width="3" colour="#7fc97f"/>
+		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
         <scale_max>20000</scale_max>
@@ -48,4 +52,5 @@
 		<condition k="highway" v="primary"/>
 		<line width="3" realwidth="8" colour="#fb805f"/>
+		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
         <scale_max>700000</scale_max>
@@ -55,4 +60,5 @@
 		<condition k="highway" v="primary_link"/>
         <line width="3" colour="#fb805f"/>
+		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
         <scale_max>40000</scale_max>
@@ -62,4 +68,5 @@
 		<condition k="highway" v="secondary"/>
 		<line width="3" realwidth="6" colour="#fdbf6f"/>
+		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
         <scale_max>300000</scale_max>
@@ -69,4 +76,5 @@
         <condition k="highway" v="tertiary"/>
         <line width="2" realwidth="5" colour="#f7f496"/>
+		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
         <scale_max>30000</scale_max>
@@ -76,4 +84,5 @@
 		<condition k="highway" v="unclassified"/>
 		<line width="2" realwidth="5" colour="#c0c0c0"/>
+		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
         <scale_max>40000</scale_max>
@@ -83,4 +92,5 @@
 		<condition k="highway" v="road"/>
 		<line width="2" realwidth="5" dashed="true" colour="#ff4040"/>
+		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
         <scale_max>40000</scale_max>
@@ -90,4 +100,5 @@
 		<condition k="highway" v="unsurfaced"/>
 		<line width="1" realwidth="3" colour="#c0c0c0"/>
+		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
         <scale_max>40000</scale_max>
@@ -97,4 +108,5 @@
         <condition k="highway" v="track"/>
         <line width="1" realwidth="3" colour="#006600"/>
+		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
         <scale_max>20000</scale_max>
@@ -104,4 +116,5 @@
 		<condition k="highway" v="residential"/>
 		<line width="2" realwidth="5" colour="#c0c0c0"/> 
+		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
         <scale_max>40000</scale_max>
@@ -111,4 +124,5 @@
 		<condition k="highway" v="living_street"/>
 		<line width="1" realwidth="3" colour="#c0c0c0"/> 
+		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
         <scale_max>40000</scale_max>
@@ -118,4 +132,5 @@
         <condition k="highway" v="service"/>
         <line width="1" realwidth="3" colour="#809bc0"/>
+		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
         <scale_max>20000</scale_max>
@@ -125,4 +140,5 @@
 		<condition k="highway" v="bridleway"/>
 		<line width="1" realwidth="2" colour="#c08000" />
+		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
         <scale_max>30000</scale_max>
@@ -132,4 +148,5 @@
 		<condition k="highway" v="cycleway"/>
 		<line width="1" realwidth="2" colour="#ff00ff"/>
+		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -139,4 +156,5 @@
 		<condition k="highway" v="footway"/>
 		<line width="1" realwidth="1" colour="#00ff00" />
+		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
         <scale_max>10000</scale_max>
@@ -146,4 +164,5 @@
 		<condition k="highway" v="pedestrian"/>
 		<line width="3" realwidth="5" colour="#00ff00"/>
+		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
         <scale_max>10000</scale_max>
@@ -153,4 +172,5 @@
         <condition k="highway" v="steps"/>
         <line width="1" realwidth="1" colour="#00ff00"/>
+		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
         <scale_max>10000</scale_max>
@@ -160,4 +180,5 @@
         <condition k="highway" v="bus_guideway"/>
         <line width="1" realwidth="1" colour="#00ff00"/>
+		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
         <scale_max>10000</scale_max>
@@ -278,5 +299,6 @@
 	<rule>
 		<condition k="highway" v="construction" />
-		<line width="3" realwidth="5" colour="#00ff00"/>		
+		<line width="3" realwidth="5" colour="#FFFF00"/>
+		<icon src="misc/construction.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -297,4 +319,5 @@
 		<condition k="cycleway" v="lane"/>
 		<line width="1" realwidth="2" colour="#ff00ff"/>
+		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -304,4 +327,5 @@
 		<condition k="cycleway" v="track"/>
 		<line width="1" realwidth="2" colour="#ff00ff"/>
+		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -311,4 +335,5 @@
 		<condition k="cycleway" v="opposite_lane"/>
 		<line width="1" realwidth="2" colour="#ff00ff"/>
+		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -318,4 +343,5 @@
 		<condition k="cycleway" v="opposite_track"/>
 		<line width="1" realwidth="2" colour="#ff00ff"/>
+		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -325,4 +351,5 @@
 		<condition k="cycleway" v="opposite"/>
 		<line width="1" realwidth="2" colour="#ff00ff"/>
+		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -331,9 +358,43 @@
 <!-- tracktype tags -->
 
-	<!-- grade1 tag -->
-	<!-- grade2 tag -->
-	<!-- grade3 tag -->
-	<!-- grade4 tag -->
-	<!-- grade5 tag -->
+	<rule>
+		<condition k="tracktype" v="grade1"/>
+        <line width="1" realwidth="3" dashed="true" colour="#006600"/>
+		<icon annotate="true" src="misc/no_icon.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+	
+	<rule>
+		<condition k="tracktype" v="grade2"/>
+        <line width="1" realwidth="3" dashed="true" colour="#006600"/>
+		<icon annotate="true" src="misc/no_icon.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+	
+	<rule>
+		<condition k="tracktype" v="grade3"/>
+        <line width="1" realwidth="3" dashed="true" colour="#006600"/>
+		<icon annotate="true" src="misc/no_icon.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+	
+	<rule>
+		<condition k="tracktype" v="grade4"/>
+        <line width="1" realwidth="3" dashed="true" colour="#006600"/>
+		<icon annotate="true" src="misc/no_icon.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+	
+	<rule>
+		<condition k="tracktype" v="grade5"/>
+        <line width="1" realwidth="3" dashed="true" colour="#006600"/>
+		<icon annotate="true" src="misc/no_icon.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
 
 <!--waterway tags -->
@@ -341,4 +402,5 @@
 		<condition k="waterway" v="river"/>
         <line width="2" realwidth="10" colour="#0000ff" width_bg="3" colour_bg="#00001f"/>
+		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -348,4 +410,5 @@
 		<condition k="waterway" v="riverbank"/>
         <line width="1" colour="#00005f" width_bg="1" colour_bg="#00001f"/>
+	<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -355,4 +418,5 @@
 		<condition k="waterway" v="canal"/>
         <line width="2" colour="#0000ff" width_bg="2" colour_bg="#00001f"/>
+		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -362,4 +426,5 @@
         <condition k="waterway" v="stream"/>
         <line width="1" colour="#6600cc" />
+		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -369,4 +434,5 @@
         <condition k="waterway" v="drain"/>
         <line width="1" colour="#0000ff"/>
+		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -376,4 +442,5 @@
         <condition k="waterway" v="dock"/>
         <line width="1" colour="#0000cf"/>
+		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -492,4 +559,5 @@
 		<condition k="railway" v="rail"/>
 		<line width="2" colour="#808080" dashed="true"/>
+		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -499,4 +567,5 @@
         <condition k="railway" v="tram"/>
         <line width="1" colour="#606060" dashed="true"/>
+		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -506,4 +575,5 @@
         <condition k="railway" v="light_rail"/>
         <line width="2" colour="#808080" dashed="true"/>
+		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -513,4 +583,5 @@
         <condition k="railway" v="subway"/>
         <line width="1" colour="#303030" dashed="true"/>
+		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -527,4 +598,5 @@
         <condition k="railway" v="preserved"/>
         <line width="1" colour="#202020" dashed="true"/>
+		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -534,4 +606,5 @@
         <condition k="railway" v="disused"/>
         <line width="1" colour="#202020" dashed="true"/>
+		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -541,4 +614,5 @@
         <condition k="railway" v="abandoned"/>
         <line width="1" colour="#202020" dashed="true"/>
+		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -548,4 +622,5 @@
         <condition k="railway" v="narrow_gauge"/>
         <line width="1" colour="#202020" dashed="true"/>
+		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -555,4 +630,5 @@
         <condition k="railway" v="monorail"/>
         <line width="1" colour="#202020" dashed="true"/>
+		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -567,4 +643,24 @@
     </rule>
     
+	<rule>
+		<condition k="service" v="yard" />
+		<icon annotate="true" src="misc/proposed.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="service" v="siding" />
+		<icon annotate="true" src="misc/proposed.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="service" v="spur" />
+		<icon annotate="true" src="misc/proposed.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
 <!--aeroway tags -->
 
@@ -593,4 +689,5 @@
         <condition k="aeroway" v="runway"/>
         <line width="3" colour="#330000" />
+		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -600,4 +697,5 @@
         <condition k="aeroway" v="taxiway"/>
         <line width="2" colour="#660000" />
+		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -607,4 +705,5 @@
         <condition k="aeroway" v="apron"/>
         <area colour="#D8D8D8" />
+		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -615,4 +714,5 @@
         <condition k="aerialway" v="cable_car"/>
 		<line width="2" colour="#707070" dashed="true"/>
+		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -622,4 +722,5 @@
         <condition k="aerialway" v="chair_lift"/>
 		<line width="2" colour="#707070" dashed="true"/>
+		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -629,4 +730,5 @@
         <condition k="aerialway" v="drag_lift"/>
 		<line width="2" colour="#707070" dashed="true"/>
+		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -636,4 +738,5 @@
 		<condition k="aerialway" v="gondola"/>
 		<line width="2" colour="#707070" dashed="true"/>
+		<icon annotate="true" src="misc/no_icon.png" />
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -645,4 +748,5 @@
 		<condition k="piste:difficulty" v="easy"/>
 		<line width="6" colour="#0000FF"/>
+		<icon annotate="true" src="misc/no_icon.png" />
 		<scale_min>1</scale_min>
 		<scale_max>30000</scale_max>
@@ -652,4 +756,5 @@
 		<condition k="piste:difficulty" v="intermediate"/>
 		<line width="6" colour="#FF0000"/>
+		<icon annotate="true" src="misc/no_icon.png" />
 		<scale_min>1</scale_min>
 		<scale_max>30000</scale_max>
@@ -659,4 +764,5 @@
 		<condition k="piste:difficulty" v="advanced"/>
 		<line width="6" colour="#606060"/>
+		<icon annotate="true" src="misc/no_icon.png" />
 		<scale_min>1</scale_min>
 		<scale_max>30000</scale_max>
@@ -666,4 +772,5 @@
 		<condition k="piste:difficulty" v="freeride"/>
 		<line width="6" colour="#FFFF00"/>
+		<icon annotate="true" src="misc/no_icon.png" />
 		<scale_min>1</scale_min>
 		<scale_max>30000</scale_max>
@@ -673,4 +780,5 @@
 		<condition k="piste:difficulty" v="novice"/>
 		<line width="6" colour="#00FF00"/>
+		<icon annotate="true" src="misc/no_icon.png" />
 		<scale_min>1</scale_min>
 		<scale_max>300000</scale_max>
@@ -689,4 +797,5 @@
 		<condition k="power" v="line" />
         <line width="1" colour="#eeeeee" />
+		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -826,4 +935,5 @@
 		<condition k="man_made" v="pipeline" />
         <line width="2" colour="#660000" />
+		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1936,4 +2046,5 @@
 		<condition k="route" v="bus"/>
         <line width="1" colour="#809bc0"/>
+		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1943,4 +2054,5 @@
 		<condition k="route" v="ferry"/>
         <line width="1" colour="#809bc0"/>
+		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1950,4 +2062,5 @@
 		<condition k="route" v="flight"/>
         <line width="1" colour="#809bc0"/>
+		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1957,4 +2070,5 @@
 		<condition k="route" v="ncn"/>
         <line width="1" colour="#809bc0"/>
+		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1964,4 +2078,5 @@
 		<condition k="route" v="subsea"/>
         <line width="1" colour="#809bc0"/>
+		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1971,4 +2086,5 @@
 		<condition k="route" v="ski"/>
         <line width="1" colour="#809bc0"/>
+		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1978,4 +2094,5 @@
 		<condition k="route" v="tour"/>
         <line width="1" colour="#809bc0"/>
+		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1985,4 +2102,5 @@
 		<condition k="route" v="pub_crawl"/>
         <line width="1" colour="#809bc0"/>
+		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1994,4 +2112,5 @@
 		<condition k="boundary" v="national"/>
         <line width="1" colour="#3a5d8c"/>
+		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -2001,4 +2120,5 @@
 		<condition k="boundary" v="administrative"/>
         <line width="1" colour="#3a5d8c"/>
+		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -2008,4 +2128,5 @@
 		<condition k="boundary" v="civil"/>
         <line width="1" colour="#3a5d8c"/>
+		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -2015,4 +2136,5 @@
 		<condition k="boundary" v="political"/>
         <line width="1" colour="#3a5d8c"/>
+		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -2022,4 +2144,5 @@
 		<condition k="boundary" v="national_park"/>
         <line width="1" colour="#3a5d8c"/>
+		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -2806,4 +2929,5 @@
        <condition k="highway" v="minor"/>
        <line width="2" realwidth="5" dashed="true" colour="#ff0000"/>
+       <icon annotate="true" src="misc/deprecated.png" />
        <scale_min>1</scale_min>
        <scale_max>40000</scale_max>