From 0a23dc2c27ef93f98e4bb40e05e43728e3d4efe2 Mon Sep 17 00:00:00 2001
From: Hannes Janetzek <hannes.janetzek@gmail.com>
Date: Sun, 9 Mar 2014 21:50:02 +0100
Subject: [PATCH] theming changes:

- select="first" also add its renderstyles when no sub-rule matched
  ... before they where only added when one subrule matched

- use select="when-matched" as last subrule in select="first" rules
  instead.
---
 .../resources/assets/styles/default.xml       | 37 ++++++++++++-------
 .../resources/assets/styles/osmarender.xml    | 28 +++++++-------
 .../resources/assets/styles/tronrender.xml    | 12 +++---
 3 files changed, 44 insertions(+), 33 deletions(-)

diff --git a/vtm-themes/resources/assets/styles/default.xml b/vtm-themes/resources/assets/styles/default.xml
index c2e33b93..9b40e02a 100644
--- a/vtm-themes/resources/assets/styles/default.xml
+++ b/vtm-themes/resources/assets/styles/default.xml
@@ -79,7 +79,7 @@
     stipple-stroke="#be6253" />
   <style-line id="water:outline" stroke="#a4bbcc" width="1.0" fix="true" cap="butt" />
 
-  <style-line id="water" stroke="#a4bbcc" width="1.0" cap="butt" fix="true"/>
+  <style-line id="water" stroke="#a4bbcc" width="1.0" cap="butt" fix="true" />
   <style-line id="river" use="water" stroke="#a4bbcc" fix="false" />
 
   <!--<style-area id="water" fill="#97b7e5" afc5e3 /> -->
@@ -143,7 +143,7 @@
   </atlas>
 
   <!-- all closed ways that are not 'highway' or 'building'-->
-  
+
   <m e="way" k="highway|building" v="~" closed="yes">
 
     <!-- landuse base -->
@@ -151,11 +151,11 @@
       <m v="urban">
         <area fill="#f4f3f0" />
       </m>
-      
+
       <m v="meadow|conservation">
         <area use="greens" fade="11" />
       </m>
-      
+
       <m v="residential|commercial|retail|farmyard">
         <area use="residential" />
       </m>
@@ -1064,7 +1064,10 @@
         <m k="amenity" v="cinema">
           <symbol src="cinema" />
         </m>
-        <text use="poi" />
+
+        <m select="when-matched">
+          <text use="poi" />
+        </m>
       </m>
 
       <m zoom-min="16" select="first">
@@ -1089,7 +1092,9 @@
         <m k="amenity" v="bus_station">
           <symbol src="bus_station" />
         </m>
-        <text use="poi" />
+        <m select="when-matched">
+          <text use="poi" />
+        </m>
       </m>
 
       <m zoom-min="17" select="first">
@@ -1152,7 +1157,9 @@
         <m k="amenity" v="theatre">
           <symbol src="theatre" />
         </m>
-        <text use="poi" />
+        <m select="when-matched">
+          <text use="poi" />
+        </m>
       </m>
 
       <m zoom-min="17">
@@ -1176,17 +1183,18 @@
         <m v="supermarket|organic">
           <symbol src="shop_supermarket" />
         </m>
-        <m>
+
+        <m zoom-min="17">
           <symbol src="city" />
         </m>
-      </m>
-      <m zoom-min="17">
-        <text use="poi" />
+
+        <m select="when-matched" zoom-min="17">
+          <text use="poi" />
+        </m>
       </m>
     </m>
 
     <m k="tourism">
-
       <m zoom-min="15" select="first">
         <m v="alpine_hut">
           <symbol src="triangle-stroked" />
@@ -1200,7 +1208,10 @@
         <m v="hotel">
           <symbol src="hotel" />
         </m>
-        <text use="poi" />
+
+        <m select="when-matched">
+          <text use="poi" />
+        </m>
       </m>
 
       <m zoom-min="16" select="first">
