Index: /trunk/styles/standard/elemstyles.xml
===================================================================
--- /trunk/styles/standard/elemstyles.xml	(revision 6004)
+++ /trunk/styles/standard/elemstyles.xml	(revision 6005)
@@ -533,5 +533,5 @@
 	</rule>
 
-    <!-- display path with bicycle/foot=designated/official as if it was cycleway/footway -->
+	<!-- display path with bicycle/foot=designated/official as if it was cycleway/footway -->
 	<rule>
 		<condition k="highway" v="path"/>
@@ -614,8 +614,8 @@
 	</rule>
 
-    <rule>
-        <condition k="highway" v="give_way"/>
-        <icon annotate="true" src="vehicle/restriction/right_of_way.png"/>
-    </rule>
+	<rule>
+		<condition k="highway" v="give_way"/>
+		<icon annotate="true" src="vehicle/restriction/right_of_way.png"/>
+	</rule>
 
 	<rule>
@@ -694,5 +694,5 @@
 		<area colour="highway_platform#c0c0c0" closed="true"/>
 	</rule>
-    
+
 	<rule>
 		<condition k="highway" v="turning_circle"/>
@@ -1006,6 +1006,6 @@
 	</rule>
 
-    <!-- disused often appears together with highway=xy -->
-    <!-- -> normal display with line, linemod for combinations -->
+	<!-- disused often appears together with highway=xy -->
+	<!-- -> normal display with line, linemod for combinations -->
 	<rule>
 		<condition k="railway" v="disused"/>
@@ -1015,6 +1015,6 @@
 	</rule>
 
-    <!-- abandoned often appears together with highway=xy -->
-    <!-- -> normal display with line, linemod for combinations -->
+	<!-- abandoned often appears together with highway=xy -->
+	<!-- -> normal display with line, linemod for combinations -->
 	<rule>
 		<condition k="railway" v="abandoned"/>
@@ -1274,5 +1274,5 @@
 	</rule>
 
-        <rule>
+	<rule>
 		<condition k="power" v="transformer"/>
 		<icon annotate="true" src="misc/landmark/power/transformer.png"/>
@@ -1280,5 +1280,5 @@
 	</rule>
 
-    <!-- power_source is depricated by the wiki, but still in use -->
+	<!-- power_source is depricated by the wiki, but still in use -->
 	<rule>
 		<condition k="power_source" v="wind"/>
@@ -1323,5 +1323,5 @@
 	</rule>
 
-    <!-- generator:source replaces power_source -->
+	<!-- generator:source replaces power_source -->
 	<rule>
 		<condition k="generator:source" v="wind"/>
@@ -1734,4 +1734,17 @@
 
 	<rule>
+		<condition k="amenity" v="parking_space"/>
+		<icon annotate="true" src="vehicle/parking.png" priority="-500" />
+		<area colour="amenity_traffic#f7efb7"/>
+	</rule>
+
+	<rule>
+		<condition k="amenity" v="parking_space"/>
+		<condition k="wheelchair" b="yes"/>
+		<icon annotate="true" src="vehicle/parking/handicapped.png"/>
+		<area colour="amenity_traffic#f7efb7"/>
+	</rule>
+	
+	<rule>
 		<condition k="amenity" v="bicycle_rental"/>
 		<icon annotate="true" src="vehicle/rental/bicycle.png"/>
@@ -1790,11 +1803,11 @@
 	</rule>
 
-    <!-- Rule to delete by end of 2013 if this deprecated tag has finally been replaced by emergency=phone below-->
-    <rule>
-        <condition k="amenity" v="emergency_phone"/>
-        <icon annotate="true" src="vehicle/emergency_phone.png"/>
-        <area colour="amenity_light#f7efb7"/>
-    </rule>
-    
+	<!-- Rule to delete by end of 2013 if this deprecated tag has finally been replaced by emergency=phone below-->
+	<rule>
+		<condition k="amenity" v="emergency_phone"/>
+		<icon annotate="true" src="vehicle/emergency_phone.png"/>
+		<area colour="amenity_light#f7efb7"/>
+	</rule>
+
 	<rule>
 		<condition k="emergency" v="phone"/>
