From d7c8fbf1f3bb11ae5e05792171cedb8002ddb0a6 Mon Sep 17 00:00:00 2001
From: sonora <hm.gglmail@googlemail.com>
Date: Fri, 15 Jul 2011 09:57:03 -0700
Subject: [PATCH] =?UTF-8?q?Fixed=20textHaloRadius:=20Do=20not=20use=20at?=
 =?UTF-8?q?=20zoom=20levels=20used=20for=20driving=20or=20routing,=20obstr?=
 =?UTF-8?q?ucts=20important=20map=20details.=20Used=20now=20for=20all=20le?=
 =?UTF-8?q?isure=20and=20building=20tags=20(which=20most=C3=B6y=20appear?=
 =?UTF-8?q?=20from=20z15=20or=20higher).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/net/osmand/render/default.render.xml  | 561 +++++++++++++-----
 1 file changed, 410 insertions(+), 151 deletions(-)

diff --git a/DataExtractionOSM/src/net/osmand/render/default.render.xml b/DataExtractionOSM/src/net/osmand/render/default.render.xml
index 7311707142..2f1658ff0e 100644
--- a/DataExtractionOSM/src/net/osmand/render/default.render.xml
+++ b/DataExtractionOSM/src/net/osmand/render/default.render.xml
@@ -231,73 +231,148 @@
 			</switch>
 		</switch>
 
-		<filter minzoom="15" textSize="14" textBold="true" textWrapWidth="12" textMinDistance="20" tag="highway" value="motorway_junction"/>
+		<filter minzoom="15" textSize="14" textBold="true" textWrapWidth="12" textMinDistance="20" 
+
+tag="highway" value="motorway_junction"/>
 		
 		<!-- Natural -->
-		<filter minzoom="15" textSize="12" textColor="#09dd09" textHaloRadius="1" textWrapWidth="15" tag="natural" value="park" />
+		<filter minzoom="15" textSize="12" textColor="#09dd09" textWrapWidth="15" tag="natural" 
 
-		<filter minzoom="14" textSize="12" textColor="#6699cc" textHaloRadius="1" textWrapWidth="20" tag="natural" value="beach" />
+value="park" />
+	
+		<filter minzoom="14" textSize="12" textColor="#6699cc" textWrapWidth="20" tag="natural" 
 
+value="beach" />
+		
 		<switch>
 			<case nightMode="true" textColor="#CC3300"/>
 			<case nightMode="false" textColor="#654321"/>
 			<filter>
-				<filter minzoom="15" textSize="12" textHaloRadius="1" textDy="13" textWrapWidth="20" tag="natural" value="cave_entrance" />
-				<filter minzoom="12" maxzoom="14" textSize="12" textHaloRadius="1" textDy="13" tag="natural" value="peak" />
-				<filter minzoom="15" maxzoom="16" textSize="13" textHaloRadius="1" textDy="14" tag="natural" value="peak" />
-				<filter minzoom="17" textSize="16" textHaloRadius="1" textDy="17" tag="natural" value="peak" />
+				<filter minzoom="15" textSize="12" textDy="13" textWrapWidth="20" tag="natural" 
+
+value="cave_entrance" />
+				<filter minzoom="12" maxzoom="14" textSize="12" textHaloRadius="0.5" 
+
+textDy="13" tag="natural" value="peak" />
+				<filter minzoom="15" maxzoom="16" textSize="13" textHaloRadius="0.5" 
+
+textDy="14" tag="natural" value="peak" />
+				<filter minzoom="17" textSize="16" textHaloRadius="0.5" textDy="17" 
+
+tag="natural" value="peak" />
 			</filter>
 		</switch>
 
-		<filter minzoom="15" textSize="12" textColor="#6699cc" textHaloRadius="1" textDy="13" textWrapWidth="20" tag="natural" value="spring" />
-		<filter minzoom="6" textSize="12" textColor="#6699cc" textHaloRadius="1" textWrapWidth="20" tag="natural" value="water" />
-		<filter minzoom="6" textSize="12" textColor="#6699cc" textHaloRadius="1" textWrapWidth="20" tag="natural" value="lake" />
-		<filter minzoom="13" textSize="12" textColor="#ff000000" textHaloRadius="2" textWrapWidth="10" tag="natural" value="wood" />
+		<filter minzoom="15" textSize="12" textColor="#6699cc" textDy="13" textWrapWidth="20" 
 
-	<!-- ZM 13 -->
-		<filter minzoom="14" textSize="12" textColor="#6699cc" textHaloRadius="1" textOnPath="true" tag="waterway" value="stream" />
-		<filter minzoom="11" textSize="12" textColor="#6699cc" textHaloRadius="1" textOnPath="true" textMinDistance="70" tag="waterway" value="river" />
-		<filter minzoom="13" textSize="12" textColor="#6699cc" textHaloRadius="1" textOnPath="true" textMinDistance="70" tag="waterway" value="canal" />
-		<filter minzoom="15" textSize="12" textColor="#6699cc" textHaloRadius="1" textOnPath="true" tag="waterway" value="ditch" />
-		<filter minzoom="15" textSize="12" textColor="#6699cc" textHaloRadius="1" textOnPath="true" tag="waterway" value="drain" />
-		<filter minzoom="15" textSize="12" textColor="#0066ff" textHaloRadius="1" textDy="13" textWrapWidth="70" tag="waterway" value="lock_gate" />
-		<filter minzoom="15" textSize="12" textColor="#0066ff" textHaloRadius="1" textDy="13" textWrapWidth="70" tag="waterway" value="lock" />
-		<filter minzoom="15" textSize="12" textHaloRadius="1" tag="waterway" value="dam" />
+tag="natural" value="spring" />
+		<filter minzoom="6" textSize="12" textColor="#6699cc" textWrapWidth="20" tag="natural" 
+
+value="water" />
+		<filter minzoom="6" textSize="12" textColor="#6699cc" textWrapWidth="20" tag="natural" 
+
+value="lake" />
+		<filter minzoom="13" textSize="12" textColor="#ff000000" textWrapWidth="10" tag="natural" 
+
+value="wood" />
+
+		<filter minzoom="13" textSize="12" textColor="#6699cc" textOnPath="true" tag="waterway" 
+
+value="stream" />
+		<filter minzoom="11" textSize="12" textColor="#6699cc" textOnPath="true" textMinDistance="70" 
+
+tag="waterway" value="river" />
+		<filter minzoom="13" textSize="12" textColor="#6699cc" textOnPath="true" textMinDistance="70" 
+
+tag="waterway" value="canal" />
+		<filter minzoom="15" textSize="12" textColor="#6699cc" textOnPath="true" tag="waterway" 
+
+value="ditch" />
+		<filter minzoom="15" textSize="12" textColor="#6699cc" textOnPath="true" tag="waterway" 
+
+value="drain" />
+		<filter minzoom="15" textSize="12" textColor="#0066ff" textDy="13" textWrapWidth="70" 
+
+tag="waterway" value="lock_gate" />
+		<filter minzoom="15" textSize="12" textColor="#0066ff" textDy="13" textWrapWidth="70" 
+
+tag="waterway" value="lock" />
+		<filter minzoom="15" textSize="12" tag="waterway" value="dam" />
 
 		<switch>
 			<case nightMode="true" textColor="#CC3300"/>
 			<case nightMode="false" textColor="#654321"/>
