From 32829aed2f9772c7f6e465de8c6195ace81a2c0f Mon Sep 17 00:00:00 2001
From: sonora <hm.gglmail@googlemail.com>
Date: Thu, 20 Oct 2011 22:42:18 +0200
Subject: [PATCH] Re-instate exactly old render functionality as starting point
 for AXES (1)

---
 .../net/osmand/render/new_default.render.xml  | 71 +++++++------------
 OsmAnd/res/values/strings.xml                 |  2 +-
 2 files changed, 28 insertions(+), 45 deletions(-)

diff --git a/DataExtractionOSM/src/net/osmand/render/new_default.render.xml b/DataExtractionOSM/src/net/osmand/render/new_default.render.xml
index b793330450..6a9bbf026d 100644
--- a/DataExtractionOSM/src/net/osmand/render/new_default.render.xml
+++ b/DataExtractionOSM/src/net/osmand/render/new_default.render.xml
@@ -79,10 +79,9 @@
 			<filter tag="natural" value="coastline" order="1" />
 			<filter tag="natural" value="" order="1" />
 		</group>
-		
 
 		<group orderType="2">
-			<!-- Below see level -->
+			<!-- Below sea level -->
 			<filter tag="admin_level" value="0" order="0" />
 			<filter tag="admin_level" value="1" order="0" />
 			<filter tag="railway" value="" layer="-1" order="58" />
@@ -92,7 +91,7 @@
 			<filter tag="aerialway" value="" order="68" />
 			<filter tag="power" value="" order="68" />
 			<filter tag="administrative" value="" order="62" />
-			<filter tag="waterway"  value="" order="18" />
+			<filter tag="waterway" value="" order="18" />
 
 			<filter tag="highway" value="motorway" order="57" shadowLevel="1"/>
 			<filter tag="highway" value="trunk" order="56" shadowLevel="1"/>
@@ -128,7 +127,6 @@
 			<filter tag="highway" value="footway" order="37" />
 			<filter tag="highway" value="steps" order="36" />
 			<filter tag="highway" value="bridleway" order="35" />
-			
 		</group>
 		
 		<filter tag="" value="" order="128" orderType="1"/>
@@ -139,7 +137,6 @@
 		<filter tag="" value="" layer="-1" order="10" orderType="2"/>
 		<filter tag="" value="" layer="1" order="67" orderType="2"/>
 		<filter tag="" value="" order="11" orderType="2"/>
-		
 	</order>
 
 
@@ -242,7 +239,6 @@
 			</groupFilter>
 		</group>
 
-		
 		<group>
 			<filter tag="highway" value="track" textOrder="9"/>
 			<filter tag="highway" value="path" textOrder="9"/>
@@ -272,7 +268,6 @@
 	
 		<filter minzoom="14" textSize="12" textHaloRadius="1" textColor="#6699cc" textWrapWidth="20" tag="natural" value="beach" textOrder="10"/>
 		
-			
 		<group>
 			<filter minzoom="15" textSize="12" textDy="7" textWrapWidth="20" tag="natural" value="cave_entrance" textOrder="15"/>
 			<filter minzoom="12" maxzoom="14" textSize="12" textHaloRadius="1" textDy="7" tag="natural" value="peak" textOrder="10"/>
@@ -305,7 +300,7 @@
 		<filter minzoom="14" maxzoom="14" textSize="12" textBold="true" textColor="#6666ff" textDy="7" tag="railway" value="station" />
 		<filter minzoom="15" textSize="13" textHaloRadius="1" textBold="true" textColor="#6666ff" textDy="7" tag="railway" value="station" />
 		<filter minzoom="14" maxzoom="14" textSize="12" textColor="#6666ff" textDy="7" tag="railway" value="halt" />
-		<filter minzoom="15" textSize="12" textHaloRadius="1"  textColor="#6666ff" textDy="7" tag="railway" value="halt" />
+		<filter minzoom="15" textSize="12" textHaloRadius="1" textColor="#6666ff" textDy="7" tag="railway" value="halt" />
 		<filter minzoom="14" maxzoom="14" textSize="12" textColor="#6666ff" textDy="7" tag="railway" value="tram_stop" />
 		<filter minzoom="15" textSize="12" textHaloRadius="1" textColor="#6666ff" textDy="7" tag="railway" value="tram_stop" />
 
@@ -466,7 +461,6 @@
 
 	<!-- PRIORITY Input to filter : tag, value, zoom [minzoom, maxzoom] -->
 	<point>