diff --git a/vtm-themes/resources/assets/styles/osmarender.xml b/vtm-themes/resources/assets/styles/osmarender.xml
index 18ed3052..5ae034bc 100644
--- a/vtm-themes/resources/assets/styles/osmarender.xml
+++ b/vtm-themes/resources/assets/styles/osmarender.xml
@@ -779,19 +779,19 @@
           <m k="bridge" v="yes|true">
             <m select="first">
               <m v="service">
-                <line stroke="#ffffff" width="0.85" outline="casing-bridge"/>
+                <line stroke="#ffffff" width="0.85" outline="casing-bridge" />
                 <m zoom-min="15">
                   <text k="name" style="bold" size="10" stroke="#ffffff" stroke-width="2.0" />
                 </m>
               </m>
               <m v="construction">
-                <line stroke="#d0d0d0" width="1.0" outline="casing-bridge"/>
+                <line stroke="#d0d0d0" width="1.0" outline="casing-bridge" />
                 <m zoom-min="15">
                   <text k="name" style="bold" size="10" stroke="#d0d0d0" stroke-width="2.0" />
                 </m>
               </m>
               <m v="road">
-                <line stroke="#d0d0d0" width="1.25" outline="casing-bridge"/>
+                <line stroke="#d0d0d0" width="1.25" outline="casing-bridge" />
                 <m zoom-min="15">
                   <text k="name" style="bold" size="10" stroke="#d0d0d0" stroke-width="2.0" />
                 </m>
@@ -803,69 +803,69 @@
                 </m>
               </m>
               <m v="unclassified|residential|living_street">
-                <line stroke="#ffffff" width="1.25" outline="casing-bridge"/>
+                <line stroke="#ffffff" width="1.25" outline="casing-bridge" />
                 <m zoom-min="15">
                   <text k="name" style="bold" size="10" stroke="#ffffff" stroke-width="2.0" />
                 </m>
               </m>
               <m v="byway">
-                <line stroke="#efadaa" width="1.15" outline="casing-bridge"/>
+                <line stroke="#efadaa" width="1.15" outline="casing-bridge" />
                 <m zoom-min="15">
                   <text k="name" style="bold" size="10" stroke="#efadaa" stroke-width="2.0" />
                 </m>
               </m>
               <m v="tertiary|tertiary_link">
-                <line use="tertiary" cap="square" outline="casing-bridge"/>
+                <line use="tertiary" cap="square" outline="casing-bridge" />
                 <m zoom-min="14">
                   <text k="name" style="bold" size="10" stroke="#ffff90" stroke-width="2.0" />
                 </m>
               </m>
               <m v="secondary_link">
-                <line use="secondary" width="-0.1" cap="square" outline="casing-bridge"/>
+                <line use="secondary" width="-0.1" cap="square" outline="casing-bridge" />
                 <m zoom-min="14">
                   <text k="name" style="bold" size="10" stroke="#fdbf6f" stroke-width="2.0" />
                 </m>
               </m>
               <m v="primary_link">
-                <line use="primary" width="-0.1" cap="square" outline="casing-bridge"/>
+                <line use="primary" width="-0.1" cap="square" outline="casing-bridge" />
                 <m zoom-min="14">
                   <text k="name" style="bold" size="10" stroke="#e46d71" stroke-width="2.0" />
                 </m>
               </m>
               <m v="trunk_link">
-                <line use="trunk" cap="square" outline="casing-bridge"/>
+                <line use="trunk" cap="square" outline="casing-bridge" />
                 <m zoom-min="14">
                   <text k="name" style="bold" size="10" stroke="#7fc97f" stroke-width="2.0" />
                 </m>
               </m>
               <m v="motorway_link">