-				<filter minzoom="16" textSize="12" textHaloRadius="1" textDy="13" textWrapWidth="20" tag="historic" value="memorial" />
+				<filter minzoom="16" textSize="12" textHaloRadius="1" textDy="13" 
+
+textWrapWidth="20" tag="historic" value="memorial" />
 		</switch>
 
-		<filter minzoom="14" maxzoom="14" textSize="12" textBold="true" textColor="#6666ff" textHaloRadius="1" textDy="-13" tag="railway" value="station" />
-		<filter minzoom="15" textSize="13" textBold="true" textColor="#6666ff" textHaloRadius="1" textDy="-14" tag="railway" value="station" />
-		<filter minzoom="14" maxzoom="14" textSize="12" textColor="#6666ff" textHaloRadius="1" textDy="-13" tag="railway" value="halt" />
-		<filter minzoom="15" textSize="12" textColor="#6666ff" textHaloRadius="1" textDy="-13" tag="railway" value="halt" />
-		<filter minzoom="14" maxzoom="14" textSize="12" textColor="#6666ff" textHaloRadius="1" textDy="-13" tag="railway" value="tram_stop" />
-		<filter minzoom="15" textSize="12" textColor="#6666ff" textHaloRadius="1" textDy="-13" tag="railway" value="tram_stop" />
+		<filter minzoom="14" maxzoom="14" textSize="12" textBold="true" textColor="#6666ff" 
 
-		<filter minzoom="10" textSize="12" textColor="#6692da" textHaloRadius="1" textDy="-12" tag="aeroway" value="aerodrome" />
-		<filter minzoom="15" textSize="12" textColor="#333333" textHaloRadius="1" textOnPath="true" textMinDistance="50" tag="aeroway" value="runway" ref="true" />
-		<filter minzoom="15" textSize="12" textColor="#333333" textHaloRadius="1" textOnPath="true" textMinDistance="50" tag="aeroway" value="taxiway" ref="true" />
-		<filter minzoom="10" textSize="12" textBold="true" textColor="#6692da" textHaloRadius="1" textDy="-13" tag="aeroway" value="airport" />
-		<filter minzoom="17" textSize="12" textColor="#aa66cc" textHaloRadius="1" textWrapWidth="10" tag="aeroway" value="gate" ref="true" />
+textDy="-13" tag="railway" value="station" />
+		<filter minzoom="15" textSize="13" textBold="true" textColor="#6666ff" textDy="-14" 
 
-		<filter minzoom="14" maxzoom="14" textSize="12" textColor="#6666ff" textHaloRadius="1" textDy="-13" tag="aerialway" value="station" />
-		<filter minzoom="15" textSize="12" textColor="#6666ff" textHaloRadius="1" textDy="-13" tag="aerialway" value="station" />
+tag="railway" value="station" />
+		<filter minzoom="14" maxzoom="14" textSize="12" textColor="#6666ff" textDy="-13" tag="railway" 
 
-		<filter minzoom="16" maxzoom="16" textSize="13" textColor="#444444" textWrapWidth="16" textMinDistance="40" tag="building" />
-		<filter minzoom="17" maxzoom="17" textSize="13" textColor="#444444" textWrapWidth="16" tag="building" />
+value="halt" />
+		<filter minzoom="15" textSize="12" textColor="#6666ff" textDy="-13" tag="railway" value="halt" 
+
+/>
+		<filter minzoom="14" maxzoom="14" textSize="12" textColor="#6666ff" textDy="-13" tag="railway" 
+
+value="tram_stop" />
+		<filter minzoom="15" textSize="12" textColor="#6666ff" textDy="-13" tag="railway" 
+
+value="tram_stop" />
+
+		<filter minzoom="10" textSize="12" textColor="#6692da" textDy="-12" tag="aeroway" 
+
+value="aerodrome" />
+		<filter minzoom="15" textSize="12" textColor="#333333" textOnPath="true" textMinDistance="50" 
+
+tag="aeroway" value="runway" ref="true" />
+		<filter minzoom="15" textSize="12" textColor="#333333" textOnPath="true" textMinDistance="50" 
+
+tag="aeroway" value="taxiway" ref="true" />
+		<filter minzoom="10" textSize="12" textBold="true" textColor="#6692da" textDy="-13" 
+
+tag="aeroway" value="airport" />
+		<filter minzoom="17" textSize="12" textColor="#aa66cc" textWrapWidth="10" tag="aeroway" 
+
+value="gate" ref="true" />
+
+		<filter minzoom="14" maxzoom="14" textSize="12" textColor="#6666ff" textDy="-13" 
+
+tag="aerialway" value="station" />
+		<filter minzoom="15" textSize="12" textColor="#6666ff" textDy="-13" tag="aerialway" 
+
+value="station" />
+
+		<filter minzoom="16" maxzoom="16" textSize="13" textColor="#444444" textWrapWidth="16" 
+
+textMinDistance="40" tag="building" />
+		<filter minzoom="17" maxzoom="17" textSize="13" textColor="#444444" textWrapWidth="16" 
+
+tag="building" />
 		<filter minzoom="18" textSize="15" textColor="#444444" textWrapWidth="16" tag="building" />
 
