From 83c3323e7b262a15b72c66bdb45e927032157d2d Mon Sep 17 00:00:00 2001
From: sonora <hm.gglmail@googlemail.com>
Date: Sun, 3 Jul 2011 11:51:56 -0700
Subject: [PATCH] Edited
 DataExtractionOSM/src/net/osmand/render/all-purpose.render.xml via GitHub

---
 .../net/osmand/render/all-purpose.render.xml  | 31 +++++++++++--------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/DataExtractionOSM/src/net/osmand/render/all-purpose.render.xml b/DataExtractionOSM/src/net/osmand/render/all-purpose.render.xml
index 6a76c16364..a073cc74d4 100644
--- a/DataExtractionOSM/src/net/osmand/render/all-purpose.render.xml
+++ b/DataExtractionOSM/src/net/osmand/render/all-purpose.render.xml
@@ -1,6 +1,6 @@
 <renderer name="all-purpose" depends="" defaultColor="#f1eee8" defaultNightColor="#003333">
 	<!--
-		All Purpose Renderer, essentially more details than default (by Hardy Mueller), v012:
+		All Purpose Renderer, essentially more details than default (by Hardy Mueller), v013-incomplete:
 		Map rendering aligned to typical map use for all zoom levels/scales, hence always yields a complete and reliable map.
 		All features displayed at each zoom level (zX) are those for its typical use:
 		 - z7  = "Rough Country Level Overview": Shows motorways, trunks, primary roads and city names
@@ -16,6 +16,7 @@
 	         Version History:
                   (please document all changes in detail, and reason for change. This should facility later reconciliation with other renderers) 
 	         - v012: This is the one Victor produced from v011, with combining day/night renderer. Some optical deviations from former v011 contained. This one synced with default on master 2011-07-03
+	         - v013: Fixed some bugs to re-instate functionality of v011: Move night view for cemetery,  vineyard, forest after shader. Fixed night view for field, orchard, quarry, marsh, mud, wetland, scrub.  Also brightened motorway and trunk highway colors again.
 	-->
 
 	<!--
@@ -619,10 +620,13 @@
 		  <filter minzoom="10" tag="natural" value="land" />
 		</switch>  
 		<filter minzoom="12" shader="marsh" tag="natural" value="marsh" />
+		       <filter nightMode="true" minzoom="12" color="#004333" tag="natural" value="marsh" />
 		<filter minzoom="12" shader="mud" tag="natural" value="mud" />
+		       <filter nightMode="true" minzoom="12" color="#004333" tag="natural" value="mud" />
 		<filter minzoom="12" shader="scrub" tag="natural" value="scrub" />
-
+		       <filter nightMode="true" minzoom="12" color="#004333" tag="natural" value="scrub" />
 		<filter minzoom="10" shader="marsh" tag="natural" value="wetland" />
+		       <filter nightMode="true" minzoom="10" color="#004333" tag="natural" value="wetland" />
 		<switch>
           <case nightMode="true" color="#000034"/>
 		  <case nightMode="false" color="#aed1a0"/>
@@ -718,8 +722,8 @@
 		<filter minzoom="12" color="#9d9d6c" tag="landuse" value="brownfield" />
 				<filter minzoom="12" nightMode="true" color="#004333" tag="landuse" value="brownfield" />
 		<filter minzoom="12" color="#aacbaf" tag="landuse" value="cemetery" />
-				<filter minzoom="12" nightMode="true" color="#004333" tag="landuse" value="cemetery" />
 		<filter minzoom="15" shader="grave_yard" tag="landuse" value="cemetery" />
+				<filter minzoom="12" nightMode="true" color="#004333" tag="landuse" value="cemetery" />
 		<filter minzoom="12" maxzoom="14" color="#aacbaf" tag="landuse" value="grave_yard" />
 				<filter minzoom="12" maxzoom="14" nightMode="true" color="#004333" tag="landuse" value="grave_yard" />
 		<filter minzoom="15" shader="grave_yard" tag="landuse" value="grave_yard" />