-                <line use="motorway" width="-0.2" cap="square" outline="casing-bridge"/>
+                <line use="motorway" width="-0.2" cap="square" outline="casing-bridge" />
                 <m zoom-min="14">
                   <text k="name" style="bold" size="10" stroke="#809bc0" stroke-width="2.0" />
                 </m>
               </m>
               <m v="secondary">
-                <line use="secondary" cap="square" outline="casing-bridge"/>
+                <line use="secondary" cap="square" outline="casing-bridge" />
                 <m zoom-min="14">
                   <text k="name" style="bold" size="10" stroke="#fdbf6f" stroke-width="2.0" />
                 </m>
               </m>
               <m v="primary">
-                <line use="primary" cap="square" outline="casing-bridge"/>
+                <line use="primary" cap="square" outline="casing-bridge" />
                 <m zoom-min="14">
                   <text k="name" style="bold" size="10" stroke="#e46d71" stroke-width="2.0" />
                   <text k="ref" style="bold" size="12" stroke="#ffffff" fill="#606060" stroke-width="2.0" />
                 </m>
               </m>
               <m v="trunk">
-                <line use="trunk" outline="casing-bridge"/>
+                <line use="trunk" outline="casing-bridge" />
                 <m zoom-min="14">
                   <text k="name" style="bold" size="10" stroke="#7fc97f" stroke-width="2.0" />
                   <text k="ref" style="bold" size="12" stroke="#ffffff" fill="#606060" stroke-width="2.0" />
                 </m>
               </m>
               <m v="motorway">
-                <line use="motorway" cap="square" outline="casing-bridge"/>
+                <line use="motorway" cap="square" outline="casing-bridge" />
                 <m zoom-min="14">
                   <text k="name" style="bold" size="10" stroke="#809bc0" stroke-width="2.0" />
                   <text k="ref" style="bold" size="12" stroke="#ffffff" fill="#606060" stroke-width="2.0" />
diff --git a/vtm-themes/resources/assets/styles/tronrender.xml b/vtm-themes/resources/assets/styles/tronrender.xml
index 9d3d007d..a37c8cb5 100644
--- a/vtm-themes/resources/assets/styles/tronrender.xml
+++ b/vtm-themes/resources/assets/styles/tronrender.xml
@@ -2,7 +2,7 @@
 <rendertheme xmlns="http://opensciencemap.org/rendertheme" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://opensciencemap.org/rendertheme ../../rendertheme.xsd" version="1" map-background="#050508">
 
-    <atlas img="styles/osmarender.png">
+  <atlas img="styles/osmarender.png">
     <rect id="airport" pos="226 38 24 24" />
     <rect id="alpine_hut" pos="198 41 26 21" />
     <rect id="atm" pos="279 2 14 16" />
@@ -62,10 +62,10 @@
     <rect id="vulcan" pos="315 25 9 8" />
     <rect id="windmill" pos="310 2 13 19" />
   </atlas>
-  
-   <style-text id="caption-small-blue" caption="true" dy="12" k="name" style="bold" size="16" fill="#4040ff"
+
+  <style-text id="caption-small-blue" caption="true" dy="12" k="name" style="bold" size="16" fill="#4040ff"
     stroke="#ffffff" stroke-width="2.0" />
-    
+
   <style-text id="road" k="name" style="bold" size="18" stroke="#606050" fill="#eeffee" stroke-width="2.5" />
   <style-text id="major-road" k="name" style="bold" size="19" fill="#ffef7d" stroke="#624f00" stroke-width="2.5" />
 
@@ -1312,7 +1312,7 @@
     </m>
 
 
-    <m k="tourism">
+    <m k="tourism" select="first">
       <m v="alpine_hut" zoom-min="16">
         <symbol src="alpine_hut" />
       </m>
@@ -1332,7 +1332,7 @@
         <symbol src="viewpoint" />
       </m>
 
-      <m zoom-min="17">
+      <m select="when-matched" zoom-min="17">
         <text use="caption-small-blue" />
       </m>
     </m>