-		<filter minzoom="15" textSize="12" textColor="#000033" textHaloRadius="2" textDy="13" textWrapWidth="12" tag="man_made" value="lighthouse" />
-		<filter minzoom="17" textSize="12" textColor="#734a08" textHaloRadius="1" textDy="13" textWrapWidth="20" tag="man_made" value="windmill" />
+		<filter minzoom="15" textSize="12" textColor="#000033" textDy="13" textWrapWidth="12" 
 
-		<filter minzoom="15" textSize="12" textColor="#0000ff" textHaloRadius="1" textWrapWidth="30" tag="leisure" value="marina" />
+tag="man_made" value="lighthouse" />
+		<filter minzoom="17" textSize="12" textColor="#734a08" textDy="13" textWrapWidth="20" 
 
-		<filter minzoom="15" textSize="12" textHaloRadius="2" textWrapWidth="15" tag="leisure" />
+tag="man_made" value="windmill" />
 
-		<filter minzoom="16" textSize="12" textColor="#734a08" textDy="13" textWrapWidth="30" tag="amenity" value="fire_station" />
+		<filter minzoom="15" textSize="12" textColor="#0000ff" textWrapWidth="30" tag="leisure" 
+
+value="marina" />
+
+		<filter minzoom="15" textSize="12" textHaloRadius="1" textWrapWidth="15" tag="leisure" />
+
+		<filter minzoom="16" textSize="12" textColor="#734a08" textDy="13" textWrapWidth="30" 
+
+tag="amenity" value="fire_station" />
 
 		<switch>
 			<case tag="amenity" value="restaurant" />
@@ -306,135 +381,319 @@
 			<case tag="amenity" value="fast_food" />
 			<case tag="amenity" value="pub" />
 			<case tag="amenity" value="bar" />
-			<filter minzoom="17" textSize="12" textColor="#734a08" textHaloRadius="1" textDy="13" textWrapWidth="34"  />
+			<filter minzoom="17" textSize="12" textColor="#734a08" textHaloRadius="1" textDy="13" 
+
+textWrapWidth="34" />
 		</switch>
 
-		<filter minzoom="16" textSize="12" textColor="#000033" textWrapWidth="16" tag="amenity" value="kindergarten" />
-		<filter minzoom="16" textSize="12" textColor="#000033" textDy="13" textWrapWidth="16" tag="amenity" value="school" />
-		<filter minzoom="15" textSize="12" textColor="#000033" textDy="13" textWrapWidth="16" tag="amenity" value="college" />
-		<filter minzoom="17" textSize="12" textBold="true" textColor="#734a08" textWrapWidth="16" textDy="13" tag="amenity" value="library" />
-		<filter minzoom="15" textSize="12" textBold="true" textColor="#000033" textWrapWidth="16" tag="amenity" value="university" />
+		<filter minzoom="16" textSize="12" textColor="#000033" textWrapWidth="16" tag="amenity" 
 
-		<filter minzoom="17" textSize="12" textColor="#0066ff" textDy="13" textWrapWidth="34" tag="amenity" value="parking" />
-		<filter minzoom="17" textSize="12" textColor="#0066ff" textHaloRadius="1" textDy="13" tag="amenity" value="fuel" />
-		<filter minzoom="17" textSize="12" textColor="#0066ff" textHaloRadius="1" textDy="13" tag="amenity" value="bus_station" />
+value="kindergarten" />
+		<filter minzoom="16" textSize="12" textColor="#000033" textDy="13" textWrapWidth="16" 
+
+tag="amenity" value="school" />
+		<filter minzoom="15" textSize="12" textColor="#000033" textDy="13" textWrapWidth="16" 
+
+tag="amenity" value="college" />
+		<filter minzoom="17" textSize="12" textBold="true" textColor="#734a08" textWrapWidth="16" 
+
+textDy="13" tag="amenity" value="library" />
+		<filter minzoom="15" textSize="12" textBold="true" textColor="#000033" textWrapWidth="16" 
+
+tag="amenity" value="university" />
+
+		<filter minzoom="17" textSize="12" textColor="#0066ff" textDy="13" textWrapWidth="34" 
+
+tag="amenity" value="parking" />
+		<filter minzoom="17" textSize="12" textColor="#0066ff" textDy="13" tag="amenity" value="fuel" 
+
+/>
+		<filter minzoom="17" textSize="12" textColor="#0066ff" textDy="13" tag="amenity" 
+
+value="bus_station" />
 
 		<filter minzoom="17" textSize="12" textHaloRadius="1" textDy="13" tag="amenity" value="bank" />
-		<filter minzoom="17" textSize="12" textHaloRadius="1" textDy="13" tag="amenity" value="bureau_de_change" />
-		<filter minzoom="17" textSize="12" textColor="#da0092" textHaloRadius="1" textDy="13" textWrapWidth="12" tag="amenity" value="pharmacy" />
-		<filter minzoom="16" textSize="12" textColor="#da0092" textHaloRadius="2" textDy="13" textWrapWidth="24" tag="amenity" value="hospital" />
-		<filter minzoom="16" textSize="12" textColor="#da0092" textHaloRadius="2" textDy="13" textWrapWidth="24" tag="amenity" value="veterinary" />
-		<filter minzoom="16" textSize="12" textColor="#da0092" textHaloRadius="2" textDy="13" textWrapWidth="24" tag="amenity" value="doctors" />
-		<filter minzoom="16" textSize="12" textColor="#da0092" textHaloRadius="2" textDy="13" textWrapWidth="24" tag="amenity" value="dentist" />
+		<filter minzoom="17" textSize="12" textHaloRadius="1" textDy="13" tag="amenity" 
 
