From 93fd7f6f9dcc1cf7a0beff696653d3aa01fd0ffd Mon Sep 17 00:00:00 2001
From: sonora <hm.gglmail@googlemail.com>
Date: Fri, 10 Aug 2012 10:17:39 +0200
Subject: [PATCH 1/6] fix typo

---
 OsmAnd/res/values/colors.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/res/values/colors.xml b/OsmAnd/res/values/colors.xml
index b34115b70a..1b2a62b0e3 100644
--- a/OsmAnd/res/values/colors.xml
+++ b/OsmAnd/res/values/colors.xml
@@ -16,7 +16,7 @@
 	<!-- LAYER and SPECIAL PURPOSE consistency colors -->
 
 	<color name="gpx_track">#B4A00AD7</color>
-	<!-- try magenta instead of cyan color name="gpx_track_fluorescent">#B400FFFF</color>
+	<!-- try magenta instead of cyan color name="gpx_track_fluorescent">#B400FFFF</color -->
 	<color name="gpx_track_fluorescent">#B4FF00FF</color>
 	<color name="pos_heading">#320000FF</color>
 	<color name="pos_area">#280000FF</color>

From 1cc155dba90673c19eacc563e9bbdafd5d9439d6 Mon Sep 17 00:00:00 2001
From: sonora <hm.gglmail@googlemail.com>
Date: Fri, 10 Aug 2012 10:28:03 +0200
Subject: [PATCH 2/6] fix order of viRendered statements

---
 .../src/net/osmand/render/default.render.xml  | 40 ++++++++++---------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/DataExtractionOSM/src/net/osmand/render/default.render.xml b/DataExtractionOSM/src/net/osmand/render/default.render.xml
index 700616285c..6651d06eb3 100644
--- a/DataExtractionOSM/src/net/osmand/render/default.render.xml
+++ b/DataExtractionOSM/src/net/osmand/render/default.render.xml
@@ -1009,19 +1009,21 @@
 	<line>
 		<filter minzoom="1" tag="natural" value="coastline_broken" color="#111111" strokeWidth="1"/>
 		<group>
-				<filter hmRendered="true" tag="highway" value="motorway" maxzoom="13" color="#809bff"/>
 				<filter viRendered="true" tag="highway" value="motorway" maxzoom="13" color="#6666CC"/>
+				<!-- PALE-SCHEME filter hmRendered="true" tag="highway" value="motorway" maxzoom="13" color="#809bff"/ -->
+				<filter hmRendered="true" tag="highway" value="motorway" maxzoom="13" color="#809bff"/>
 			<filter tag="highway" value="motorway" maxzoom="13" color="#a58dff"/>
-				<filter hmRendered="true" tag="highway" value="motorway_link" maxzoom="13" color="#809bff"/>
 				<filter viRendered="true" tag="highway" value="motorway_link" maxzoom="13" color="#6666CC"/>
+				<!-- PALE-SCHEME filter hmRendered="true" tag="highway" value="motorway_link" maxzoom="13" color="#809bff"/ -->
+				<filter hmRendered="true" tag="highway" value="motorway_link" maxzoom="13" color="#809bff"/>
 			<filter tag="highway" value="motorway_link" maxzoom="13" color="#a58dff"/>
+				<filter viRendered="true" tag="highway" value="trunk" maxzoom="13" color="#A02067"/>
 				<!-- PALE-SCHEME filter hmRendered="true" tag="highway" value="trunk" maxzoom="13" color="#df1346"/ -->
 				<filter hmRendered="true" tag="highway" value="trunk" maxzoom="13" color="#ed154b"/>
-				<filter viRendered="true" tag="highway" value="trunk" maxzoom="13" color="#A02067"/>
 			<filter tag="highway" value="trunk" maxzoom="13" color="#ffaf80"/>
+				<filter viRendered="true" tag="highway" value="trunk_link" maxzoom="13" color="#A02067"/>
 				<!-- PALE-SCHEME filter hmRendered="true" tag="highway" value="trunk_link" maxzoom="13" color="#df1346"/ -->
 				<filter hmRendered="true" tag="highway" value="trunk_link" maxzoom="13" color="#ed154b"/>
