Index: trunk/styles/standard/elemstyles.xml
===================================================================
--- trunk/styles/standard/elemstyles.xml	(revision 710)
+++ trunk/styles/standard/elemstyles.xml	(revision 711)
@@ -16,4 +16,175 @@
 
 <rules>
+<!--restrictions tags -->
+<!--the restrictions rules should be placed before the path rule! -->
+
+	<rule>
+		<condition k="access" v="no" />
+		<icon src="misc/no_icon.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="bicycle" v="no" />
+		<icon src="misc/no_icon.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+	<rule>
+		<condition k="bicycle" v="designated"/>
+		<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>
+	</rule>
+
+	<rule>
+		<condition k="foot" v="no" />
+		<icon src="misc/no_icon.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+	<rule>
+		<condition k="foot" v="designated"/>
+		<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>
+	</rule>
+
+	<rule>
+		<condition k="goods" v="no" />
+		<icon src="misc/no_icon.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="hgv" v="no" />
+		<icon src="misc/no_icon.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="horse" v="no" />
+		<icon src="misc/no_icon.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+	<rule>
+		<condition k="horse" v="designated"/>
+		<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>
+	</rule>
+
+	<rule>
+		<condition k="motorcycle" v="no" />
+		<icon src="vehicle/restrictions/motorbike.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="motorcar" v="no" />
+		<icon src="misc/no_icon.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="psv" v="no" />
+		<icon src="misc/no_icon.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="motorboat" v="no" />
+		<icon src="misc/no_icon.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="boat" v="no" />
+		<icon src="misc/no_icon.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="noexit" v="no" />
+		<icon src="misc/no_icon.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="maxweight" v="no" />
+		<icon src="misc/no_icon.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="maxheight" v="no" />
+		<icon src="misc/no_icon.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="maxwidth" v="no" />
+		<icon src="misc/no_icon.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="maxlength" v="no" />
+		<icon src="misc/no_icon.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="maxspeed" v="no" />
+		<icon src="misc/no_icon.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="minspeed" v="no" />
+		<icon src="misc/no_icon.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="maxstay" v="no" />
+		<icon src="misc/no_icon.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="toll" v="no" />
+		<icon src="misc/no_icon.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="barrier" v="bollard" />
+		<icon annotate="true" src="misc/proposed.png" />
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
 <!-- highway tags -->
 	<rule>
@@ -161,29 +332,8 @@
 	</rule>
 
-<!--the designation rules should be placed before the path rule! -->
-	<rule>
-		<condition k="horse" v="designated"/>
-		<line width="1" realwidth="2" colour="#c08000" />
-		<scale_min>1</scale_min>
-		<scale_max>30000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="bicycle" v="designated"/>
-		<line width="1" realwidth="2" colour="#ff00ff"/>
-		<scale_min>1</scale_min>
-		<scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="foot" v="designated"/>
-		<line width="1" realwidth="1" colour="#00ff00" />
-		<scale_min>1</scale_min>
-		<scale_max>10000</scale_max>
-	</rule>
-
 	<rule>
 		<condition k="highway" v="path"/>
 		<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>
@@ -1642,4 +1792,12 @@
 		<condition k="tourism" v="hostel" />
 		<icon annotate="true" src="accommodation/hostel.png" />
+		<area colour="#e1a0a2" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="tourism" v="chalet" />
+		<icon annotate="true" src="accommodation/chalet.png" />
 		<area colour="#e1a0a2" />
         <scale_min>1</scale_min>
@@ -2136,5 +2294,5 @@
 	<rule>
 		<condition k="route" v="bus"/>
-        <line width="1" colour="#809bc0"/>
+        <line width="1" colour="#809bc0" dashed="true"/>
 		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
@@ -2144,5 +2302,5 @@
 	<rule>
 		<condition k="route" v="ferry"/>
-        <line width="1" colour="#809bc0"/>
+        <line width="1" colour="#809bc0" dashed="true"/>
 		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