-		<filter minzoom="17" textSize="12" textColor="#734a08" textHaloRadius="1" textDy="13" textWrapWidth="15" tag="amenity" value="arts_centre" />
-		<filter minzoom="17" textSize="12" textColor="#734a08" textHaloRadius="1" textDy="13" textWrapWidth="15" tag="amenity" value="cinema" />
-		<filter minzoom="17" textSize="12" textColor="#734a08" textHaloRadius="1" textDy="13" textWrapWidth="15" tag="amenity" value="community_centre" />
-		<filter minzoom="17" textSize="12" textColor="#734a08" textHaloRadius="1" textDy="13" textWrapWidth="15" tag="amenity" value="social_centre" />
-		<filter minzoom="17" textSize="12" textColor="#734a08" textHaloRadius="1" textDy="13" textWrapWidth="15" tag="amenity" value="nightclub" />
-		<filter minzoom="17" textSize="12" textColor="#734a08" textHaloRadius="1" textDy="13" textWrapWidth="15" tag="amenity" value="stripclub" />
-		<filter minzoom="17" textSize="12" textColor="#734a08" textHaloRadius="1" textDy="13" textWrapWidth="15" tag="amenity" value="studio" />
-		<filter minzoom="17" textSize="12" textColor="#734a08" textHaloRadius="1" textDy="13" textWrapWidth="15" tag="amenity" value="theatre" />
-		<filter minzoom="17" textSize="12" textColor="#734a08" textHaloRadius="1" textDy="13" textWrapWidth="15" tag="amenity" value="sauna" />
-		<filter minzoom="17" textSize="12" textColor="#734a08" textHaloRadius="1" textDy="13" textWrapWidth="15" tag="amenity" value="brothel" />
+value="bureau_de_change" />
+		<filter minzoom="17" textSize="12" textColor="#da0092" textHaloRadius="1" textDy="13" 
 
-		<filter minzoom="17" textSize="12" textColor="#0066ff" textHaloRadius="1" textDy="13" textWrapWidth="20" tag="amenity" value="embassy" />
-		<filter minzoom="17" textSize="12" textColor="#734a08" textDy="13" textWrapWidth="30" tag="amenity" value="police" />
-		<filter minzoom="17" textSize="12" textColor="#734a08" textHaloRadius="1" textDy="13" textWrapWidth="20" tag="amenity" value="prison" />
-		<filter minzoom="16" textSize="12" textColor="#6699cc" textHaloRadius="1" textDy="13" tag="amenity" value="shelter" />
-		<filter minzoom="17" textSize="12" textColor="#000033" textDy="13" textWrapWidth="30" tag="amenity" value="place_of_worship" />
+textWrapWidth="12" tag="amenity" value="pharmacy" />
+		<filter minzoom="16" textSize="12" textColor="#da0092" textHaloRadius="1" textDy="13" 
 