-		
 		<filter minzoom="13" icon="highway_ford" tag="highway" value="ford" />
 		<filter minzoom="15" icon="mini_roundabout" tag="highway" value="mini_roundabout" />
 		<filter minzoom="15" icon="helipad" tag="aeroway" value="helipad" />
@@ -691,16 +685,14 @@
 			</groupFilter>
 		</group>
 
-			
 		<filter minzoom="14" tag="aeroway" value="terminal" color="#cc99ff">
 			<filter nightMode="true" color="#560000"/>
 		</filter>
 		
 		<filter minzoom="13" tag="aeroway" value="apron" color="#e9d1ff">
-			<filter  nightMode="true" color="#B0B0B0"/>
+			<filter nightMode="true" color="#B0B0B0"/>
 		</filter>
 
-        
 		<group>
 			<filter minzoom="13" tag="power" value="station" />
 			<filter minzoom="13" tag="power" value="sub_station" />
@@ -753,8 +745,6 @@
 			<filter nightMode="true" color="#560000"/>
 		</filter>		
 		
-			
-
 		<!-- leisure -->
 		<group>
 			<filter minzoom="13" tag="leisure" value="stadium" />
@@ -773,9 +763,9 @@
 
 		<!-- ZM 10 -->
 		<CssParameter name="stroke">#6c3</CssParameter>
-	  <CssParameter name="stroke-width">1</CssParameter>
+		<CssParameter name="stroke-width">1</CssParameter>
 		<filter minzoom="9" shader="nr2" color="#abdf96" tag="leisure" value="nature_reserve" 
-		   strokeWidth_2="1" color_2="#66cc33">
+			strokeWidth_2="1" color_2="#66cc33">
 			<filter nightMode="true" shader="" color="#000034" />
 		</filter>
 
@@ -793,7 +783,6 @@
 			<filter minzoom="12" color="#cfeca8" tag="leisure" value="common" />
 			<groupFilter nightMode="true" color="#004333" />
 		</group>
-		
 
 		<!-- amenity -->
 		<group>
@@ -806,15 +795,13 @@
 					
 			<groupFilter nightMode="true" color="#66004B" />
 		</group>
-		
 
 		<group>
 			<filter minzoom="16" color="#bca9a9" tag="amenity" value="library" />
 			<filter minzoom="15" color="#f0f0d8" color_2="#d4a89e" strokeWidth_2="1" tag="amenity" value="hospital" />
 			<filter minzoom="15" color="#cc9999" tag="amenity" value="cinema" />								
 			<groupFilter nightMode="true" color="#66004B" />
-		</group>		
-
+		</group>
 
 		<!-- tourism -->
 		<filter minzoom="13" color="#f2caea" tag="tourism" value="attraction">
@@ -839,7 +826,6 @@
 		<filter minzoom="13" color="#a0ccff99" tag="tourism" value="picnic_site" >
 			<filter nightMode="true" color="#a0004333"/>
 		</filter>
-		
 
 		<!-- military -->
 		<filter minzoom="12" color="#ff8f8f" tag="military" value="barracks">
@@ -862,12 +848,11 @@
 		<filter minzoom="13" shader="forest" color="#8dc56c" tag="landuse" value="forest">
 			<filter nightMode="true" color="#000034" shader=""/>
 		</filter>
-		
-			
+
 		<group tag="landuse" value="garages">
 			<filter minzoom="12" hmRendered="true" color="#dfd1d6" />
 			<filter minzoom="14" color="#dfd1d6" />
-			<groupFilter nightMode="true" color="#560000"  />
+			<groupFilter nightMode="true" color="#560000" />
 		</group>
 		
 		<group>
@@ -922,24 +907,25 @@
 		<filter minzoom="15" color="#cfeca8" color_2="#ff0000" strokeWidth_2="1" tag="landuse" value="retail">
 			<filter minzoom="15" nightMode="true" color="#66004B" color_2="#ff0000" strokeWidth_2="1" tag="landuse" value="retail" />
 		</filter>
-		
-		
+
 		<filter tag="landuse" value="wood">
 			<filter hmRendered="true">
 				<filter minzoom="10" color="#aed1a0" />
 			</filter>
 			<filter minzoom="9" color="#aed1a0" />
-			<groupFilter  nightMode="true" color="#000034"/>
+			<groupFilter nightMode="true" color="#000034"/>
 		</filter>
-			
 	</polygon>
 
 	<line>
-	    
 		<group>
+			<filter tag="highway" hmRendered="true" value="motorway" maxzoom="13" color="#809bff" />
 			<filter tag="highway" value="motorway" maxzoom="13" color="#a58dff" />