@@ -2152,5 +2310,5 @@
 	<rule>
 		<condition k="route" v="flight"/>
-        <line width="1" colour="#809bc0"/>
+        <line width="1" colour="#809bc0" dashed="true"/>
 		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
@@ -2160,5 +2318,5 @@
 	<rule>
 		<condition k="route" v="ncn"/>
-        <line width="1" colour="#809bc0"/>
+        <line width="1" colour="#809bc0" dashed="true"/>
 		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
@@ -2168,5 +2326,5 @@
 	<rule>
 		<condition k="route" v="subsea"/>
-        <line width="1" colour="#809bc0"/>
+        <line width="1" colour="#809bc0" dashed="true"/>
 		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
@@ -2176,5 +2334,5 @@
 	<rule>
 		<condition k="route" v="ski"/>
-        <line width="1" colour="#809bc0"/>
+        <line width="1" colour="#809bc0" dashed="true"/>
 		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
@@ -2184,5 +2342,5 @@
 	<rule>
 		<condition k="route" v="tour"/>
-        <line width="1" colour="#809bc0"/>
+        <line width="1" colour="#809bc0" dashed="true"/>
 		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
@@ -2192,5 +2350,5 @@
 	<rule>
 		<condition k="route" v="pub_crawl"/>
-        <line width="1" colour="#809bc0"/>
+        <line width="1" colour="#809bc0" dashed="true"/>
 		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
@@ -2202,5 +2360,5 @@
 	<rule>
 		<condition k="boundary" v="national"/>
-        <line width="1" colour="#3a5d8c"/>
+        <line width="1" colour="#8de3cb" dashed="true"/>
 		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
@@ -2210,5 +2368,5 @@
 	<rule>
 		<condition k="boundary" v="administrative"/>
-        <line width="1" colour="#3a5d8c"/>
+        <line width="1" colour="#8de3cb" dashed="true"/>
 		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
@@ -2218,5 +2376,5 @@
 	<rule>
 		<condition k="boundary" v="civil"/>
-        <line width="1" colour="#3a5d8c"/>
+        <line width="1" colour="#8de3cb" dashed="true"/>
 		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
@@ -2226,5 +2384,5 @@
 	<rule>
 		<condition k="boundary" v="political"/>
-        <line width="1" colour="#3a5d8c"/>
+        <line width="1" colour="#8de3cb" dashed="true"/>
 		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
@@ -2234,5 +2392,5 @@
 	<rule>
 		<condition k="boundary" v="national_park"/>
-        <line width="1" colour="#3a5d8c"/>
+        <line width="1" colour="#8de3cb" dashed="true"/>
 		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
@@ -2502,152 +2660,27 @@
 	</rule>
 
-<!--restrictions tags -->
-
-	<rule>
-		<condition k="access" v="no" />
-		<icon src="misc/no_icon.png" />
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="bicycle" v="no" />
-		<icon src="misc/no_icon.png" />
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="foot" v="no" />
-		<icon src="misc/no_icon.png" />
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="goods" v="no" />
-		<icon src="misc/no_icon.png" />
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="hgv" v="no" />
-		<icon src="misc/no_icon.png" />
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="horse" v="no" />
-		<icon src="misc/no_icon.png" />
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="motorcycle" v="no" />
-		<icon src="vehicle/restrictions/motorbike.png" />
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="motorcar" v="no" />
-		<icon src="misc/no_icon.png" />
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="psv" v="no" />
-		<icon src="misc/no_icon.png" />
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="motorboat" v="no" />
-		<icon src="misc/no_icon.png" />
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="boat" v="no" />
-		<icon src="misc/no_icon.png" />
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="noexit" v="no" />
-		<icon src="misc/no_icon.png" />
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="maxweight" v="no" />
-		<icon src="misc/no_icon.png" />
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="maxheight" v="no" />
-		<icon src="misc/no_icon.png" />
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="maxwidth" v="no" />
-		<icon src="misc/no_icon.png" />
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="maxlength" v="no" />
-		<icon src="misc/no_icon.png" />
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="maxspeed" v="no" />
-		<icon src="misc/no_icon.png" />
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="minspeed" v="no" />
-		<icon src="misc/no_icon.png" />
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="maxstay" v="no" />
-		<icon src="misc/no_icon.png" />
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="toll" v="no" />
-		<icon src="misc/no_icon.png" />
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="barrier" v="bollard" />
-		<icon annotate="true" src="misc/proposed.png" />
-		<scale_min>1</scale_min>
-		<scale_max>50000</scale_max>
-	</rule>
+	<rule>
+		<condition k="surface" v="paved"/>
+		<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>
+    </rule>
+
+	<rule>
+		<condition k="surface" v="cobblestone"/>
+		<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>
+    </rule>
+
+	<rule>
+		<condition k="surface" v="unpaved"/>
+		<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>
+    </rule>
 
 <!--name tags -->