@@ -754,8 +758,7 @@
 		<filter minzoom="10" color="#a0ffa8a8" tag="landuse" value="military" />
 		        <filter minzoom="10" nightMode="true" color="#a0560000" tag="landuse" value="military" />
 		<filter minzoom="12" shader="orchard" tag="landuse" value="orchard" />
-		
-		<filter minzoom="12" color="#dfd1d6" tag="landuse" value="railway" />
+		       <filter nightMode="true" minzoom="12" color="#004333" tag="landuse" value="orchard" />			<filter minzoom="12" color="#dfd1d6" tag="landuse" value="railway" />
 		        <filter minzoom="12" nightMode="true" color="#66004B" tag="landuse" value="railway" />
 		<filter minzoom="12" color="#cfeca8" tag="landuse" value="recreation_ground" />
          		<filter minzoom="12" nightMode="true" color="#004333" tag="landuse" value="recreation_ground" />
@@ -776,11 +779,13 @@
         		<filter minzoom="15" nightMode="true" color="#66004B" color_2="#ff0000" strokeWidth_2="1" tag="landuse" value="retail" />
 		
 		<filter minzoom="12" shader="quarry2" tag="landuse" value="quarry" />
+		       <filter nightMode="true" minzoom="12" color="#004333" tag="landuse" value="quarry" />
 		<filter minzoom="12" maxzoom="12" color="#abdf96" tag="landuse" value="vineyard" />
 		        <filter minzoom="12" maxzoom="12" nightMode="true" color="#004333" tag="landuse" value="vineyard" />
 		<filter minzoom="13" shader="vineyard" tag="landuse" value="vineyard" />	
 		<filter minzoom="12" maxzoom="13" color="#30666600" tag="natural" value="field" />
 		<filter minzoom="14" color="#30666600" color_2="#60666600" strokeWidth_2="1" tag="natural" value="field" />
+		       <filter nightMode="true" minzoom="12" color="#004333" tag="natural" value="field" />
 		<filter minzoom="10" color="#aed1a0" tag="landuse" value="wood" />
   		        <filter minzoom="10" nightMode="true" color="#000034" tag="landuse" value="wood" />
 	</polygon>
@@ -788,10 +793,10 @@
 	<!-- Priority input : tag, value, layer, zoom -->
 	<line>
 		<switch>
-			<case tag="highway" value="motorway" color="#a58dff" />
-			<case tag="highway" value="motorway_link" color="#a58dff" />
-			<case tag="highway" value="trunk" color="#ffaf80" />
-			<case tag="highway" value="trunk_link" color="#ffaf80" />
+			<case tag="highway" value="motorway" color="#809BFF" />
+			<case tag="highway" value="motorway_link" color="#809BFF" />
+			<case tag="highway" value="trunk" color="#F72B5E" />
+			<case tag="highway" value="trunk_link" color="#F72B5E" />
 			<filter>
 				<filter minzoom="5" maxzoom="9" strokeWidth="5" />
 				<filter minzoom="10" maxzoom="10" strokeWidth="6" />
@@ -825,10 +830,10 @@
 		</switch>
 
 		<switch>
-			<case tag="highway" value="motorway" color="#a58dff" color_2="#a58dff" />
-			<case tag="highway" value="motorway_link" color="#a58dff" color_2="#a58dff" />
-			<case tag="highway" value="trunk" color="#ffaf80" color_2="#ffaf80" />
-			<case tag="highway" value="trunk_link" color="#ffaf80" color_2="#ffaf80" />
+			<case tag="highway" value="motorway" color="#809BFF" color_2="#809BFF" />
+			<case tag="highway" value="motorway_link" color="#809BFF" color_2="#809BFF" />
+			<case tag="highway" value="trunk" color="#F72B5E" color_2="#F72B5E" />
+			<case tag="highway" value="trunk_link" color="#F72B5E" color_2="#F72B5E" />
 			<case tag="highway" value="primary" color="#eb989a" color_2="#eb989a" />
 			<case tag="highway" value="primary_link" color="#eb989a" color_2="#eb989a" />
 			<case tag="highway" value="secondary" color="#fdd6a4" color_2="#fdd6a4" />