@@ -2004,10 +2017,10 @@
 	</rule>
 
-    <rule>
-        <condition k="amenity" v="clinic"/>
-        <area colour="health#eeeeee"/>
-        <icon annotate="true" src="health/hospital.png"/>
-    </rule>
-    
+	<rule>
+		<condition k="amenity" v="clinic"/>
+		<area colour="health#eeeeee"/>
+		<icon annotate="true" src="health/hospital.png"/>
+	</rule>
+
 	<rule>
 		<condition k="amenity" v="nursery"/>
@@ -2172,15 +2185,15 @@
 <!--office tags -->
 
-    <rule>
-        <condition k="office" v="company"/>
-        <icon annotate="true" src="icons/office_blue.png"/>
-        <area colour="office#de5696"/>
-    </rule>
-
-    <rule>
-        <condition k="office" v="government"/>
-        <icon annotate="true" src="icons/office_pink.png"/>
-        <area colour="office#de5696"/>
-    </rule>
+	<rule>
+		<condition k="office" v="company"/>
+		<icon annotate="true" src="icons/office_blue.png"/>
+		<area colour="office#de5696"/>
+	</rule>
+
+	<rule>
+		<condition k="office" v="government"/>
+		<icon annotate="true" src="icons/office_pink.png"/>
+		<area colour="office#de5696"/>
+	</rule>
 
 <!--shop tags -->
@@ -2391,5 +2404,5 @@
 
 	<rule>
-        <!-- superseeded by greengrocer -->
+		<!-- superseeded by greengrocer -->
 		<condition k="shop" v="groceries"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
@@ -2990,10 +3003,10 @@
 		<area colour="woodarea#008000"/>
 	</rule>
-    
-    <rule>
-        <condition k="natural" v="grassland"/>
-        <icon src="misc/no_icon.png"/>
-        <area colour="green#b1e0c2"/>
-    </rule>
+
+	<rule>
+		<condition k="natural" v="grassland"/>
+		<icon src="misc/no_icon.png"/>
+		<area colour="green#b1e0c2"/>
+	</rule>
 
 	<rule>
@@ -3691,37 +3704,37 @@
 	</rule>
 
-    <rule>
-        <condition k="building" v="entrance" />
-        <icon annotate="true" src="misc/entrance-yes.png" priority="100"/>
-    </rule>
-
-    <rule>
-        <condition k="entrance" v="yes" />
-        <icon annotate="true" src="misc/entrance-yes.png"/>
-    </rule>
-
-    <rule>
-        <condition k="entrance" v="main" />
-        <icon annotate="true" src="misc/entrance-main.png"/>
-    </rule>
-
-    <rule>
-        <condition k="entrance" v="service" />
-        <icon annotate="true" src="misc/entrance-service.png"/>
-    </rule>
-
-    <rule>
-        <condition k="entrance" v="exit" />
-        <icon annotate="true" src="misc/entrance-exit.png"/>
-    </rule>
-
-    <rule>
-        <condition k="entrance" v="emergency" />
-        <icon annotate="true" src="misc/entrance-emergency.png"/>
-    </rule>
-
-    <rule>
-        <condition k="area" b="yes"/>
-        <area colour="area#ffffff" priority="-10000"/>
+	<rule>
+		<condition k="building" v="entrance" />
+		<icon annotate="true" src="misc/entrance-yes.png" priority="100"/>
+	</rule>
+
+	<rule>
+		<condition k="entrance" v="yes" />
+		<icon annotate="true" src="misc/entrance-yes.png"/>
+	</rule>
+
+	<rule>
+		<condition k="entrance" v="main" />
+		<icon annotate="true" src="misc/entrance-main.png"/>
+	</rule>
+
+	<rule>
+		<condition k="entrance" v="service" />
+		<icon annotate="true" src="misc/entrance-service.png"/>
+	</rule>
+
+	<rule>
+		<condition k="entrance" v="exit" />
+		<icon annotate="true" src="misc/entrance-exit.png"/>
+	</rule>
+
+	<rule>
+		<condition k="entrance" v="emergency" />
+		<icon annotate="true" src="misc/entrance-emergency.png"/>
+	</rule>
+
+	<rule>
+		<condition k="area" b="yes"/>
+		<area colour="area#ffffff" priority="-10000"/>
 	</rule>
 