@@ -3102,5 +3135,5 @@
 		<condition k="building" v="yes"/>
 		<icon annotate="true" src="misc/no_icon.png" />
-		<area colour="#bde3cb"/>
+		<area colour="#cb9999"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3109,5 +3142,33 @@
 		<condition k="building" v="true"/>
 		<icon annotate="true" src="misc/proposed.png" />
-		<area colour="#bde3cb"/>
+		<area colour="#cb9999"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+	<rule>
+		<condition k="building" v="church"/>
+		<icon annotate="true" src="misc/proposed.png" />
+		<area colour="#cb9999"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+	<rule>
+		<condition k="building" v="museum"/>
+		<icon annotate="true" src="misc/proposed.png" />
+		<area colour="#cb9999"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+	<rule>
+		<condition k="building" v="tower"/>
+		<icon annotate="true" src="misc/proposed.png" />
+		<area colour="#cb9999"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+	<rule>
+		<condition k="building" v="station"/>
+		<icon annotate="true" src="misc/proposed.png" />
+		<area colour="#cb9999"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3179,13 +3240,4 @@
 	<rule>
 		<condition k="man_made" v="power_nuclear" />
-		<line width="2" realwidth="5" dashed="true" colour="#ff0000"/>
-		<icon annotate="true" src="misc/deprecated.png" />
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-
-	<!-- was never approved anyway, shop=laundry was approved instead -->
-	<rule>
-		<condition k="shop" v="laundromat" />
 		<line width="2" realwidth="5" dashed="true" colour="#ff0000"/>
 		<icon annotate="true" src="misc/deprecated.png" />
Index: trunk/styles/standard/overview.xsl
===================================================================
--- trunk/styles/standard/overview.xsl	(revision 710)
+++ trunk/styles/standard/overview.xsl	(revision 711)
@@ -209,5 +209,5 @@
 
 		<xsl:choose>
-			<xsl:when test="$ypos &lt; 44">
+			<xsl:when test="$ypos &lt; 43">
 				<!-- recursive call - increasing index and output counters -->
 			    <xsl:call-template name="posed_rules">
@@ -305,5 +305,5 @@
 		<xsl:with-param name="key" select="'tracktype'"/>
 		<xsl:with-param name="column" select="2"/>
-		<xsl:with-param name="row" select="10"/>
+		<xsl:with-param name="row" select="8"/>
     </xsl:call-template>
     <xsl:call-template name="topic">
@@ -337,4 +337,9 @@
 		<xsl:with-param name="row" select="28"/>
     </xsl:call-template>
+	<xsl:call-template name="topic">
+		<xsl:with-param name="key" select="'barrier'"/>
+		<xsl:with-param name="column" select="2"/>
+		<xsl:with-param name="row" select="30"/>
+    </xsl:call-template>
     <xsl:call-template name="topic">
 		<xsl:with-param name="key" select="'route'"/>