+			<filter tag="highway" hmRendered="true" value="motorway_link" maxzoom="13" color="#809bff" />
 			<filter tag="highway" value="motorway_link" maxzoom="13" color="#a58dff" />
+			<filter tag="highway" hmRendered="true" value="trunk" maxzoom="13" color="#df1346" />
 			<filter tag="highway" value="trunk" maxzoom="13" color="#ffaf80" />
+			<filter tag="highway" hmRendered="true" value="trunk_link" maxzoom="13" color="#df1346" />
 			<filter tag="highway" value="trunk_link" maxzoom="13" color="#ffaf80" />
 			<groupFilter>
 				<filter minzoom="5" maxzoom="9" strokeWidth="5" />
@@ -975,9 +961,13 @@
 		</group>
 
 		<group>
-			<filter tag="highway" value="motorway" color="#a58dff" color_2="#a58dff"  />
+			<filter tag="highway" hmRendered="true" value="motorway" color="#809bff" color_2="#809bff" />
+			<filter tag="highway" value="motorway" color="#a58dff" color_2="#a58dff" />
+			<filter tag="highway" hmRendered="true" value="motorway_link" color="#809bff" color_2="#809bff" />
 			<filter tag="highway" value="motorway_link" color="#a58dff" color_2="#a58dff" />
+			<filter tag="highway" hmRendered="true" value="trunk" color="#df1346" color_2="#df1346" />
 			<filter tag="highway" value="trunk" color="#ffaf80" color_2="#ffaf80" />
+			<filter tag="highway" hmRendered="true" value="trunk_link" color="#df1346" color_2="#df1346" />
 			<filter tag="highway" value="trunk_link" color="#ffaf80" color_2="#ffaf80" />
 			<filter tag="highway" value="primary" color="#eb989a" color_2="#eb989a" />
 			<filter tag="highway" value="primary_link" color="#eb989a" color_2="#eb989a" />
@@ -1024,7 +1014,7 @@
 					<filter minzoom="14" maxzoom="14" strokeWidth="6" />
 					<filter minzoom="15" maxzoom="15" strokeWidth="8" />
 					<filter minzoom="16" maxzoom="16" strokeWidth="10" />
-					<!-- radius 0 to avoid showing many black lines, but removed again due to bad visibility on some backgrounds  -->
+					<!-- radius 0 to avoid showing many black lines, but removed again due to bad visibility on some backgrounds -->
 					<filter minzoom="17" maxzoom="17" strokeWidth="13" />
 					<filter minzoom="18" strokeWidth="18" />
 					<groupFilter layer="-1" pathEffect="4_4"/>
@@ -1053,7 +1043,7 @@
 					<filter minzoom="14" maxzoom="14" strokeWidth="6" />
 					<filter minzoom="15" maxzoom="15" strokeWidth="8" />
 					<filter minzoom="16" maxzoom="16" strokeWidth="10" />
-					<!-- radius 0 to avoid showing many black lines, but removed again due to bad visibility on some backgrounds  -->
+					<!-- radius 0 to avoid showing many black lines, but removed again due to bad visibility on some backgrounds -->
 					<filter minzoom="17" maxzoom="17" strokeWidth="13" />
 					<filter minzoom="18" strokeWidth="18" />
 					<groupFilter layer="-1" pathEffect="4_4"/>
@@ -1109,7 +1099,7 @@
 
 		<filter pathEffect="6_3" tag="highway" value="path" color="#000000">
 			<filter appMode="pedestrian" minzoom="14" color="#000000" strokeWidth="2" pathEffect="10_3" />
-			<filter minzoom="12" maxzoom="12" hmRendered="true" strokeWidth="0.5"  />
+			<filter minzoom="12" maxzoom="12" hmRendered="true" strokeWidth="0.5" />
 			<filter minzoom="13" strokeWidth="1"/> 
 			<groupFilter nightMode="true" color="#787878"/>
 		</filter>
@@ -1117,14 +1107,13 @@
 		<filter appMode="pedestrian" tag="highway" value="track" minzoom="14" color="#996600" strokeWidth="2" pathEffect="10_3" />
 		<filter minzoom="12" maxzoom="12" hmRendered="true" color="#996600" strokeWidth="0.5" pathEffect="4_3" tag="highway" value="track" />
 		<filter minzoom="13" color="#996600" strokeWidth="1" pathEffect="4_3" tag="highway" value="track" />
-		
 