-		<filter minzoom="17" textSize="12" textColor="#993399" textHaloRadius="1" textDy="13" textWrapWidth="14" tag="shop" value="bakery" />
-		<filter minzoom="17" textSize="12" textColor="#993399" textHaloRadius="1" textDy="13" textWrapWidth="14" tag="shop" value="butcher" />
-		<filter minzoom="17" textSize="12" textColor="#993399" textHaloRadius="1" textDy="13" textWrapWidth="14" tag="shop" value="clothes" />
-		<filter minzoom="17" textSize="12" textColor="#993399" textHaloRadius="1" textDy="13" textWrapWidth="14" tag="shop" value="fashion" />
-		<filter minzoom="17" textSize="12" textColor="#993399" textHaloRadius="1" textDy="13" textWrapWidth="14" tag="shop" value="boutique" />
-		<filter minzoom="17" textSize="12" textColor="#993399" textHaloRadius="1" textDy="13" textWrapWidth="14" tag="shop" value="convenience" />
-		<filter minzoom="16" textSize="12" textColor="#993399" textHaloRadius="1" textDy="13" textWrapWidth="20" tag="shop" value="department_store" />
-		<filter minzoom="17" textSize="12" textColor="#993399" textHaloRadius="1" textDy="13" textWrapWidth="14" tag="shop" value="doityourself" />
-		<filter minzoom="17" textSize="12" textColor="#993399" textHaloRadius="1" textDy="13" textWrapWidth="14" tag="shop" value="hairdresser" />
-		<filter minzoom="16" textSize="12" textColor="#993399" textHaloRadius="1" textDy="13" textWrapWidth="20" tag="shop" value="supermarket" />
-		<filter minzoom="16" textSize="12" textColor="#993399" textHaloRadius="1" textDy="13" textWrapWidth="20" tag="shop" value="confectionery" />
-		<filter minzoom="17" textSize="12" textColor="#993399" textHaloRadius="1" textDy="13" textWrapWidth="14" tag="shop" value="vending_machine" />
-		<filter minzoom="16" textSize="12" textColor="#993399" textHaloRadius="1" textDy="13" textWrapWidth="20" tag="shop" value="alcohol" />
-		<filter minzoom="16" textSize="12" textColor="#993399" textHaloRadius="1" textDy="13" textWrapWidth="20" tag="shop" value="kiosk" />
-		<filter minzoom="17" textSize="12" textColor="#993399" textHaloRadius="1" textDy="13" textWrapWidth="14" tag="shop" value="musical_instrument" />
-		<filter minzoom="16" textSize="12" textColor="#da0092" textHaloRadius="1" textDy="13" textWrapWidth="20" tag="shop" value="optician" />
-		<filter minzoom="17" textSize="12" textColor="#993399" textHaloRadius="1" textDy="13" textWrapWidth="14" tag="shop" value="outdoor" />
-		<filter minzoom="16" textSize="12" textColor="#000033" textDy="13" textWrapWidth="16" tag="leisure" value="water_park" />
-		<filter minzoom="16" textSize="12" textColor="#000033" textDy="13" textWrapWidth="16" tag="sport" value="horse_racing" />
-		<filter minzoom="17" textSize="12" textColor="#993399" textHaloRadius="1" textDy="13" textWrapWidth="14" tag="shop" value="video" />
-		<filter minzoom="16" textSize="12" textColor="#000033" textDy="13" textWrapWidth="16" tag="sport" value="soccer" />
-		<filter minzoom="16" textSize="12" textColor="#000033" textDy="13" textWrapWidth="16" tag="sport" value="archery" />
-		<filter minzoom="16" textSize="12" textColor="#000033" textDy="13" textWrapWidth="16" tag="sport" value="baseball" />
-		<filter minzoom="15" textSize="12" textColor="#000033" textDy="13" textWrapWidth="16" tag="leisure" value="stadium" />
-		<filter minzoom="16" textSize="12" textColor="#000033" textDy="13" textWrapWidth="16" tag="sport" value="canoe" />
-		<filter minzoom="16" textSize="12" textColor="#000033" textDy="13" textWrapWidth="16" tag="sport" value="tennis" />
-		<filter minzoom="16" textSize="12" textColor="#000033" textDy="13" textWrapWidth="16" tag="sport" value="shooting" />
-		<filter minzoom="16" textSize="12" textColor="#000033" textDy="13" textWrapWidth="16" tag="sport" value="golf" />
-		<filter minzoom="16" textSize="12" textColor="#000033" textDy="13" textWrapWidth="16" tag="sport" value="skiing" />
-		<filter minzoom="16" textSize="12" textColor="#000033" textDy="13" textWrapWidth="16" tag="sport" value="swimming" />
-		<filter minzoom="16" textSize="12" textColor="#000033" textDy="13" textWrapWidth="16" tag="sport" value="skiing" />
-		<filter minzoom="16" textSize="12" textColor="#000033" textDy="13" textWrapWidth="16" tag="sport" value="diving" />
-		<filter minzoom="15" textSize="12" textColor="#734a08" textHaloRadius="1" textWrapWidth="30" tag="historic" value="castle" />
-		
-		<filter minzoom="16" textSize="12" textColor="#0066ff" textHaloRadius="1" textDy="13" textWrapWidth="70" tag="tourism" value="camp_site" />
-		<filter minzoom="16" textSize="12" textColor="#0066ff" textHaloRadius="1" textDy="13" textWrapWidth="70" tag="tourism" value="caravan_site" />
+textWrapWidth="24" tag="amenity" value="hospital" />
+		<filter minzoom="16" textSize="12" textColor="#da0092" textHaloRadius="1" textDy="13" 
 