-				<filter viRendered="true" tag="highway" value="trunk_link" maxzoom="13" color="#A02067"/>
 			<filter tag="highway" value="trunk_link" maxzoom="13" color="#ffaf80"/>
 			<groupFilter cap="ROUND">
 				<filter minzoom="5" maxzoom="9" strokeWidth="5"/>
@@ -1033,13 +1035,13 @@
 		</group>
 
 		<group>
+				<filter viRendered="true" tag="highway" value="primary" maxzoom="13" color="#C04D61"/>
 				<!-- PALE-SCHEME filter hmRendered="true" tag="highway" value="primary" maxzoom="13" color="#eb989a"/ -->
 				<filter hmRendered="true" tag="highway" value="primary" maxzoom="13" color="#ed5a7f"/>
-				<filter viRendered="true" tag="highway" value="primary" maxzoom="13" color="#C04D61"/>
 			<filter tag="highway" value="primary" maxzoom="13" color="#eb989a"/>
+				<filter viRendered="true" tag="highway" value="primary_link" maxzoom="13" color="#C04D61"/>
 				<!-- PALE-SCHEME filter hmRendered="true" tag="highway" value="primary_link" maxzoom="13" color="#eb989a"/ -->
 				<filter hmRendered="true" tag="highway" value="primary_link" maxzoom="13" color="#ed5a7f"/>
-				<filter viRendered="true" tag="highway" value="primary_link" maxzoom="13" color="#C04D61"/>
 			<filter tag="highway" value="primary_link" maxzoom="13" color="#eb989a"/>
 			<groupFilter cap="ROUND">
 				<filter minzoom="7" maxzoom="9" strokeWidth="4"/>
@@ -1051,13 +1053,13 @@
 		</group>
 
 		<group>
+				<filter viRendered="true" tag="highway" value="secondary" maxzoom="13" color="#F7D131"/>
 				<!-- PALE-SCHEME filter hmRendered="true" tag="highway" value="secondary" maxzoom="13" color="##fdd6a4"/ -->
 				<filter hmRendered="true" tag="highway" value="secondary" maxzoom="13" color="#ffd080"/>
-				<filter viRendered="true" tag="highway" value="secondary" maxzoom="13" color="#F7D131"/>
 			<filter tag="highway" value="secondary" maxzoom="13" color="#fdd6a4"/>
+				<filter viRendered="true" tag="highway" value="secondary_link" maxzoom="13" color="#F7D131"/>
 				<!-- PALE-SCHEME filter hmRendered="true" tag="highway" value="secondary_link" maxzoom="13" color="#fdd6a4"/ -->
 				<filter hmRendered="true" tag="highway" value="secondary_link" maxzoom="13" color="#ffd080"/>
-				<filter viRendered="true" tag="highway" value="secondary_link" maxzoom="13" color="#F7D131"/>
 			<filter tag="highway" value="secondary_link" maxzoom="13" color="#fdd6a4"/>
 			<groupFilter shadowRadius="1" cap="ROUND">
 				<filter minzoom="9" maxzoom="9" strokeWidth="3"/>
@@ -1069,35 +1071,37 @@
 		</group>
 
 		<group>
-				<filter hmRendered="true" tag="highway" value="motorway" color="#809bff"/>
 				<filter viRendered="true" tag="highway" value="motorway" color="#6666CC"/>
+				<!-- PALE-SCHEME filter hmRendered="true" tag="highway" value="motorway" color="#809bff"/ -->
+				<filter hmRendered="true" tag="highway" value="motorway" color="#809bff"/>
 			<filter tag="highway" value="motorway" color="#a58dff"/>
-				<filter hmRendered="true" tag="highway" value="motorway_link" color="#809bff"/>
 				<filter viRendered="true" tag="highway" value="motorway_link" color="#6666CC"/>
+				<!-- PALE-SCHEME filter hmRendered="true" tag="highway" value="motorway_link" color="#809bff"/ -->
+				<filter hmRendered="true" tag="highway" value="motorway_link" color="#809bff"/>
 			<filter tag="highway" value="motorway_link" color="#a58dff"/>