-		<filter  tag="highway" value="footway">
+		<filter tag="highway" value="footway">
 			<filter layer="1" minzoom="15" color="#88ffffff" strokeWidth="4" color_2="#fa8073" strokeWidth_2="2" pathEffect_2="2_2" />
 			<filter appMode="pedestrian" minzoom="14" color="#fa8073" strokeWidth="2" pathEffect="10_3" />
 			<filter minzoom="12" maxzoom="12" hmRendered="true" color="#fa8073" strokeWidth="0.5" pathEffect="2_2" />
 			<filter minzoom="13" maxzoom="14" hmRendered="true" color="#fa8073" strokeWidth="1" pathEffect="2_2" />
-			<filter minzoom="15" color="#fa8073" strokeWidth="1" pathEffect="2_2"  />
+			<filter minzoom="15" color="#fa8073" strokeWidth="1" pathEffect="2_2" />
 		</filter>
 		
 		<filter tag="highway" value="steps">
@@ -1134,11 +1123,10 @@
 			<filter minzoom="15" color="#fa8073" strokeWidth="4" pathEffect="1_2"/>
 		</filter>
 		
-		
 		<filter tag="highway" value="bridleway">
 			<filter layer="1" minzoom="15" color="#88ffffff" strokeWidth="2" color_2="#00ff00" strokeWidth_2="2" pathEffect_2="2_2" />
 			<filter appMode="pedestrian" minzoom="14" color="#00ff00" strokeWidth="2" pathEffect="10_3" />
-			<filter minzoom="12" maxzoom="12"  hmRendered="true" color="#00ff00" strokeWidth="0.5" pathEffect="2_2" />
+			<filter minzoom="12" maxzoom="12" hmRendered="true" color="#00ff00" strokeWidth="0.5" pathEffect="2_2" />
 			<filter minzoom="13" color="#00ff00" strokeWidth="1" pathEffect="2_2" />
 		</filter>
 		
@@ -1151,8 +1139,6 @@
 
 		<filter minzoom="15" maxzoom="15" color="#99cccc" strokeWidth="6" color_2="#ffffff" strokeWidth_2="5" pathEffect_2="8_6" tag="highway" value="proposed" />
 		<filter minzoom="16" color="#99cccc" strokeWidth="8" color_2="#ffffff" strokeWidth_2="7" pathEffect_2="8_6" tag="highway" value="proposed" />
-		
-		
 
 		<!-- barrier -->
 		<filter minzoom="16" color="#000000" strokeWidth="1" tag="highway" value="gate" />
@@ -1194,7 +1180,7 @@
 			<group>
 				<filter tag="waterway" value="river" />
 				<filter tag="waterway" value="canal" />
-			    <groupFilter pathEffect_2="4_2" >
+				<groupFilter pathEffect_2="4_2" >
 					<filter minzoom="5" maxzoom="9" strokeWidth="1" />
 					<filter minzoom="10" maxzoom="12" strokeWidth="2" />
 					<filter layer="-1">
@@ -1268,17 +1254,14 @@
 
 		<filter layer="1" minzoom="13" color="#000000" strokeWidth="4.5" color_2="#888888" strokeWidth_2="2" pathEffect_2="4_2" tag="railway" value="construction" />
 		<filter minzoom="13" color="#888888" strokeWidth="2" pathEffect="4_2" tag="railway" value="construction" />
-		
 
 		<filter minzoom="15" color="#777777" strokeWidth="3" pathEffect="2_3" tag="railway" value="monorail" />
 
 		<filter layer="-1" minzoom="15" color="#666666" strokeWidth="5" pathEffect="5_3" color_2="#cccccc" strokeWidth_2="3" tag="railway" value="funicular" />
 		<filter minzoom="15" color="#666666" strokeWidth="2" tag="railway" value="funicular" />
-		
 
 		<filter minzoom="15" color="#888888" strokeWidth="3" tag="railway" value="platform" />
 
-
 		<!-- aeroway -->
 		<filter tag="aeroway" value="runway" color="#bbbbcc">
 			<filter layer="1" minzoom="13" maxzoom="13" color="#000000" strokeWidth="9" color_2="#bbbbcc" strokeWidth_2="7" cap_2="SQUARE" />
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 9fd2ff5366..4e16ad76bf 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <resources>
 	<string name="pref_vector_rendering">Vector renderer specific options</string>
-	<string name="pref_overlay">Overlay/underlay</string>
+	<string name="pref_overlay">Overlay / underlay</string>
 	<string name="pref_raster_map">Tile map settings</string>
 	<string name="pref_vector_map">Vector map settings</string>
 	<string name="delete_confirmation_title">About to delete</string>