From 01b6a8acf4b34f32fbee01c04f2439ac479ce4c7 Mon Sep 17 00:00:00 2001
From: Hannes Janetzek <hannes.janetzek@gmail.com>
Date: Tue, 30 Apr 2013 13:24:59 +0200
Subject: [PATCH] use theme priority(for tag group) also for node labels

---
 .../oscim/renderer/overlays/TextOverlay.java  |  36 +-
 src/org/oscim/theme/styles/default.xml        |  12 +-
 src/org/oscim/theme/styles/tronrender.xml     | 452 +++++++++---------
 3 files changed, 252 insertions(+), 248 deletions(-)

diff --git a/src/org/oscim/renderer/overlays/TextOverlay.java b/src/org/oscim/renderer/overlays/TextOverlay.java
index 8ef05039..ee134889 100644
--- a/src/org/oscim/renderer/overlays/TextOverlay.java
+++ b/src/org/oscim/renderer/overlays/TextOverlay.java
@@ -60,7 +60,7 @@ import android.opengl.GLES20;
 import android.os.SystemClock;
 
 public class TextOverlay extends BasicOverlay {
-private final static String TAG = TextOverlay.class.getName();
+	private final static String TAG = TextOverlay.class.getName();
 	private final static float MIN_CAPTION_DIST = 5;
 	private final static float MIN_WAY_DIST = 3;
 
@@ -158,7 +158,6 @@ private final static String TAG = TextOverlay.class.getName();
 		}
 	}
 
-
 	//	class ActiveTile {
 	//		MapTile tile;
 	//		int activeLabels;
@@ -217,7 +216,7 @@ private final static String TAG = TextOverlay.class.getName();
 	// remove Label l from mLabels and return l.next
 	private Label removeLabel(Label l) {
 		Label ret = (Label) l.next;
-		mLabels = (Label)mPool.release(mLabels, l);
+		mLabels = (Label) mPool.release(mLabels, l);
 
 		return ret;
 	}
@@ -386,7 +385,6 @@ private final static String TAG = TextOverlay.class.getName();
 
 		int maxx = Tile.SIZE << (zoom - 1);
 
-
 		if (dbg != null)
 			addDebugLayers(dbg);
 
@@ -557,12 +555,18 @@ private final static String TAG = TextOverlay.class.getName();
 						l.text.fontHeight + MIN_CAPTION_DIST);
 
 				boolean overlaps = false;