+				<filter viRendered="true" tag="highway" value="trunk" color="#A02067"/>
 				<!-- PALE-SCHEME filter hmRendered="true" tag="highway" value="trunk" color="#df1346"/ -->
 				<filter hmRendered="true" tag="highway" value="trunk" color="#ed154b"/>
-				<filter viRendered="true" tag="highway" value="trunk" color="#A02067"/>
 			<filter tag="highway" value="trunk" color="#ffaf80"/>
+				<filter viRendered="true" tag="highway" value="trunk_link" color="#A02067"/>
 				<!-- PALE-SCHEME filter hmRendered="true" tag="highway" value="trunk_link" color="#df1346"/ -->
 				<filter hmRendered="true" tag="highway" value="trunk_link" color="#ed154b"/>
-				<filter viRendered="true" tag="highway" value="trunk_link" color="#A02067"/>
 			<filter tag="highway" value="trunk_link" color="#ffaf80"/>
+				<filter viRendered="true" tag="highway" value="primary" color="#C04D61"/>
 				<!-- PALE-SCHEME filter hmRendered="true" tag="highway" value="primary" color="#eb989a"/ -->
 				<filter hmRendered="true" tag="highway" value="primary" color="#ed5a7f"/>
-				<filter viRendered="true" tag="highway" value="primary" color="#C04D61"/>
 			<filter tag="highway" value="primary" color="#eb989a"/>
+				<filter viRendered="true" tag="highway" value="primary_link" color="#C04D61"/>
 				<!-- PALE-SCHEME filter hmRendered="true" tag="highway" value="primary_link" color="#eb989a"/ -->
 				<filter hmRendered="true" tag="highway" value="primary_link" color="#ed5a7f"/>
-				<filter viRendered="true" tag="highway" value="primary_link" color="#C04D61"/>
 			<filter tag="highway" value="primary_link" color="#eb989a"/>
+				<filter viRendered="true" tag="highway" value="secondary" color="#F7D131"/>
 				<!-- PALE-SCHEME filter hmRendered="true" tag="highway" value="secondary" color="#fdd6a4"/ -->
 				<filter hmRendered="true" tag="highway" value="secondary" color="#ffd080"/>
-				<filter viRendered="true" tag="highway" value="secondary" color="#F7D131"/>
 			<filter tag="highway" value="secondary" color="#fdd6a4"/>
+				<filter viRendered="true" tag="highway" value="secondary_link" color="#F7D131"/>
 				<!-- PALE-SCHEME filter hmRendered="true" tag="highway" value="secondary_link" color="#fdd6a4"/ -->
 				<filter hmRendered="true" tag="highway" value="secondary_link" color="#ffd080"/>
-				<filter viRendered="true" tag="highway" value="secondary_link" color="#F7D131"/>
 			<filter tag="highway" value="secondary_link" color="#fdd6a4"/>
 				
 			<groupFilter shadowRadius="1" cap="ROUND">
@@ -1122,13 +1126,13 @@
 		</group>
 
 		<group>
+				<filter viRendered="true" tag="tertiary" value="trunk_link" color="#F0CE30"/>
 				<!-- PALE-SCHEME filter hmRendered="true" tag="tertiary" value="trunk_link" color="#fefeb3"/ -->
 				<filter hmRendered="true" tag="tertiary" value="trunk_link" color="#fefe83"/>
-				<filter viRendered="true" tag="tertiary" value="trunk_link" color="#F0CE30"/>
 			<filter tag="highway" value="tertiary" color="#fefeb3"/>
+				<filter viRendered="true" tag="tertiary_link" value="trunk_link" color="#F0CE30"/>
 				<!-- PALE-SCHEME filter hmRendered="true" tag="tertiary_link" value="trunk_link" color="#fefeb3"/ -->
 				<filter hmRendered="true" tag="tertiary_link" value="trunk_link" color="#fefe83"/>