@@ -399,57 +404,47 @@
     </xsl:call-template>
 	<xsl:call-template name="topic">
-		<xsl:with-param name="key" select="'oneway'"/>
+		<xsl:with-param name="key" select="'noexit'"/>
 		<xsl:with-param name="column" select="3"/>
 		<xsl:with-param name="row" select="23"/>
     </xsl:call-template>
 	<xsl:call-template name="topic">
-		<xsl:with-param name="key" select="'noexit'"/>
-		<xsl:with-param name="column" select="3"/>
-		<xsl:with-param name="row" select="25"/>
-    </xsl:call-template>
-	<xsl:call-template name="topic">
 		<xsl:with-param name="key" select="'maxweight'"/>
 		<xsl:with-param name="column" select="3"/>
+		<xsl:with-param name="row" select="25"/>
+    </xsl:call-template>
+	<xsl:call-template name="topic">
+		<xsl:with-param name="key" select="'maxheight'"/>
+		<xsl:with-param name="column" select="3"/>
 		<xsl:with-param name="row" select="27"/>
     </xsl:call-template>
 	<xsl:call-template name="topic">
-		<xsl:with-param name="key" select="'maxheight'"/>
+		<xsl:with-param name="key" select="'maxwidth'"/>
 		<xsl:with-param name="column" select="3"/>
 		<xsl:with-param name="row" select="29"/>
     </xsl:call-template>
 	<xsl:call-template name="topic">
-		<xsl:with-param name="key" select="'maxwidth'"/>
+		<xsl:with-param name="key" select="'maxlength'"/>
 		<xsl:with-param name="column" select="3"/>
 		<xsl:with-param name="row" select="31"/>
     </xsl:call-template>
 	<xsl:call-template name="topic">
-		<xsl:with-param name="key" select="'maxlength'"/>
+		<xsl:with-param name="key" select="'maxspeed'"/>
 		<xsl:with-param name="column" select="3"/>
 		<xsl:with-param name="row" select="33"/>
     </xsl:call-template>
 	<xsl:call-template name="topic">
-		<xsl:with-param name="key" select="'maxspeed'"/>
+		<xsl:with-param name="key" select="'minspeed'"/>
 		<xsl:with-param name="column" select="3"/>
 		<xsl:with-param name="row" select="35"/>
     </xsl:call-template>
 	<xsl:call-template name="topic">
-		<xsl:with-param name="key" select="'minspeed'"/>
+		<xsl:with-param name="key" select="'maxstay'"/>
 		<xsl:with-param name="column" select="3"/>
 		<xsl:with-param name="row" select="37"/>
     </xsl:call-template>
 	<xsl:call-template name="topic">
-		<xsl:with-param name="key" select="'maxstay'"/>
+		<xsl:with-param name="key" select="'toll'"/>
 		<xsl:with-param name="column" select="3"/>
 		<xsl:with-param name="row" select="39"/>
-    </xsl:call-template>
-	<xsl:call-template name="topic">
-		<xsl:with-param name="key" select="'toll'"/>
-		<xsl:with-param name="column" select="3"/>
-		<xsl:with-param name="row" select="41"/>
-    </xsl:call-template>
-	<xsl:call-template name="topic">
-		<xsl:with-param name="key" select="'barrier'"/>
-		<xsl:with-param name="column" select="3"/>
-		<xsl:with-param name="row" select="43"/>
     </xsl:call-template>
 		
@@ -462,10 +457,10 @@
 		<xsl:with-param name="key" select="'service'"/>
 		<xsl:with-param name="column" select="4"/>
-		<xsl:with-param name="row" select="20"/>
+		<xsl:with-param name="row" select="21"/>
     </xsl:call-template>
     <xsl:call-template name="topic">
 		<xsl:with-param name="key" select="'waterway'"/>
 		<xsl:with-param name="column" select="4"/>
-		<xsl:with-param name="row" select="25"/>
+		<xsl:with-param name="row" select="26"/>
     </xsl:call-template>