@@ -3754,11 +3767,11 @@
 		<condition k="addr:interpolation" v="alphabetic"/>
 		<line width="1" realwidth="1" dashed="1,1" colour="address#1C86EE"/>
-    </rule>
+	</rule>
 
 <!--"work in progress" tags -->
 
-    <rule> 
-        <condition k="fixme"/>
-        <icon annotate="true" src="misc/fixme.png" priority="10000"/>
+	<rule>
+		<condition k="fixme"/>
+		<icon annotate="true" src="misc/fixme.png" priority="10000"/>
 	</rule> 
 
@@ -3774,79 +3787,79 @@
 
 <!--public_transport tags --> 
-    <rule>
-        <condition k="public_transport" v="stop_position"/>
-        <condition k="train" v="yes"/>
-        <icon annotate="true" src="transport/railway_small.png" priority="10" />
-    </rule>
-
-    <rule>
-        <condition k="public_transport" v="stop_position"/>
-        <condition k="tram" v="yes"/>
-        <icon annotate="true" src="transport/tram.png"  priority="8" />
-    </rule>
-
-    <rule>
-        <condition k="public_transport" v="stop_position"/>
-        <condition k="ferry" v="yes"/>
-        <icon annotate="true" src="transport/ferry.png"  priority="7" />
-    </rule>
-
-    <rule>
-        <condition k="public_transport" v="stop_position"/>
-        <condition k="aerial" v="yes"/>
-        <icon annotate="true" src="transport/aerialway.png"  priority="6" />
-    </rule>
-
-    <rule>
-        <condition k="public_transport" v="stop_position"/>
-        <condition k="bus" v="yes"/>
-        <icon annotate="true" src="transport/bus_small.png"  priority="4" />
-    </rule>
-
-    <rule>
-        <condition k="public_transport" v="stop_position"/>
-        <icon annotate="true" src="transport/railway_small.png" priority="-10"/>
-    </rule>
-
-    <rule>
-        <condition k="public_transport" v="platform"/>
-        <condition k="train" v="yes"/>
-        <icon annotate="true" src="transport/railway_station.png"  priority="10" />
-        <line width="1" realwidth="1" colour="service#809bc0" dashed="9" dashedcolour="livingdashed#00ff00"/>
-    </rule>
-    
-    <rule>
-        <condition k="public_transport" v="platform"/>
-        <condition k="tram" v="yes"/>
-        <icon annotate="true" src="transport/railway_station.png"  priority="8" />
-        <line width="1" realwidth="1" colour="service#809bc0" dashed="9" dashedcolour="livingdashed#00ff00"/>
-    </rule>
-    
-    <rule>
-        <condition k="public_transport" v="platform"/>
-        <condition k="ferry" v="yes"/>
-        <icon annotate="true" src="transport/ferry.png"  priority="7" />
-        <line width="1" realwidth="1" colour="service#809bc0" dashed="9" dashedcolour="livingdashed#00ff00"/>
-    </rule>
-    
-    <rule>
-        <condition k="public_transport" v="platform"/>
-        <condition k="aerial" v="yes"/>
-        <icon annotate="true" src="transport/aerialway/station.png"  priority="6" />
-        <line width="1" realwidth="1" colour="service#809bc0" dashed="9" dashedcolour="livingdashed#00ff00"/>
-    </rule>
-    
-    <rule>
-        <condition k="public_transport" v="platform"/>
-        <condition k="bus" v="yes"/>
-        <icon annotate="true" src="transport/bus_small.png"  priority="4" />
-        <line width="1" realwidth="1" colour="service#809bc0" dashed="9" dashedcolour="livingdashed#00ff00"/>
-    </rule>
-
-    <rule>
-        <condition k="public_transport" v="platform"/>
-        <icon annotate="true" src="transport/bus_small.png" priority="-10"/>
-        <line width="1" realwidth="1" colour="service#809bc0" dashed="9" dashedcolour="livingdashed#00ff00"/>
-    </rule>
+	<rule>
+		<condition k="public_transport" v="stop_position"/>
+		<condition k="train" v="yes"/>
+		<icon annotate="true" src="transport/railway_small.png" priority="10" />
+	</rule>
+
+	<rule>
+		<condition k="public_transport" v="stop_position"/>
+		<condition k="tram" v="yes"/>
+		<icon annotate="true" src="transport/tram.png"  priority="8" />
+	</rule>
+
+	<rule>
+		<condition k="public_transport" v="stop_position"/>
+		<condition k="ferry" v="yes"/>
+		<icon annotate="true" src="transport/ferry.png"  priority="7" />
+	</rule>
+
+	<rule>
+		<condition k="public_transport" v="stop_position"/>
+		<condition k="aerial" v="yes"/>
+		<icon annotate="true" src="transport/aerialway.png"  priority="6" />
+	</rule>
+
+	<rule>
+		<condition k="public_transport" v="stop_position"/>
+		<condition k="bus" v="yes"/>
+		<icon annotate="true" src="transport/bus_small.png"  priority="4" />
+	</rule>
+
+	<rule>
+		<condition k="public_transport" v="stop_position"/>
+		<icon annotate="true" src="transport/railway_small.png" priority="-10"/>
+	</rule>
+
+	<rule>
+		<condition k="public_transport" v="platform"/>
+		<condition k="train" v="yes"/>
+		<icon annotate="true" src="transport/railway_station.png"  priority="10" />
+		<line width="1" realwidth="1" colour="service#809bc0" dashed="9" dashedcolour="livingdashed#00ff00"/>
+	</rule>
+
+	<rule>
+		<condition k="public_transport" v="platform"/>
+		<condition k="tram" v="yes"/>
+		<icon annotate="true" src="transport/railway_station.png"  priority="8" />
+		<line width="1" realwidth="1" colour="service#809bc0" dashed="9" dashedcolour="livingdashed#00ff00"/>
+	</rule>
+
+	<rule>
+		<condition k="public_transport" v="platform"/>
+		<condition k="ferry" v="yes"/>
+		<icon annotate="true" src="transport/ferry.png"  priority="7" />
+		<line width="1" realwidth="1" colour="service#809bc0" dashed="9" dashedcolour="livingdashed#00ff00"/>
+	</rule>
+
+	<rule>
+		<condition k="public_transport" v="platform"/>
+		<condition k="aerial" v="yes"/>
+		<icon annotate="true" src="transport/aerialway/station.png"  priority="6" />
+		<line width="1" realwidth="1" colour="service#809bc0" dashed="9" dashedcolour="livingdashed#00ff00"/>
+	</rule>
+
+	<rule>
+		<condition k="public_transport" v="platform"/>
+		<condition k="bus" v="yes"/>
+		<icon annotate="true" src="transport/bus_small.png"  priority="4" />
+		<line width="1" realwidth="1" colour="service#809bc0" dashed="9" dashedcolour="livingdashed#00ff00"/>
+	</rule>
+
+	<rule>
+		<condition k="public_transport" v="platform"/>
+		<icon annotate="true" src="transport/bus_small.png" priority="-10"/>
+		<line width="1" realwidth="1" colour="service#809bc0" dashed="9" dashedcolour="livingdashed#00ff00"/>
+	</rule>
 
 <!--"deprecated" tags -->