-				<filter viRendered="true" tag="tertiary_link" value="trunk_link" color="#F0CE30"/>
 			<filter tag="highway" value="tertiary_link" color="#fefeb3"/>
 			<groupFilter  shadowRadius="1" cap="ROUND">
 				<filter minzoom="10" maxzoom="10" strokeWidth="3"/>

From d30c5e4b47024c99852cce14c794ed9605391c42 Mon Sep 17 00:00:00 2001
From: sonora <hm.gglmail@googlemail.com>
Date: Fri, 10 Aug 2012 11:46:14 +0200
Subject: [PATCH 3/6] fix broken tertiary highway tags

---
 .../src/net/osmand/render/default.render.xml         | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/DataExtractionOSM/src/net/osmand/render/default.render.xml b/DataExtractionOSM/src/net/osmand/render/default.render.xml
index 6651d06eb3..573c0dba9c 100644
--- a/DataExtractionOSM/src/net/osmand/render/default.render.xml
+++ b/DataExtractionOSM/src/net/osmand/render/default.render.xml
@@ -1126,13 +1126,13 @@
 		</group>
 
 		<group>
-				<filter viRendered="true" tag="tertiary" value="trunk_link" color="#F0CE30"/>
-				<!-- PALE-SCHEME filter hmRendered="true" tag="tertiary" value="trunk_link" color="#fefeb3"/ -->
-				<filter hmRendered="true" tag="tertiary" value="trunk_link" color="#fefe83"/>
+				<filter viRendered="true" tag="highway" value="tertiary" color="#F0CE30"/>
+				<!-- PALE-SCHEME filter hmRendered="true" tag="highway" value="tertiary" color="#fefeb3"/ -->
+				<filter hmRendered="true" tag="highway" value="tertiary" color="#fefe83"/>
 			<filter tag="highway" value="tertiary" color="#fefeb3"/>
-				<filter viRendered="true" tag="tertiary_link" value="trunk_link" color="#F0CE30"/>
-				<!-- PALE-SCHEME filter hmRendered="true" tag="tertiary_link" value="trunk_link" color="#fefeb3"/ -->
-				<filter hmRendered="true" tag="tertiary_link" value="trunk_link" color="#fefe83"/>
+				<filter viRendered="true" tag="highway" value="tertiary_link" color="#F0CE30"/>
+				<!-- PALE-SCHEME filter hmRendered="true" tag="highway" value="tertiary_link" color="#fefeb3"/ -->
+				<filter hmRendered="true" tag="highway" value="tertiary_link" color="#fefe83"/>
 			<filter tag="highway" value="tertiary_link" color="#fefeb3"/>
 			<groupFilter  shadowRadius="1" cap="ROUND">
 				<filter minzoom="10" maxzoom="10" strokeWidth="3"/>

From 8f045cddc75e9fb6580497c362ce0e43b91f21f3 Mon Sep 17 00:00:00 2001
From: sonora <hm.gglmail@googlemail.com>
Date: Fri, 10 Aug 2012 12:52:41 +0200
Subject: [PATCH 4/6] Slightly fix axis approach for hmRendered-colors (v2h):
 Brightness=100, Saturation=50.

---
 .../src/net/osmand/render/default.render.xml       | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/DataExtractionOSM/src/net/osmand/render/default.render.xml b/DataExtractionOSM/src/net/osmand/render/default.render.xml
index 573c0dba9c..6b1554000d 100644
--- a/DataExtractionOSM/src/net/osmand/render/default.render.xml
+++ b/DataExtractionOSM/src/net/osmand/render/default.render.xml
@@ -1037,11 +1037,11 @@
 		<group>
 				<filter viRendered="true" tag="highway" value="primary" maxzoom="13" color="#C04D61"/>
 				<!-- PALE-SCHEME filter hmRendered="true" tag="highway" value="primary" maxzoom="13" color="#eb989a"/ -->
-				<filter hmRendered="true" tag="highway" value="primary" maxzoom="13" color="#ed5a7f"/>
+				<filter hmRendered="true" tag="highway" value="primary" maxzoom="13" color="#ff80a0"/>
 			<filter tag="highway" value="primary" maxzoom="13" color="#eb989a"/>
 				<filter viRendered="true" tag="highway" value="primary_link" maxzoom="13" color="#C04D61"/>
 				<!-- PALE-SCHEME filter hmRendered="true" tag="highway" value="primary_link" maxzoom="13" color="#eb989a"/ -->