-		<filter minzoom="15" textSize="12" textColor="#734a08" textHaloRadius="1" textWrapWidth="30" tag="tourism" value="theme_park" />
-		<filter minzoom="16" textSize="12" textColor="#6699cc" textHaloRadius="1" textDy="13" tag="tourism" value="alpine_hut" />
-		<filter minzoom="17" textSize="12" textColor="#0066ff" textHaloRadius="1" textDy="13" tag="tourism" value="guest_house" />
-		<filter minzoom="17" textSize="12" textColor="#0066ff" textHaloRadius="1" textDy="13" tag="tourism" value="hostel" />
-		<filter minzoom="17" textSize="12" textColor="#0066ff" textHaloRadius="1" textDy="13" tag="tourism" value="hotel" />
-		<filter minzoom="17" textSize="12" textColor="#0066ff" textHaloRadius="1" textDy="13" tag="tourism" value="motel" />
-		<filter minzoom="17" textSize="12" textColor="#734a08" textHaloRadius="1" textDy="13" tag="tourism" value="museum" />
-		<filter minzoom="16" textSize="12" textColor="#993399" textHaloRadius="1" textDy="13" textWrapWidth="20" tag="amenity" value="marketplace" />
-		<filter minzoom="15" textSize="12" textHaloRadius="1" textDy="13" tag="leisure" value="fishing" />
-		<filter minzoom="16" textSize="12" textHaloRadius="1" textDy="13" tag="amenity" value="townhall" />
-		<filter minzoom="16" textSize="12" textHaloRadius="1" textDy="13" tag="amenity" value="courthouse" />
-		<filter minzoom="16" textSize="12" textColor="#734a08" textHaloRadius="1" textDy="13" textWrapWidth="15" tag="amenity" value="ice_cream" />
-		<filter minzoom="16" textSize="12" textHaloRadius="1" textDy="13" tag="leisure" value="sports_centre" />
-		<filter minzoom="16" textSize="12" textColor="#993399" textHaloRadius="1" textDy="13" textWrapWidth="20" tag="shop" value="laundry" />
-		<filter minzoom="16" textSize="12" textColor="#993399" textHaloRadius="1" textDy="13" textWrapWidth="20" tag="shop" value="tobacco" />
-		<filter minzoom="16" textSize="12" textColor="#993399" textHaloRadius="1" textDy="13" textWrapWidth="20" tag="shop" value="motorcycle" />
-		<filter minzoom="16" textSize="12" textColor="#993399" textHaloRadius="1" textDy="13" textWrapWidth="20" tag="shop" value="hardware" />
-		<filter minzoom="16" textSize="12" textColor="#993399" textHaloRadius="1" textDy="13" textWrapWidth="20" tag="shop" value="copyshop" />
-		<filter minzoom="16" textSize="12" textColor="#993399" textHaloRadius="1" textDy="13" textWrapWidth="20" tag="shop" value="greengrocer" />
-		<filter minzoom="16" textSize="12" textColor="#993399" textHaloRadius="1" textDy="13" textWrapWidth="20" tag="shop" value="mobile_phone" />
+textWrapWidth="24" tag="amenity" value="veterinary" />
+		<filter minzoom="16" textSize="12" textColor="#da0092" textHaloRadius="1" textDy="13" 
+
+textWrapWidth="24" tag="amenity" value="doctors" />
+		<filter minzoom="16" textSize="12" textColor="#da0092" textHaloRadius="1" textDy="13" 
+
+textWrapWidth="24" tag="amenity" value="dentist" />
+
+		<filter minzoom="17" textSize="12" textColor="#734a08" textHaloRadius="1" textDy="13" 
+
+textWrapWidth="15" tag="amenity" value="arts_centre" />
+		<filter minzoom="17" textSize="12" textColor="#734a08" textHaloRadius="1" textDy="13" 
+
+textWrapWidth="15" tag="amenity" value="cinema" />
+		<filter minzoom="17" textSize="12" textColor="#734a08" textHaloRadius="1" textDy="13" 
+
+textWrapWidth="15" tag="amenity" value="community_centre" />
+		<filter minzoom="17" textSize="12" textColor="#734a08" textHaloRadius="1" textDy="13" 
+
+textWrapWidth="15" tag="amenity" value="social_centre" />
+		<filter minzoom="17" textSize="12" textColor="#734a08" textHaloRadius="1" textDy="13" 
+
+textWrapWidth="15" tag="amenity" value="nightclub" />
+		<filter minzoom="17" textSize="12" textColor="#734a08" textHaloRadius="1" textDy="13" 
+
+textWrapWidth="15" tag="amenity" value="stripclub" />
+		<filter minzoom="17" textSize="12" textColor="#734a08" textHaloRadius="1" textDy="13" 
+
+textWrapWidth="15" tag="amenity" value="studio" />
+		<filter minzoom="17" textSize="12" textColor="#734a08" textHaloRadius="1" textDy="13" 
+
+textWrapWidth="15" tag="amenity" value="theatre" />
+		<filter minzoom="17" textSize="12" textColor="#734a08" textHaloRadius="1" textDy="13" 
+
+textWrapWidth="15" tag="amenity" value="sauna" />
+		<filter minzoom="17" textSize="12" textColor="#734a08" textHaloRadius="1" textDy="13" 
+
+textWrapWidth="15" tag="amenity" value="brothel" />
+
+		<filter minzoom="17" textSize="12" textColor="#0066ff" textHaloRadius="1" textDy="13" 
+
+textWrapWidth="20" tag="amenity" value="embassy" />
+		<filter minzoom="17" textSize="12" textColor="#734a08" textHaloRadius="1" textDy="13" 
+
+textWrapWidth="30" tag="amenity" value="police" />
+		<filter minzoom="17" textSize="12" textColor="#734a08" textHaloRadius="1" textDy="13" 
+
+textWrapWidth="20" tag="amenity" value="prison" />
+		<filter minzoom="16" textSize="12" textColor="#6699cc" textHaloRadius="1" textDy="13" 
+
+tag="amenity" value="shelter" />
+		<filter minzoom="17" textSize="12" textColor="#000033" textHaloRadius="1" textDy="13" 
+
+textWrapWidth="30" tag="amenity" value="place_of_worship" />
+
+		<filter minzoom="17" textSize="12" textColor="#993399" textHaloRadius="1" textDy="13" 
+
+textWrapWidth="14" tag="shop" value="bakery" />
+		<filter minzoom="17" textSize="12" textColor="#993399" textHaloRadius="1" textDy="13" 
+
+textWrapWidth="14" tag="shop" value="butcher" />
+		<filter minzoom="17" textSize="12" textColor="#993399" textHaloRadius="1" textDy="13" 
+
+textWrapWidth="14" tag="shop" value="clothes" />
+		<filter minzoom="17" textSize="12" textColor="#993399" textHaloRadius="1" textDy="13" 
+
+textWrapWidth="14" tag="shop" value="fashion" />
+		<filter minzoom="17" textSize="12" textColor="#993399" textHaloRadius="1" textDy="13" 
+
+textWrapWidth="14" tag="shop" value="boutique" /> 
+		<filter minzoom="17" textSize="12" textColor="#993399" textHaloRadius="1" textDy="13" 
+
+textWrapWidth="14" tag="shop" value="convenience" />
+		<filter minzoom="16" textSize="12" textColor="#993399" textHaloRadius="1" textDy="13" 
+
+textWrapWidth="20" tag="shop" value="department_store" />
+		<filter minzoom="17" textSize="12" textColor="#993399" textHaloRadius="1" textDy="13" 
+
+textWrapWidth="14" tag="shop" value="doityourself" />
+		<filter minzoom="17" textSize="12" textColor="#993399" textHaloRadius="1" textDy="13" 
+
+textWrapWidth="14" tag="shop" value="hairdresser" />
+		<filter minzoom="16" textSize="12" textColor="#993399" textHaloRadius="1" textDy="13" 
+
+textWrapWidth="20" tag="shop" value="supermarket" />
+		<filter minzoom="16" textSize="12" textColor="#993399" textHaloRadius="1" textDy="13" 
+
+textWrapWidth="20" tag="shop" value="confectionery" /> 
+		<filter minzoom="17" textSize="12" textColor="#993399" textHaloRadius="1" textDy="13" 
+
+textWrapWidth="14" tag="shop" value="vending_machine" />
+		<filter minzoom="16" textSize="12" textColor="#993399" textHaloRadius="1" textDy="13" 
+
+textWrapWidth="20" tag="shop" value="alcohol" />
+		<filter minzoom="16" textSize="12" textColor="#993399" textHaloRadius="1" textDy="13" 
+
+textWrapWidth="20" tag="shop" value="kiosk" />
+		<filter minzoom="17" textSize="12" textColor="#993399" textHaloRadius="1" textDy="13" 
+
+textWrapWidth="14" tag="shop" value="musical_instrument" />
+		<filter minzoom="16" textSize="12" textColor="#da0092" textHaloRadius="1" textDy="13" 
+
+textWrapWidth="20" tag="shop" value="optician" />
+		<filter minzoom="17" textSize="12" textColor="#993399" textHaloRadius="1" textDy="13" 
+
+textWrapWidth="14" tag="shop" value="outdoor" />
+		<filter minzoom="16" textSize="12" textColor="#000033" textHaloRadius="1" textDy="13" 
+
+textWrapWidth="16" tag="leisure" value="water_park" />
+		<filter minzoom="16" textSize="12" textColor="#000033" textHaloRadius="1" textDy="13" 
+
+textWrapWidth="16" tag="sport" value="horse_racing" />
+		<filter minzoom="17" textSize="12" textColor="#993399" textHaloRadius="1" textDy="13" 
+
+textWrapWidth="14" tag="shop" value="video" />
+		<filter minzoom="16" textSize="12" textColor="#000033" textHaloRadius="1" textDy="13" 
+
+textWrapWidth="16" tag="sport" value="soccer" />
+		<filter minzoom="16" textSize="12" textColor="#000033" textHaloRadius="1" textDy="13" 
+
+textWrapWidth="16" tag="sport" value="archery" />
+		<filter minzoom="16" textSize="12" textColor="#000033" textHaloRadius="1" textDy="13" 
+
+textWrapWidth="16" tag="sport" value="baseball" />
+		<filter minzoom="15" textSize="12" textColor="#000033" textHaloRadius="1" textDy="13" 
+
+textWrapWidth="16" tag="leisure" value="stadium" />
+		<filter minzoom="16" textSize="12" textColor="#000033" textHaloRadius="1" textDy="13" 
+
+textWrapWidth="16" tag="sport" value="canoe" />
+		<filter minzoom="16" textSize="12" textColor="#000033" textHaloRadius="1" textDy="13" 
+
+textWrapWidth="16" tag="sport" value="tennis" />
+		<filter minzoom="16" textSize="12" textColor="#000033" textHaloRadius="1" textDy="13" 
+
+textWrapWidth="16" tag="sport" value="shooting" />
+		<filter minzoom="16" textSize="12" textColor="#000033" textHaloRadius="1" textDy="13" 
+
+textWrapWidth="16" tag="sport" value="golf" />
+		<filter minzoom="16" textSize="12" textColor="#000033" textHaloRadius="1" textDy="13" 
+
+textWrapWidth="16" tag="sport" value="skiing" />
+		<filter minzoom="16" textSize="12" textColor="#000033" textHaloRadius="1" textDy="13" 
+
+textWrapWidth="16" tag="sport" value="swimming" />
+		<filter minzoom="16" textSize="12" textColor="#000033" textHaloRadius="1" textDy="13" 
+
+textWrapWidth="16" tag="sport" value="skiing" />
+		<filter minzoom="16" textSize="12" textColor="#000033" textHaloRadius="1" textDy="13" 
+
+textWrapWidth="16" tag="sport" value="diving" />
+		<filter minzoom="15" textSize="12" textColor="#734a08" textHaloRadius="1" textWrapWidth="30" 
+
+tag="historic" value="castle" />
+
+		<filter minzoom="16" textSize="12" textColor="#0066ff" textHaloRadius="1" textDy="13" 
+
+textWrapWidth="70" tag="tourism" value="camp_site" />
+		<filter minzoom="16" textSize="12" textColor="#0066ff" textHaloRadius="1" textDy="13" 
+
+textWrapWidth="70" tag="tourism" value="caravan_site" />
+
+		<filter minzoom="15" textSize="12" textColor="#734a08" textHaloRadius="1" textWrapWidth="30" 
+
+tag="tourism" value="theme_park" />
+		<filter minzoom="16" textSize="12" textColor="#6699cc" textHaloRadius="1" textDy="13" 
+
+tag="tourism" value="alpine_hut" />
+		<filter minzoom="17" textSize="12" textColor="#0066ff" textHaloRadius="1" textDy="13" 
+
+tag="tourism" value="guest_house" />
+		<filter minzoom="17" textSize="12" textColor="#0066ff" textHaloRadius="1" textDy="13" 
+
+tag="tourism" value="hostel" />
+		<filter minzoom="17" textSize="12" textColor="#0066ff" textHaloRadius="1" textDy="13" 
+
+tag="tourism" value="hotel" />
+		<filter minzoom="17" textSize="12" textColor="#0066ff" textHaloRadius="1" textDy="13" 
+
+tag="tourism" value="motel" />
+		<filter minzoom="17" textSize="12" textColor="#734a08" textHaloRadius="1" textDy="13" 
+
+tag="tourism" value="museum" />
+		<filter minzoom="16" textSize="12" textColor="#993399" textHaloRadius="1" textDy="13" 
+
+textWrapWidth="20" tag="amenity" value="marketplace" /> 
+		<filter minzoom="15" textSize="12" textHaloRadius="1" textDy="13" tag="leisure" value="fishing" 
+
+/> 
+		<filter minzoom="16" textSize="12" textHaloRadius="1" textDy="13" tag="amenity" 
+
+value="townhall" /> 
+		<filter minzoom="16" textSize="12" textHaloRadius="1" textDy="13" tag="amenity" 
+
+value="courthouse" /> 
+		<filter minzoom="16" textSize="12" textColor="#734a08" textHaloRadius="1" textDy="13" 
+
+textWrapWidth="15" tag="amenity" value="ice_cream" /> 
+		<filter minzoom="16" textSize="12" textHaloRadius="1" textDy="13" tag="leisure" 
+
+value="sports_centre" /> 
+		<filter minzoom="16" textSize="12" textColor="#993399" textHaloRadius="1" textDy="13" 
+
+textWrapWidth="20" tag="shop" value="laundry" /> 
+		<filter minzoom="16" textSize="12" textColor="#993399" textHaloRadius="1" textDy="13" 
+
+textWrapWidth="20" tag="shop" value="tobacco" /> 
+		<filter minzoom="16" textSize="12" textColor="#993399" textHaloRadius="1" textDy="13" 
+
+textWrapWidth="20" tag="shop" value="motorcycle" /> 
+		<filter minzoom="16" textSize="12" textColor="#993399" textHaloRadius="1" textDy="13" 
+
+textWrapWidth="20" tag="shop" value="hardware" /> 
+		<filter minzoom="16" textSize="12" textColor="#993399" textHaloRadius="1" textDy="13" 
+
+textWrapWidth="20" tag="shop" value="copyshop" /> 
+		<filter minzoom="16" textSize="12" textColor="#993399" textHaloRadius="1" textDy="13" 
+
+textWrapWidth="20" tag="shop" value="greengrocer" /> 
+		<filter minzoom="16" textSize="12" textColor="#993399" textHaloRadius="1" textDy="13" 
+
+textWrapWidth="20" tag="shop" value="mobile_phone" /> 
 
 		<!-- type not supported -->