-				for (Label lp = mLabels; lp != null; lp = (Label) lp.next) {
 
+				for (Label lp = mLabels; lp != null;) {
 					if (l.bbox.overlaps(lp.bbox)) {
+						if (l.text.priority < lp.text.priority) {
+							lp = removeLabel(lp);
+							continue;
+						}
+
 						overlaps = true;
 						break;
 					}
+					lp = (Label) lp.next;
 				}
 				if (!overlaps) {
 					addLabel(l);
@@ -630,15 +634,15 @@ private final static String TAG = TextOverlay.class.getName();
 
 		} else {
 			if (ti.width > ti.length * scale) {
-				ll =  dbg.getLineLayer(1);
+				ll = dbg.getLineLayer(1);
 				overlaps = 3;
 			}
 			else if (overlaps == 1)
-				ll =  dbg.getLineLayer(0);
+				ll = dbg.getLineLayer(0);
 			else if (overlaps == 2)
-				ll =  dbg.getLineLayer(3);
+				ll = dbg.getLineLayer(3);
 			else
-				ll =  dbg.getLineLayer(2);
+				ll = dbg.getLineLayer(2);
 		}
 		float[] points = mDebugPoints;
 		float width = (ti.x2 - ti.x1) / 2f;
@@ -656,29 +660,29 @@ private final static String TAG = TextOverlay.class.getName();
 
 	private static void addDebugLayers(Layers dbg) {
 		dbg.clear();
-		LineLayer ll =  dbg.getLineLayer(0);
+		LineLayer ll = dbg.getLineLayer(0);
 		ll.line = new Line((Color.BLUE & 0xaaffffff), 1, Cap.BUTT);
 		ll.width = 2;
-		ll =  dbg.getLineLayer(3);
+		ll = dbg.getLineLayer(3);
 		ll.line = new Line((Color.YELLOW & 0xaaffffff), 1, Cap.BUTT);
 		ll.width = 2;
-		ll =  dbg.getLineLayer(1);
+		ll = dbg.getLineLayer(1);
 		ll.line = new Line((Color.RED & 0xaaffffff), 1, Cap.BUTT);
 		ll.width = 2;
-		ll =  dbg.getLineLayer(2);
+		ll = dbg.getLineLayer(2);
 		ll.line = new Line((Color.GREEN & 0xaaffffff), 1, Cap.BUTT);
 		ll.width = 2;
-		ll =  dbg.getLineLayer(4);
+		ll = dbg.getLineLayer(4);
 		ll.line = new Line((Color.CYAN & 0xaaffffff), 1, Cap.BUTT);
 		ll.width = 2;
-		ll =  dbg.getLineLayer(5);
+		ll = dbg.getLineLayer(5);
 		ll.line = new Line((Color.MAGENTA & 0xaaffffff), 1, Cap.BUTT);
 		ll.width = 2;
 	}
 
 	@Override
 	public synchronized void update(MapPosition curPos, boolean positionChanged,
-			 Matrices matrices) {
+			Matrices matrices) {
 
 		if (mNextLayer != null) {
 			// keep text layer, not recrating its canvas each time
diff --git a/src/org/oscim/theme/styles/default.xml b/src/org/oscim/theme/styles/default.xml
index 8cb47373..e75118b4 100644
--- a/src/org/oscim/theme/styles/default.xml
+++ b/src/org/oscim/theme/styles/default.xml
@@ -1060,27 +1060,27 @@
     <rule e="node" k="place" v="*">
       <rule e="node" k="*" v="suburb" zoom-max="14">
         <caption k="name" font-style="italic" font-size="17" fill="#606060"
-                 stroke="#ffffff" stroke-width="2.0" />
+                 stroke="#ffffff" stroke-width="2.0" priority="4"/>
       </rule>
       <rule e="node" k="*" v="village" zoom-max="14">
         <caption k="name" font-size="17" fill="#2020cc"
-                 stroke="#ffffff" stroke-width="2.0" />
+                 stroke="#ffffff" stroke-width="2.0" priority="3"/>
       </rule>
       <rule e="node" k="*" v="island" zoom-min="10">
         <caption k="name" font-style="bold" font-size="20" fill="#000000"
-                 stroke="#ffffff" stroke-width="2.0" />
+                 stroke="#ffffff" stroke-width="2.0" priority="1"/>
       </rule>
       <rule e="node" k="*" v="town">
         <caption k="name" font-size="19" fill="#000000"
-                 stroke="#ffffff" stroke-width="2.0" />
+                 stroke="#ffffff" stroke-width="2.0" priority="2"/>
       </rule>
       <rule e="node" k="*" v="city">
         <caption k="name" font-size="20" fill="#000000"
-                 stroke="#ffffff" stroke-width="2.0" />
+                 stroke="#ffffff" stroke-width="2.0" priority="1"/>
       </rule>
       <rule e="node" k="*" v="country">
         <caption k="name" font-style="bold" font-size="20" fill="#000000"
-                 stroke="#ffffff" stroke-width="2.0" />
+                 stroke="#ffffff" stroke-width="2.0" priority="0"/>
       </rule>
     </rule>
 
diff --git a/src/org/oscim/theme/styles/tronrender.xml b/src/org/oscim/theme/styles/tronrender.xml
index dc40fc7c..4e2e7ce1 100644
--- a/src/org/oscim/theme/styles/tronrender.xml
+++ b/src/org/oscim/theme/styles/tronrender.xml
@@ -6,112 +6,112 @@
 
   <style-text name="road" k="name"    font-style="bold"  font-size="18" stroke="#606050" fill="#eeffee" stroke-width="2.5" />
   <style-text name="major-road" k="name" font-style="bold" font-size="19" fill="#e2cf5d" stroke="#101010" stroke-width="2.5" />
-  
+
   <style-area name="residential"         fill="#ff0000" fade="10"/>
-  
+
   <style-area name="railway|industrial"  fill="#f2eeef" fade="10"/>
   <!-- "#f0fae7" mint green  -->
   <style-area name="farmland"            fill="#fff8bf" fade="11" />
-  
+
   <!-- fade out at z=7, blend over to 'blend-fill' in z=11 -->
-  <style-area name="forest|wood"         fill="#151806" fade="7" blend="11" blend-fill="#1e2205"/> 
- 
+  <style-area name="forest|wood"         fill="#151806" fade="7" blend="11" blend-fill="#1e2205"/>
+
   <!-- grass|meadow|garden|grassland|scrub -->
  	<style-area name="greens"              fill="#33390c" fade="10" />
- 	
+
  	<!-- marsh|wetland|nature_reserve -->
  	<style-area name="greens2"             fill="#627100" fade="12" />
- 	  
+
  	<!-- park|common|green|cemetery|golf_course|dog_park -->
  	<style-area name="park"                fill="#627100" fade="11" />
-  
+
   <!-- de:Kleingartengebiet -->
   <style-area name="allotments"          fill="#efeae0" fade="12" />
- 	
+
  	<!-- de:Steinbruch, Schotter-, Kies-, Sand- und Tongrube -->
   <style-area name="quarry"              fill="#ddddcc" fade="10" />
-  
+
   <style-area name="military"            fill="#eeedea" fade="10"/>
-  
-  
+
+
   <style-line name="residential"         stroke="#ffffff" width="1.0" blur="1.0" fade="13"/>
  	<style-line name="residential:bridge"  from="residential" cap="square"/>
- 	
+
  	<!-- when inheriting another style with 'from' then 'witdth' is meant relative to the parent -->
  	<style-line name="pedestrian"          from="residential" width="-0.4"/>
   <style-line name="pedestrian:bridge"   from="pedestrian" cap="square"/>
-  	
+
   <style-line name="highway:z11"         stroke="#fcba5a" width="1.8" blur="0.9"/>
   <!-- <style-line name="highway:z11:bridge"    from="highway:z11" cap="butt" /> -->
-  
+
   <style-line name="trunk_link"          stroke="#fee16e" width="1.3" cap="butt" blur="0.9"/>
   <style-line name="trunk"               stroke="#fedb52" width="1.6" blur="0.9"/>
   <style-line name="primary:z11"         stroke="#f2df6d" width="1.5" blur="0.9"/>
   <style-line name="secondary:z11"       from="primary:z11" width="-0.1"/>
-   
+
   <style-line name="tertiary"            from="residential" width="0.2" fade="11"/>
   <style-line name="construction"        stroke="#e0e0e0" width="1.2" />
 
   <style-line name="highway-service"     from="residential" width="-0.6" />
-    
+
   <!-- track|footway|path|cycleway -->
   <style-line name="footway"             stroke="#c1bcb6" width="1.2" cap="butt" fixed="true"/>
   <style-line name="footway:z16"         from="footway" width="-1.0" fixed="false" fade="-1"/>
   <style-line name="footway:z17"         stroke="#faf8f5" width="0.3"/>
-  
+
   <!-- de: ein Weg der für Reiter vorgeshen ist.. -->
-  <style-line name="bridleway"           stroke="#d3cb98" width="0.4" cap="butt"/>  
-  
+  <style-line name="bridleway"           stroke="#d3cb98" width="0.4" cap="butt"/>
+
   <style-line name="steps"               stroke="#f1f0f4" width="0.25" cap="butt" />
-  
-  <style-line name="water:outline"       stroke="#a4bbcc" width="1.0" cap="butt" /> 
-	<style-line name="water"               stroke="#cca4bbcc" width="0.6" cap="butt" /> 
+
+  <style-line name="water:outline"       stroke="#a4bbcc" width="1.0" cap="butt" />
+	<style-line name="water"               stroke="#cca4bbcc" width="0.6" cap="butt" />
   <style-area name="water"               fill="#001223" />
   <!-- no-go area boundary -->
   <style-line name="fence"               stroke="#444444" width="1.2" fixed="true" cap="butt"/>
- 	
+
   <style-line name="aeroway:runway"      stroke="#008888" width="1.8" cap="butt" blur="0.7" />
-  
-  <style-line name="building"            stroke="#dd888888" width="1.5" fixed="true" cap="butt"/> 
+
+  <style-line name="building"            stroke="#dd888888" width="1.5" fixed="true" cap="butt"/>
   <style-area name="building"            fill="#ee202020" fade="15"/>
-  
+
   <!-- ways -->
   <rule e="way" k="*" v="*" >
 
     <rule e="way" k="natural"  v="grassland|scrub" zoom-min="10">
       <use-area name="greens"/>
     </rule>
-      
-    <!-- landuse base -->      
+
+    <!-- landuse base -->
     <rule e="way" k="landuse" v="*">
-     
+
   <!--    <rule e="way" k="*"  zoom-min="10" v="farmland|farm|orchard|vineyard|greenhouse_horticulture|plant_nursery">
         <use-area name="farmland"/>
       </rule>
-     
+
        <rule e="way" k="*"  v="quarry">
         <use-area name="quarry"/>
       </rule>
-       
+
       <rule e="way" k="*" v="residential|farmyard|retail|commercial|industrial;retail">
         <use-area name="residential" />
       </rule>
 
-      <rule e="way" k="*" v="industrial|railway"> 
+      <rule e="way" k="*" v="industrial|railway">
          <use-area name ="railway|industrial"/>
       </rule>
 -->
      <!--   <rule e="way" k="*" v="military">
 				 <use-area name="military"/>
       </rule> -->
-      
-      <!--<rule e="way" k="landuse" v="construction|greenfield"> <area fill="#a47c41" 
+
+      <!--<rule e="way" k="landuse" v="construction|greenfield"> <area fill="#a47c41"
          stroke="#e4e4e4" width="0.2" /> </rule> -->
       <!-- <rule e="way" k="landuse" v="garages"> <area fill="#d6d6e4" /> </rule> -->
     </rule>
 
-   
-		
+
+
 	  <rule e="way" k="landuse|natural|leisure||amenity" v="*">
 			<!-- kind of more like landuse imho -->
 		  <rule e="way" k="leisure|landuse" v="nature_reserve">
@@ -120,116 +120,116 @@
 		       <line stroke="#abe29c" width="1.0" fixed="true" cap="butt" />
 	      </rule>
 	    </rule>
-	  
+
 	    <!-- landuse -->
 	    <rule e="way" k="landuse" v="*"  zoom-min="11">
 	      <!-- how about 'leisure' for this one? -->
 	      <rule e="way" k="*" v="cemetery">
 	        <use-area name="park"/>
 	      </rule>
-	           
+
 	      <rule e="way" k="*" v="reservoir|basin">
 	        <use-area name="water" />
 	      </rule>
 	    </rule>
-	
+
 	    <rule e="way" k="landuse" v="village_green|recreation_ground" >
 	      <use-area name="greens" />
 	    </rule>
-	   
+
 	   <!--  <rule e="way" k="landuse" v="allotments" zoom-min="12">
 	     <use-area name="allotments"/>
 	    </rule>-->
-	
+
 	    <rule e="way" k="leisure" v="park|common|green|golf_course|dog_park" zoom-min="11">
 	      <use-area name="park"/>
 	    </rule>
-	          
+
 	       <!-- Heideland, keep below forest -->
 	    <rule e="way" k="*" zoom-min="11" v="heath|sand">
 	      <area fill="#0f0f0c" fade="11" />
 	    </rule>
-	      
+
 	    <rule e="way" k="landuse" v="forest">
 	         <use-area name="forest|wood"/>
 	    </rule>
-	   
+
 	    <rule e="way" k="natural" v="wood">
 	          <use-area name="forest|wood"/>
 	        <!--  <line stroke="#abcfab" width="1.5" fixed="true" cap="butt"/> -->
 	    </rule>
-	    
-			<!-- keep grass above forest:wood and leisure:park! --> 
+
+			<!-- keep grass above forest:wood and leisure:park! -->
 			<rule e="way" k="landuse"  v="grass|meadow">
 			   <use-area name="greens"/>
 	    </rule>
-	    
+
 	    <rule e="way" k="leisure"  v="garden">
 		    <use-area name="greens"/>
 	    </rule>
-	     
-	
+
+
 	    <rule e="way" k="leisure" v="track">
 	       <line stroke="#c1bcb6" width="1.3" cap="butt"  fixed="true" />
 	    </rule>
-	            
+
 	    <!-- amenity -->
 	    <rule e="way" k="amenity" v="*">
-	     <rule e="way" k="*" v="kindergarten|school|college|university" zoom-min="14"> 
+	     <rule e="way" k="*" v="kindergarten|school|college|university" zoom-min="14">
 	        <area fill="#cdabde" stroke="#b094bf" stroke-width="0.2" /> </rule>
-	           
+
 	      <rule e="way" k="*" v="parking" zoom-min="14">
 	        <area fill="#444434" stroke="#d4d4d4" stroke-width="0.2" />
 	      </rule>
-	      
+
 	      <rule e="way" k="*" v="fountain" closed="yes">
 	        <area fill="#b4cbdc" stroke="#000080" stroke-width="0.15" />
 	      </rule>
 	    </rule>
-	
+
 	    <!-- <rule e="way" k="natural" v="coastline">
 	      <line stroke="#a4bbcc" width="1.2" fixed="true" />
 	    </rule> -->
-	
+
 	    <!-- natural -->
 	    <rule e="way" k="natural" v="*" zoom-min="10">
-	
+
 	      <rule e="way" k="*" v="glacier">
 	        <area fill="#fafaff" />
 	      </rule>
 	      <rule e="way" k="*" v="land">
 	        <area fill="#080808" />
 	      </rule>
-	      
+
 	     <!--  <rule e="way" k="*" v="beach">
 	          <area fill="#aaedd400"/>
 	        <line stroke="#fce94f" fixed="true" width="2.8" />
 	      </rule>-->
-	   
+
 	      <rule e="way" k="*" v="marsh|wetland|mud">
 	         <use-area name="greens2" />
 	      </rule>
 	    </rule>
-	
-	
+
+
 	    <!-- leisure -->
 	    <rule e="way" k="leisure" v="*" zoom-min="13">
-	
+
 	      <rule e="way" k="*" v="stadium" >
 	        <area fill="#404040"  />
 	          	        <line stroke="#cccccc" width="1.0" fixed="true" cap="butt" />
 	      </rule>
-	      
+
 	      <!--should be under playing field -->
 	      <!--  <rule e="way" k="*" zoom-min="14" v="sports_centre|water_park">
 	        <area fill="#daefdb" fade="12" />
 	      </rule>
-	     
+
 	      <rule e="way" k="*" zoom-min="15" v="playground|miniature_golf">
 	        <area fill="#f4f4de" />
 	        <line stroke="#fbdbc8" width="0.6" fixed="true" cap="butt" />
 	      </rule>
-	      
+
 	      <rule e="way" k="*" v="playing_fields|pitch">
 	        <area fill="#f4f4de" />
 	        <line stroke="#dbdbc8" width="0.6" fixed="true" cap="butt" />
@@ -238,32 +238,32 @@
 	      <rule e="way" k="*" v="swimming_pool">
 	        <area fill="#b4cbdc" stroke="#6060ff" stroke-width="0.2" />
 	      </rule>
-	      
-	      <!-- <rule e="way" k="*" v="track"> <rule e="way" k="area" v="yes|true"> 
-	           <area fill="#c9d8a2" stroke="#b7c690" width="0.025" /> </rule> <rule 
-	           e="way" k="area" v="~|no|false"> <line stroke="#b7c690" width="0.75" 
+
+	      <!-- <rule e="way" k="*" v="track"> <rule e="way" k="area" v="yes|true">
+	           <area fill="#c9d8a2" stroke="#b7c690" width="0.025" /> </rule> <rule
+	           e="way" k="area" v="~|no|false"> <line stroke="#b7c690" width="0.75"
 	           /> </rule> </rule> -->
 	    </rule>
-	
-	    
-	     <!-- area outlines need to be above to avoid uggly pixelation where 
+
+
+	     <!-- area outlines need to be above to avoid uggly pixelation where
 	       not aliased polygon overlaps the lines...   -->
-	       
+
 	    <rule e="way" k="leisure|landuse" v="*" zoom-min="14">
-		    
+
 		    <rule e="way" k="*" v="nature_reserve">
 		       <line stroke="#abe29c" width="1.0" fixed="true" cap="butt" />
 	      </rule>
-	
+
 		    <rule e="way" k="*" v="military">
 					 <use-line name="fence" />
 	      </rule>
 	    </rule>
     </rule>
-    
 
-	    
-   
+
+
+
     <!-- waterways -->
     <rule e="way" k="waterway" v="*">
 
@@ -274,44 +274,44 @@
       <rule e="way" k="waterway" v="canal">
         <use-line name="water" width="-0.2"/>
       </rule>
-      
+
       <rule e="way" k="waterway" v="stream" zoom-min="14">
          <use-line name="water" width="-0.1"/>
       </rule>
-      
+
       <style-outline name="river" width="1.0" stroke="#456799" blur="1.0"/>
-      
+
        <rule e="way" k="waterway" v="river" closed="no">
         <rule e="way" k="*" v="*" zoom-min="12">
           <use-line name="water" width="0.5"/>
-          <use-outline name="river"/> 
+          <use-outline name="river"/>
          </rule>
         <rule e="way" k="*" v="*" zoom-max="12">
            <use-line name="water" width="1.0" fixed="true" fade="9"/>
         </rule>
       </rule>
-      
-       
+
+
       <rule e="way" k="waterway" v="riverbank|dock">
         <use-area name="water"/>
         <use-line name="water" width="1.0" fixed="true"/>
 	    </rule>
-      
+
         <rule e="way" k="waterway" v="river" closed="yes">
         <use-area name="water"/>
         <use-line name="water" width="1.0" fixed="true"/>
 	    </rule>
-    
-      
+
+
       <rule e="way" k="waterway" v="weir">
         <line stroke="#000044" width="0.375" cap="butt" />
       </rule>
-      
+
       <rule e="way" k="waterway" v="dam" zoom-min="12">
         <!-- sehr seltsam was in deutschland so als Damm gekenzeichnet wird.. -->
         <line stroke="#ababab" width="1.2" cap="butt" fixed="true" />
       </rule>
-      
+
       <rule e="way" k="lock" v="yes|true">
         <line stroke="#f8f8f8" width="1.5" cap="butt" />
       </rule>
@@ -321,19 +321,19 @@
 	      <use-area name="water"/>
 	    	 <use-line name="water:outline" width="0.5" fixed="true"/>
 	   </rule>
-     
-	      	    
+
+
     <!-- sport -->
-    <!-- <rule e="way" k="sport" v="*"> <rule e="way" k="sport" v="soccer" 
-         zoom-min="17"> <rule e="way" k="sport" v="swimming|canoe|diving|scuba_diving"> 
-         <area fill="#b4cbdc" stroke="#6060ff" width="0.2" /> </rule> <rule 
-         e="way" k="sport" v="tennis"> <area fill="#d18a6a" stroke="#b36c4c" width="0.2" 
+    <!-- <rule e="way" k="sport" v="*"> <rule e="way" k="sport" v="soccer"
+         zoom-min="17"> <rule e="way" k="sport" v="swimming|canoe|diving|scuba_diving">
+         <area fill="#b4cbdc" stroke="#6060ff" width="0.2" /> </rule> <rule
+         e="way" k="sport" v="tennis"> <area fill="#d18a6a" stroke="#b36c4c" width="0.2"
          /> </rule> </rule> -->
 
     <!-- tourism areas -->
     <rule e="way" k="tourism" v="*">
       <!-- <rule e="way" k="tourism" v="attraction"> <area fill="#f2caea" /> </rule> -->
-           
+
       <rule e="way" k="tourism" v="zoo|picnic_site|caravan_site|camp_site">
         <area fill="#d7e6b0" />
       </rule>
@@ -371,7 +371,7 @@
              <use-line name="construction"/>
              <use-outline name="0"/>
            </rule>
-           
+
            <rule e="way" k="*" v="service">
                <rule e="way" k="service" v="-|parking_aisle">
            	 <use-line name="highway-service"/>
@@ -383,18 +383,18 @@
          <rule e="way" k="*" v="trunk_link|motorway_link">
            <use-line name="trunk_link"/>
            <use-outline name="0"/>
-        	 <use-text name="major-road"/> 
+        	 <use-text name="major-road"/>
          </rule>
-         
+
          <rule e="way" k="*" v="*" zoom-min="13">
             <rule e="way" k="*" v="byway|pedestrian">
             	<use-line name="pedestrian"/>
               <use-outline name="0"/>
             	<use-text name="road"/>
             </rule>
-      
-            
-           <rule e="way" k="*" v="residential|road|unclassified|living_street">	              
+
+
+           <rule e="way" k="*" v="residential|road|unclassified|living_street">
             	<use-line name="residential"/>
             	<use-outline name="0"/>
             	<use-text name="road"/>
@@ -404,47 +404,47 @@
          <rule e="way" k="*" v="tertiary|secondary_link">
            <use-line name="tertiary"/>
            <use-outline name="0"/>
-  			    <use-text name="road"/>    
+  			    <use-text name="road"/>
          </rule>
 
          <rule e="way" k="*" v="secondary|primary_link">
            <use-line name="secondary:z11"/>
            <use-outline name="0"/>
-           <use-text name="major-road"/>    
+           <use-text name="major-road"/>
          </rule>
 
          <rule e="way" k="*" v="primary">
-           <use-line name="primary:z11"/>       
+           <use-line name="primary:z11"/>
         	 <use-outline name="0"/>
-        	 <use-text name="major-road"/>    
+        	 <use-text name="major-road"/>
          </rule>
 
          <rule e="way" k="*" v="trunk">
           	<use-line name="trunk" blur="0.3"/>
-             <use-outline name="0"/> 
+             <use-outline name="0"/>
            <!--  <use-outline name="glow"/> -->
-            <use-text name="major-road"/>   
+            <use-text name="major-road"/>
          </rule>
 
          <rule e="way" k="*" v="motorway">
            <use-line name="highway:z11" blur="0.3"/>
-           <use-outline name="0"/> 
+           <use-outline name="0"/>
          <!--   <use-outline name="glow"/> -->
-           <use-text name="major-road"/>   
+           <use-text name="major-road"/>
          </rule>
        </rule>
-	
+
        <!-- railway tunnel -->
        <rule e="way" k="railway" v="*">
-       <!-- <rule e="way" k="railway" v="tram|subway|light_rail|narrow_gauge"> 
-             <line stroke="#a0a0a0" width="0.8" cap="butt" fixed="true"/> 
+       <!-- <rule e="way" k="railway" v="tram|subway|light_rail|narrow_gauge">
+             <line stroke="#a0a0a0" width="0.8" cap="butt" fixed="true"/>
              </rule> -->
         <rule e="way" k="railway" v="rail">
           <line stroke="#aaaaaa" width="0.9" cap="butt" fixed="true" />
         </rule>
       </rule>
     </rule>   <!-- end tunnel -->
-		
+
 
     <!-- platform cores -->
     <rule e="way" k="highway|railway|public_transport" v="platform">
@@ -469,28 +469,28 @@
       <rule e="way" k="*" v="terminal|hangar">
         <use-area name="building" />
         <use-line name="building" />
-        </rule> 
+        </rule>
     </rule>
 
     <!-- turning circles -->
-    <!-- <rule e="node" k="highway" v="turning_circle"> <circle r="1.5" scale-radius="true" 
-         fill="#707070" /> 
+    <!-- <rule e="node" k="highway" v="turning_circle"> <circle r="1.5" scale-radius="true"
+         fill="#707070" />
     </rule> -->
-    
+
     <!-- building -->
     <rule e="way" k="building" v="*">
 
       <rule e="way" k="*" v="*" zoom-min="15">
         <use-area name="building" fade="15"/>
         <use-line name="building" fade="15"/>
-      <!--   <line stroke="#c9c3c1" width="1.0" fixed="true" cap="butt" fade="15"/> 
+      <!--   <line stroke="#c9c3c1" width="1.0" fixed="true" cap="butt" fade="15"/>
         <area fill="#e9e6e3" fade="15" /> -->
       </rule>
-      
+
       <!-- <rule e="way" k="*" v="*" zoom-min="17">
           <caption k="name" font-style="bold" font-size="10" fill="#4040ff"
           stroke="#ffffff" stroke-width="2.0" />
-          <caption k="addr:housenumber" font-style="bold" font-size="10" fill="#606060" 
+          <caption k="addr:housenumber" font-style="bold" font-size="10" fill="#606060"
           stroke="#ffffff" stroke-width="2.0" />
           </rule> -->
     </rule>
@@ -499,13 +499,13 @@
     <style-outline name="glow3" stroke="#ddffffff" width="0.8" blur="0.5" fade="13"/>
   <!-- >   <style-outline name="glow" stroke="#ee909090" width="0.8" blur="0.5" fade="14"/>-->
     <style-outline name="glow2" width="1.0" stroke="#ffffff" blur="1.0" fade="13"/>
-     <style-outline name="1" stroke="#dd000000" width="-0.3" fade="14"/>  
+     <style-outline name="1" stroke="#dd000000" width="-0.3" fade="14"/>
  <!--    <style-outline name="1" stroke="#404030"/>  -->
     <style-outline name="2" stroke="#c0c0c0" />
     <style-outline name="primary"  stroke="#7f7700" width="0.025"/>
     <style-outline name="motorway" stroke="#805f2e" width="0.025"/>
-	
-    
+
+
     <!-- highway -->
     <rule e="way" k="highway" v="*">
        <rule e="way" k="*" v="*" zoom-min="3" zoom-max="5">
@@ -550,28 +550,28 @@
           </rule>
         </rule>
       </rule>
-      
+
       <rule e="way" k="*" v="*" zoom-min="11">
          <rule e="way" k="tunnel|bridge" v="~|no|false">
                <!-- highway area -->
 				    <rule e="way" k="area" v="yes|true">
-				       
+
 					      <rule e="way" k="*" v="footway" zoom-min="15">
 					        <area fill="#44ffffff" />
 					        <line stroke="#888888" width="0.15" cap="butt" />
 					      </rule>
-					
+
 					      <rule e="way" k="*" zoom-min="13" v="pedestrian|unclassified|residential|road|living_street">
 					        <area fill="#44ffffff" />
 					        <line stroke="#888888" width="1.0" fixed="true" cap="butt" />
 					      </rule>
-					
+
 					    <!--  <rule e="way" k="*" v="path" zoom-min="14">
 					        <area fill="#d0d0d0" />
 					      </rule>-->
-					  
+
 				    </rule>
-			     
+
 			    <rule e="way" k="area" v="~|no|false">
 	          <rule e="way" k="*" v="*" zoom-min="15">
 	            <rule e="way" k="*" v="steps">
@@ -586,21 +586,21 @@
 	            <!--   <use-outline name="1"/> -->
 	            </rule>
 	          </rule>
-	
+
 	          <rule e="way" k="*" v="*" zoom-min="14">
 	            <rule e="way" k="*" v="track|footway|path|cycleway" zoom-max="15">
 	              <use-line name="footway"/>
 	            </rule>
-	
+
 	            <rule e="way" k="*" v="bridleway">
 	              <use-line name="bridleway"/>
 	            </rule>
-	
+
 	            <rule e="way" k="*" v="construction">
 	              <use-line name="construction"/>
 	              <use-outline name="1"/>
 	            </rule>
-	            
+
 	            <rule e="way" k="*" v="service">
 	              <rule e="way" k="service" v="-|parking_aisle">
 	            	  <use-line name="highway-service"/>
@@ -612,71 +612,71 @@
                 </rule> -->
               </rule>
 	          </rule>
-           
+
 	          <rule e="way" k="*" v="trunk_link|motorway_link">
 	            <use-line name="trunk_link"/>
 	            <use-outline name="motorway"/>
-	         	  <use-text name="major-road"/> 
+	         	  <use-text name="major-road"/>
 	          </rule>
-	          
+
 	          <rule e="way" k="*" v="*" zoom-min="13">
 	             <rule e="way" k="*" v="byway|pedestrian">
               	<use-line name="residential" width="-0.4"/>
                 <use-outline name="1"/>
               	<use-text name="road"/>
               </rule>
-	            
-	            <rule e="way" k="*" v="residential|road|unclassified|living_street">	              
+
+	            <rule e="way" k="*" v="residential|road|unclassified|living_street">
               	<use-line name="residential"/>
-               	 <use-outline name="1"/>  
-              	
-              		<use-outline name="glow"/> 
+               	 <use-outline name="1"/>
+
+              		<use-outline name="glow"/>
               		<use-text name="road"/>
               </rule>
 	          </rule>
-	
+
 	          <rule e="way" k="*" v="tertiary|secondary_link">
 	            <use-line name="tertiary"/>
-	            <use-outline name="1"/>  
-	            
+	            <use-outline name="1"/>
+
 	            	            <use-outline name="glow"/>
-	            
-	   			    <use-text name="road"/>    
+
+	   			    <use-text name="road"/>
 	          </rule>
-	
+
 	          <rule e="way" k="*" v="secondary|primary_link">
 	            <!-- <line stroke="#fff939" width="1.6" /> -->
 	            <use-line name="secondary:z11"/>
 	            <use-outline name="primary"/>
-	            <use-text name="major-road"/>    
+	            <use-text name="major-road"/>
 	          </rule>
-	
+
 	          <rule e="way" k="*" v="primary">
-	            <use-line name="primary:z11"/>        
+	            <use-line name="primary:z11"/>
 	         		<use-outline name="primary"/>
-	         	  <use-text name="major-road"/>    
+	         	  <use-text name="major-road"/>
 	          </rule>
-	
+
 	          <rule e="way" k="*" v="trunk">
 	             <use-line name="trunk"/>
 	             <use-outline name="motorway"/>
-	             <use-text name="major-road"/>   
+	             <use-text name="major-road"/>
 	          </rule>
-	
+
 	          <rule e="way" k="*" v="motorway">
 	            <use-line name="highway:z11"/>
-	            <use-outline name="motorway"/>	            
-	            <use-text name="major-road"/>   
+	            <use-outline name="motorway"/>
+	            <use-text name="major-road"/>
 	          </rule>
-	        </rule> <!-- end area=~|no|false --> 
+	        </rule> <!-- end area=~|no|false -->
         </rule> <!-- end tunnel|bridge=~|no|false -->
-   
-	 
+
+
 	      <rule e="way" k="bridge" v="yes|true|viaduct|suspension">
           <rule e="way" k="area" v="~|no|false">
-				 
+
 	          <style-outline name="bridge" stroke="#aa202020" width="0.08"/>
-	            
+
             <rule e="way" k="*" v="*" zoom-min="15">
 	            <rule e="way" k="*" v="steps">
 	              <use-line name="steps"/>
@@ -685,95 +685,95 @@
 	            <rule e="way" k="*" v="track|footway|path|cycleway" zoom-min="16" zoom-max="16">
 	              <use-line name="footway:z16"/>
 	            </rule>
-	            
+
 	            <rule e="way" k="*" v="track|footway|path|cycleway" zoom-min="17">
 	              <use-line name="footway:z17" cap="butt"/>
 	              <use-outline name="bridge"/>
 	            </rule>
 	          </rule>
-	
+
 	          <rule e="way" k="*" v="*" zoom-min="14">
 	            <rule e="way" k="*" v="track|footway|path|cycleway" zoom-max="15">
 	               <use-line name="footway"/>
 	            </rule>
-	
+
 	            <rule e="way" k="*" v="bridleway">
 	              <use-line name="bridleway"/>
 	            </rule>
-	
+
 	            <rule e="way" k="*" v="construction">
 	              <use-line name="construction" cap="square"/>
 	              <use-outline name="bridge"/>
 	            </rule>
-	          
+
 	            <rule e="way" k="*" v="service">
             	  <use-line name="highway-service" cap="square"/>
                 <use-outline name="bridge"/>
               </rule>
 	          </rule>
-            
+
 	          <rule e="way" k="*" v="*" zoom-min="13">
 	            <rule e="way" k="*" v="byway|pedestrian">
 	             	<use-line name="pedestrian:bridge"/>
 	              <use-outline name="bridge"/>
 	            	<use-text name="road"/>
-	            </rule>	            
+	            </rule>
 	            <rule e="way" k="*" v="residential|road|unclassified|living_street">
              		<use-line name="residential:bridge"/>
              	 	<use-outline name="bridge"/>
              		<use-text name="road"/>
-	            </rule> 
+	            </rule>
 	          </rule>
-	
+
 	          <rule e="way" k="*" v="tertiary|secondary_link">
 	            <use-line name="tertiary" cap="square"/>
 	            <use-outline name="bridge"/>
-	   			    <use-text name="road"/>    
+	   			    <use-text name="road"/>
 	          </rule>
-	
+
 	          <rule e="way" k="*" v="trunk_link|motorway_link">
 	            <use-line name="trunk_link" cap="square"/>
 	            <use-outline name="bridge"/>
-	         	  <use-text name="major-road"/> 
+	         	  <use-text name="major-road"/>
 	          </rule>
-	
+
 	          <rule e="way" k="*" v="secondary|primary_link">
 	           <!--  <line stroke="#fff939" width="1.6" cap="butt" /> -->
 	            <use-line name="secondary:z11" cap="square"/>
 	            <use-outline name="bridge"/>
-	            <use-text name="major-road"/>    
+	            <use-text name="major-road"/>
 	          </rule>
-	
+
 	          <rule e="way" k="*" v="primary">
-	            <use-line name="primary:z11" cap="square"/>        
+	            <use-line name="primary:z11" cap="square"/>
 	         		<use-outline name="bridge"/>
-	         	  <use-text name="major-road"/>    
+	         	  <use-text name="major-road"/>
 	          </rule>
-	
+
 	          <rule e="way" k="*" v="trunk">
 	             <use-line name="trunk" cap="square"/>
 	             <use-outline name="bridge"/>
-	             <use-text name="major-road"/>   
+	             <use-text name="major-road"/>
 	          </rule>
-	
+
 	          <rule e="way" k="*" v="motorway">
 	            <use-line name="highway:z11" cap="square"/>
 	            <use-outline name="bridge"/>
-	            <use-text name="major-road"/>   
-	          </rule> 
+	            <use-text name="major-road"/>
+	          </rule>
           </rule> <!-- end area=~|no|false -->
-          
+
           <rule e="way" k="area" v="yes|true">
 			      <rule e="way" k="*" v="footway" zoom-min="15">
 			        <area fill="#fefefe" />
 			        <line stroke="#c0c0c0" width="0.15" cap="butt" />
 			      </rule>
-			
+
 			      <rule e="way" k="*" zoom-min="13" v="pedestrian|service|unclassified|residential|road|living_street">
 			        <area fill="#ffffff" />
 			        <line stroke="#d0d0d0" width="1.0" fixed="true" cap="butt" />
 			      </rule>
-			
+
 			    	<!--  <rule e="way" k="*" v="path" zoom-min="14">
 			        <area fill="#d0d0d0" />
 			      </rule>-->
@@ -781,7 +781,7 @@
         </rule>  <!-- end bridge=yes -->
       </rule> <!-- end zoom-min=11 -->
     </rule> <!-- end highway -->
-     
+
 
     <!-- runways cores -->
     <rule e="way" k="aeroway" v="*">
@@ -808,7 +808,7 @@
 
     <!-- barriers -->
     <rule e="way" k="barrier" v="*">
-      <!-- <rule e="way" k="*" v="fence|wall|city_wall" zoom-min="15"> <line 
+      <!-- <rule e="way" k="*" v="fence|wall|city_wall" zoom-min="15"> <line
            stroke="#909090" width="0.1" cap="butt" /> </rule> -->
       <rule e="way" k="*" v="retaining_wall" zoom-min="15">
         <line stroke="#888888" width="0.1" cap="butt" />
@@ -817,17 +817,17 @@
 
 
     <!-- non-physical routes -->
-    <!-- <rule e="way" k="route" v="ferry"> <line stroke="#707070" width="0.3" 
+    <!-- <rule e="way" k="route" v="ferry"> <line stroke="#707070" width="0.3"
          stroke-dasharray="15,10" cap="butt" /> </rule> -->
 
     <!-- aerial ways -->
-    <!-- <rule e="way" k="aerialway" v="*"> <line stroke="#202020" width="0.4" 
-         cap="butt" /> <rule e="way" k="aerialway" v="cable_car"> <lineSymbol 
-         src="jar:/org/mapsforge/android/maps/rendertheme/osmarender/symbols/cable_car.png" 
-         /> </rule> <rule e="way" k="aerialway" v="chair_lift"> <lineSymbol src="jar:/org/mapsforge/android/maps/rendertheme/osmarender/symbols/chair_lift_2.png" 
-         /> </rule> <rule e="way" k="aerialway" v="gondola"> <lineSymbol src="jar:/org/mapsforge/android/maps/rendertheme/osmarender/symbols/gondola.png" 
-         /> </rule> <rule e="way" k="*" v="*" zoom-min="14"> <text k="name" font-style="bold" 
-         font-size="10" fill="#606060" stroke="#ffffff" width="2.0" /> </rule> 
+    <!-- <rule e="way" k="aerialway" v="*"> <line stroke="#202020" width="0.4"
+         cap="butt" /> <rule e="way" k="aerialway" v="cable_car"> <lineSymbol
+         src="jar:/org/mapsforge/android/maps/rendertheme/osmarender/symbols/cable_car.png"
+         /> </rule> <rule e="way" k="aerialway" v="chair_lift"> <lineSymbol src="jar:/org/mapsforge/android/maps/rendertheme/osmarender/symbols/chair_lift_2.png"
+         /> </rule> <rule e="way" k="aerialway" v="gondola"> <lineSymbol src="jar:/org/mapsforge/android/maps/rendertheme/osmarender/symbols/gondola.png"
+         /> </rule> <rule e="way" k="*" v="*" zoom-min="14"> <text k="name" font-style="bold"
+         font-size="10" fill="#606060" stroke="#ffffff" width="2.0" /> </rule>
          </rule> -->
 
 
@@ -837,7 +837,7 @@
 
         <rule e="way" k="railway" v="station">
           <area fill="#aa000000" />
-          <line stroke="#cccccc" width="1.0" fixed="true"/>  
+          <line stroke="#cccccc" width="1.0" fixed="true"/>
         </rule>
 
         <!-- railway bridge casings -->
@@ -867,15 +867,15 @@
           <line stroke="#a0a0a0" width="0.9" cap="butt" fixed="true" />
 
         </rule>
-       
+
        <rule e="way" k="railway" v="rail|turntable" zoom-max="15">
           <line stroke="#ddaa9988" width="1.0" cap="butt" fixed="true" fade="12"/>
         </rule>
-        
+
         <rule e="way" k="railway" v="rail|turntable" zoom-min="16">
           <line stroke="#ddaa9988" width="1.0" cap="butt" fixed="true" fade="12" stipple="1"/>
         </rule>
-        
+
         <!-- <rule e="way" k="railway" v="rail" zoom-max="14" zoom-min="13">
              <line stroke="#8888aa" width="0.6" cap="butt"
              fixed="true" />
@@ -892,22 +892,22 @@
 
 
     <!-- non-physical boundaries -->
-    <!-- <rule e="way" k="boundary" v="*"> <rule e="way" k="boundary" v="national_park"> 
-         <line stroke="#4ef94b" width="0.25" stroke-dasharray="15, 5, 5, 5" 
+    <!-- <rule e="way" k="boundary" v="*"> <rule e="way" k="boundary" v="national_park">
+         <line stroke="#4ef94b" width="0.25" stroke-dasharray="15, 5, 5, 5"
          /> -->
 
     <!--<rule e="way" k="boundary" v="administrative"> -->
     <rule e="way" k="admin_level" v="*">
-      <!-- <rule e="way" k="admin_level" v="11"> <line stroke="#f9574b" width="0.1" 
-           fixed="true" cap="butt" /> </rule> <rule e="way" k="admin_level" 
-           v="10"> <line stroke="#f9574b" width="0.1" fixed="true" cap="butt" 
-           /> </rule> <rule e="way" k="admin_level" v="9"> <line stroke="#f9574b" width="0.1" 
-           fixed="true" cap="butt" /> </rule> <rule e="way" k="admin_level" 
-           v="8"> <line stroke="#f9574b" width="0.3" fixed="true" cap="butt" 
-           /> </rule> <rule e="way" k="admin_level" v="7"> <line stroke="#f9574b" width="0.1" 
-           fixed="true" cap="butt" /> </rule> <rule e="way" k="admin_level" 
-           v="6"> <line stroke="#f9574b" width="0.15" fixed="true" cap="butt" 
-           /> </rule> <rule e="way" k="admin_level" v="5"> <line stroke="#f9574b" width="0.15" 
+      <!-- <rule e="way" k="admin_level" v="11"> <line stroke="#f9574b" width="0.1"
+           fixed="true" cap="butt" /> </rule> <rule e="way" k="admin_level"
+           v="10"> <line stroke="#f9574b" width="0.1" fixed="true" cap="butt"
+           /> </rule> <rule e="way" k="admin_level" v="9"> <line stroke="#f9574b" width="0.1"
+           fixed="true" cap="butt" /> </rule> <rule e="way" k="admin_level"
+           v="8"> <line stroke="#f9574b" width="0.3" fixed="true" cap="butt"
+           /> </rule> <rule e="way" k="admin_level" v="7"> <line stroke="#f9574b" width="0.1"
+           fixed="true" cap="butt" /> </rule> <rule e="way" k="admin_level"
+           v="6"> <line stroke="#f9574b" width="0.15" fixed="true" cap="butt"
+           /> </rule> <rule e="way" k="admin_level" v="5"> <line stroke="#f9574b" width="0.15"
            fixed="true" cap="butt" /> </rule> -->
       <rule e="way" k="admin_level" v="4">
         <line stroke="#8f80dd" width="1.2" fixed="true" cap="butt" />
@@ -958,22 +958,22 @@
      <rule e="node" k="debug" v="*" >
         <caption k="name" font-size="16" fill="#fefece"/>
       </rule>
-      
+
 
     <!-- highway -->
-    <!-- <rule e="node" k="highway" v="*"> <rule e="node" k="highway" v="turning_circle"> 
+    <!-- <rule e="node" k="highway" v="*"> <rule e="node" k="highway" v="turning_circle">
          <circle r="1.4" scale-radius="true" fill="#ffffff" /> </rule> </rule> -->
 
     <!-- historic -->
-    <!-- <rule e="node" k="historic" v="*"> <circle r="3" fill="#4040ff" stroke="#606060" 
-         width="1.5" /> <rule e="node" k="*" v="*" zoom-min="17"> <caption 
-         k="name" dy="-10" font-style="bold" font-size="10" fill="#4040ff" stroke="#ffffff" 
+    <!-- <rule e="node" k="historic" v="*"> <circle r="3" fill="#4040ff" stroke="#606060"
+         width="1.5" /> <rule e="node" k="*" v="*" zoom-min="17"> <caption
+         k="name" dy="-10" font-style="bold" font-size="10" fill="#4040ff" stroke="#ffffff"
          width="2.0" /> </rule> </rule> -->
 
 
     <!-- house numbers -->
-    <!-- <rule e="node" k="addr:housenumber" v="*" zoom-min="18"> <caption 
-         k="addr:housenumber" font-style="bold" font-size="10" fill="#606060" stroke="#ffffff" 
+    <!-- <rule e="node" k="addr:housenumber" v="*" zoom-min="18"> <caption
+         k="addr:housenumber" font-style="bold" font-size="10" fill="#606060" stroke="#ffffff"
          width="2.0" /> </rule> -->
 
 
@@ -982,19 +982,19 @@
     <rule e="node" k="place" v="*">
       <rule e="node" k="*" v="suburb|town|village">
         <caption k="name" font-size="20" fill="#eeeeee"
-                 stroke="#000020" stroke-width="4.0" />
+                 stroke="#000020" stroke-width="4.0" priority="2"/>
       </rule>
       <rule e="node" k="*" v="island" zoom-min="10">
         <caption k="name" font-style="bold" font-size="20" fill="#ffffff"
-                 stroke="#ffffff" stroke-width="1.0" />
+                 stroke="#ffffff" stroke-width="1.0" priority="1"/>
       </rule>
       <rule e="node" k="*" v="city">
         <caption k="name" font-style="bold" font-size="22" fill="#ffffff"
-                 stroke="#002020" stroke-width="4.0" />
+                 stroke="#002020" stroke-width="4.0" priority="1"/>
       </rule>
       <rule e="node" k="*" v="country">
         <caption k="name" font-size="22" fill="#ffffff"
-                 stroke="#000000" stroke-width="2.0" />
+                 stroke="#000000" stroke-width="2.0" priority="0"/>
       </rule>
     </rule>
 
@@ -1003,12 +1003,12 @@
     <rule e="node" k="railway" v="*">
       <rule e="node" k="*" v="station" zoom-min="14">
         <circle r="6" fill="#ec2d2d" stroke="#606060" stroke-width="1.5" />
-        <!-- <caption k="name" dy="-10" font-style="bold" font-size="13" fill="#ec2d2d" 
+        <!-- <caption k="name" dy="-10" font-style="bold" font-size="13" fill="#ec2d2d"
              stroke="#ffffff" stroke-width="2.0" /> -->
       </rule>
       <rule e="node" k="*" v="halt|tram_stop" zoom-min="17">
         <circle r="4" fill="#ec2d2d" stroke="#606060" stroke-width="1.5" />
-        <!-- <caption k="name" dy="-15" font-style="bold" font-size="11" fill="#ec2d2d" 
+        <!-- <caption k="name" dy="-15" font-style="bold" font-size="11" fill="#ec2d2d"
              stroke="#ffffff" stroke-width="2.0" /> -->
       </rule>
     </rule>