-				<filter hmRendered="true" tag="highway" value="primary_link" maxzoom="13" color="#ed5a7f"/>
+				<filter hmRendered="true" tag="highway" value="primary_link" maxzoom="13" color="#ff80a0"/>
 			<filter tag="highway" value="primary_link" maxzoom="13" color="#eb989a"/>
 			<groupFilter cap="ROUND">
 				<filter minzoom="7" maxzoom="9" strokeWidth="4"/>
@@ -1054,7 +1054,7 @@
 
 		<group>
 				<filter viRendered="true" tag="highway" value="secondary" maxzoom="13" color="#F7D131"/>
-				<!-- PALE-SCHEME filter hmRendered="true" tag="highway" value="secondary" maxzoom="13" color="##fdd6a4"/ -->
+				<!-- PALE-SCHEME filter hmRendered="true" tag="highway" value="secondary" maxzoom="13" color="#fdd6a4"/ -->
 				<filter hmRendered="true" tag="highway" value="secondary" maxzoom="13" color="#ffd080"/>
 			<filter tag="highway" value="secondary" maxzoom="13" color="#fdd6a4"/>
 				<filter viRendered="true" tag="highway" value="secondary_link" maxzoom="13" color="#F7D131"/>
@@ -1089,11 +1089,11 @@
 			<filter tag="highway" value="trunk_link" color="#ffaf80"/>
 				<filter viRendered="true" tag="highway" value="primary" color="#C04D61"/>
 				<!-- PALE-SCHEME filter hmRendered="true" tag="highway" value="primary" color="#eb989a"/ -->
-				<filter hmRendered="true" tag="highway" value="primary" color="#ed5a7f"/>
+				<filter hmRendered="true" tag="highway" value="primary" color="#ff80a0"/>
 			<filter tag="highway" value="primary" color="#eb989a"/>
 				<filter viRendered="true" tag="highway" value="primary_link" color="#C04D61"/>
 				<!-- PALE-SCHEME filter hmRendered="true" tag="highway" value="primary_link" color="#eb989a"/ -->
-				<filter hmRendered="true" tag="highway" value="primary_link" color="#ed5a7f"/>
+				<filter hmRendered="true" tag="highway" value="primary_link" color="#ff80a0"/>
 			<filter tag="highway" value="primary_link" color="#eb989a"/>
 				<filter viRendered="true" tag="highway" value="secondary" color="#F7D131"/>
 				<!-- PALE-SCHEME filter hmRendered="true" tag="highway" value="secondary" color="#fdd6a4"/ -->
@@ -1128,11 +1128,11 @@
 		<group>
 				<filter viRendered="true" tag="highway" value="tertiary" color="#F0CE30"/>
 				<!-- PALE-SCHEME filter hmRendered="true" tag="highway" value="tertiary" color="#fefeb3"/ -->
-				<filter hmRendered="true" tag="highway" value="tertiary" color="#fefe83"/>
+				<filter hmRendered="true" tag="highway" value="tertiary" color="#fefe7f"/>
 			<filter tag="highway" value="tertiary" color="#fefeb3"/>
 				<filter viRendered="true" tag="highway" value="tertiary_link" color="#F0CE30"/>
 				<!-- PALE-SCHEME filter hmRendered="true" tag="highway" value="tertiary_link" color="#fefeb3"/ -->
-				<filter hmRendered="true" tag="highway" value="tertiary_link" color="#fefe83"/>
+				<filter hmRendered="true" tag="highway" value="tertiary_link" color="#fefe7f"/>
 			<filter tag="highway" value="tertiary_link" color="#fefeb3"/>
 			<groupFilter  shadowRadius="1" cap="ROUND">
 				<filter minzoom="10" maxzoom="10" strokeWidth="3"/>