-		<!-- <filter minzoom="15" textSize="13" textHaloRadius="2" textWrapWidth="10" tag="landuse" type="point" /> -->
+		<!-- <filter minzoom="15" textSize="13" textWrapWidth="10" tag="landuse" type="point" /> -->
 
-		<filter minzoom="13" textSize="12" textColor="#6699cc" textHaloRadius="1" textWrapWidth="20" tag="landuse" value="reservoir" />
-		<filter minzoom="13" textSize="12" textColor="#6699cc" textHaloRadius="1" textWrapWidth="20" tag="landuse" value="water" />
+		<filter minzoom="13" textSize="12" textColor="#6699cc" textWrapWidth="20" tag="landuse" 
 
-		<filter minzoom="13" textSize="12" textBold="true" textColor="#ffc0cb" textHaloRadius="1" textWrapWidth="10" tag="military" value="danger_area" />
+value="reservoir" />
+		<filter minzoom="13" textSize="12" textColor="#6699cc" textWrapWidth="20" tag="landuse" 
+
+value="water" />
+
+		<filter minzoom="13" textSize="12" textBold="true" textColor="#ffc0cb" textWrapWidth="10" 
+
+tag="military" value="danger_area" />
+
+		<filter minzoom="3" textSize="14" textColor="#9d6c9d" textWrapWidth="20" tag="place" 
+
+value="country" />
+		<filter minzoom="4" textSize="14" textColor="#9d6c9d" textWrapWidth="20" tag="place" 
+
+value="state" />
+		<filter minzoom="4" textSize="14" textColor="#9d6c9d" textWrapWidth="20" tag="place" 
+
+value="region" />
 