From 70df18e3c28b0291d9bc5a449cd19fe8c851b446 Mon Sep 17 00:00:00 2001
From: sonora <hm.gglmail@googlemail.com>
Date: Fri, 10 Aug 2012 13:12:23 +0200
Subject: [PATCH 5/6] small bit correction yellow

---
 DataExtractionOSM/src/net/osmand/render/default.render.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/DataExtractionOSM/src/net/osmand/render/default.render.xml b/DataExtractionOSM/src/net/osmand/render/default.render.xml
index 6b1554000d..948b4d3cfa 100644
--- a/DataExtractionOSM/src/net/osmand/render/default.render.xml
+++ b/DataExtractionOSM/src/net/osmand/render/default.render.xml
@@ -1128,11 +1128,11 @@
 		<group>
 				<filter viRendered="true" tag="highway" value="tertiary" color="#F0CE30"/>
 				<!-- PALE-SCHEME filter hmRendered="true" tag="highway" value="tertiary" color="#fefeb3"/ -->
-				<filter hmRendered="true" tag="highway" value="tertiary" color="#fefe7f"/>
+				<filter hmRendered="true" tag="highway" value="tertiary" color="#ffff80"/>
 			<filter tag="highway" value="tertiary" color="#fefeb3"/>
 				<filter viRendered="true" tag="highway" value="tertiary_link" color="#F0CE30"/>
 				<!-- PALE-SCHEME filter hmRendered="true" tag="highway" value="tertiary_link" color="#fefeb3"/ -->
-				<filter hmRendered="true" tag="highway" value="tertiary_link" color="#fefe7f"/>
+				<filter hmRendered="true" tag="highway" value="tertiary_link" color="#ffff80"/>
 			<filter tag="highway" value="tertiary_link" color="#fefeb3"/>
 			<groupFilter  shadowRadius="1" cap="ROUND">
 				<filter minzoom="10" maxzoom="10" strokeWidth="3"/>

From 8057ba92c2fc7297c95dd76650e9b3733bcb033f Mon Sep 17 00:00:00 2001
From: sonora <hm.gglmail@googlemail.com>
Date: Fri, 10 Aug 2012 13:27:51 +0200
Subject: [PATCH 6/6] amend comment

---
 .../src/net/osmand/render/default.render.xml           | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/DataExtractionOSM/src/net/osmand/render/default.render.xml b/DataExtractionOSM/src/net/osmand/render/default.render.xml
index 948b4d3cfa..e69c4dc110 100644
--- a/DataExtractionOSM/src/net/osmand/render/default.render.xml
+++ b/DataExtractionOSM/src/net/osmand/render/default.render.xml
@@ -37,11 +37,11 @@
 	</renderingAttribute>
 
 	<!--
-		All-Purpose Renderer (by Hardy Mueller), v023:
-		- with ShowMoreMapDetails some roads already rendered at lower zooms (travel/orienteering)
-		- with ShowMoreMapDetails motorways shown blue and trunk roads red, aligned with conventional road atlas
-		  (road color scheme intensified on 2012-08-10. Old values commented with PALE-SCHEME)
-		- with ShowMoreMapDetails map rendering is aligned to typical map use for all zoom levels (scales), to always give a complete and reliable map.
+		All-Purpose Renderer (with attr="hmRendered" name="Show more map detail") (by Hardy Mueller), v023:
+		- some roads already rendered at lower zooms (travel/orienteering)
+		- motorways shown blue and trunk roads red to assimilate primaries, aligned with conventional road atlas
+		  (road color scheme intensified and unfied to Brightness=100, Saturation=50 on 2012-08-10. Old values commented with PALE-SCHEME)
+		- map rendering is aligned to typical map use for all zoom levels (scales), to always give a complete and reliable map.
 		Typical zoom level use (zX) and alignment of features displayed:
 		 - z7  = "Rough Region Level Overview": Shows motorways, trunks, primary roads and city names
 		 - z11 = "Country Road Atlas": Secondary roads (already from z9) and tertiary (already from z10). Show large scale landuse like forest and residential areas (already from z10). Also all town names (already from z9) and now all other locality names. Shows mountain peaks for orientation.