-	<!-- ZM -->
-		<filter minzoom="3" textSize="14" textColor="#9d6c9d" textHaloRadius="1" textWrapWidth="20" tag="place" value="country" />
-		<filter minzoom="4" maxzoom="6" textSize="12" textColor="#9d6c9d" textHaloRadius="1" textWrapWidth="20" tag="place" value="state" />
-		<filter minzoom="7" textSize="14" textColor="#9d6c9d" textHaloRadius="1" textWrapWidth="20" tag="place" value="state" />
-		<filter minzoom="4" maxzoom="6" textSize="12" textColor="#9d6c9d" textHaloRadius="1" textWrapWidth="20" tag="place" value="region" />
-		<filter minzoom="7" textSize="14" textColor="#9d6c9d" textHaloRadius="1" textWrapWidth="20" tag="place" value="region" />
-		
 		<switch>
 			<case nightMode="true" textColor="#ffffff"/>
 			<case nightMode="false"/>
-				<filter minzoom="4" textSize="20" textDy="-8" textBold="true" textHaloRadius="1" textWrapWidth="20" tag="place" value="city" />
-				<filter minzoom="6" textSize="16" textDy="-8" textBold="true" textHaloRadius="1" textWrapWidth="20" tag="place" value="town" />
-				<filter minzoom="11" textSize="14" textHaloRadius="1" tag="place" value="village" />
+				<filter minzoom="4" textSize="20" textDy="-8" textBold="true" 
+
+textWrapWidth="20" tag="place" value="city" />
+				<filter minzoom="6" textSize="16" textDy="-8" textBold="true" 
+
+textWrapWidth="20" tag="place" value="town" />
+				<filter minzoom="11" textSize="14" tag="place" value="village" />
 		</switch>
 
-	<switch>
-		<case nightMode="true" textColor="#D7D7D7"/>
-		<case nightMode="false" textColor="#777777"/>
-		
-		<filter minzoom="11" textSize="13" textHaloRadius="1" tag="place" value="hamlet" />
-		<filter minzoom="11" textSize="14" textHaloRadius="1" tag="place" value="suburb" />
-		<filter minzoom="11" textSize="13" textHaloRadius="1" tag="place" value="locality" />
-		<filter minzoom="11" textSize="14" textHaloRadius="1" tag="place" value="island" />
-		<filter minzoom="10" textSize="14" textBold="true" textColor="#99cc99" textHaloRadius="1" textWrapWidth="14" tag="boundary" value="national_park" />
-	</switch>
+		<switch>
+			<case nightMode="true" textColor="#D7D7D7"/>
+			<case nightMode="false" textColor="#777777"/>
+				<filter minzoom="11" textSize="13" tag="place" value="hamlet" />
+				<filter minzoom="11" textSize="14" tag="place" value="suburb" />
+				<filter minzoom="11" textSize="13" tag="place" value="locality" />
+				<filter minzoom="11" textSize="14" tag="place" value="island" />
+				<filter minzoom="10" textSize="14" textBold="true" textColor="#99cc99" 
+
+textWrapWidth="14" tag="boundary" value="national_park" />
+		</switch>	
 	</text>
 
 	<!-- PRIORITY Input to filter : tag, value, zoom [minzoom, maxzoom] -->