From 88f3283878fbaf64ac05ef763cd4434cff6165c2 Mon Sep 17 00:00:00 2001
From: Emux <devemux86@gmail.com>
Date: Thu, 29 Dec 2016 17:17:48 +0200
Subject: [PATCH] Render themes improvements #41

---
 vtm-themes/resources/assets/vtm/default.xml   | 80 +++++++++----------
 vtm-themes/resources/assets/vtm/newtron.xml   | 62 +++++++-------
 .../resources/assets/vtm/osmarender.xml       | 54 ++++++-------
 .../resources/assets/vtm/tronrender.xml       | 68 ++++++++--------
 4 files changed, 128 insertions(+), 136 deletions(-)

diff --git a/vtm-themes/resources/assets/vtm/default.xml b/vtm-themes/resources/assets/vtm/default.xml
index c4f40c97..a4ef62af 100644
--- a/vtm-themes/resources/assets/vtm/default.xml
+++ b/vtm-themes/resources/assets/vtm/default.xml
@@ -502,10 +502,10 @@
                     </m>
                     <!-- railway tunnel -->
                     <m k="railway">
-                        <!-- <m k="railway" v="tram|subway|light_rail|narrow_gauge">
+                        <!-- <m v="tram|subway|light_rail|narrow_gauge">
                           <line stroke="#a0a0a0" width="0.8" cap="butt" fix="true"/>
                           </m> -->
-                        <m k="railway" v="rail">
+                        <m v="rail">
                             <line cap="butt" fix="true" stroke="#aa888888" width="0.9" />
                         </m>
                     </m>
@@ -859,49 +859,49 @@
         <m k="railway" zoom-min="12">
             <m k="tunnel" v="~|false|no">
 
-                <m k="railway" v="station">
+                <m v="station">
                     <area fill="#dbdbc9" stroke="#707070" stroke-width="0.3" />
                 </m>
 
                 <!-- railway bridge casings -->
                 <m zoom-min="14">
                     <m k="bridge" v="yes|true">
-                        <m k="railway" v="tram">
+                        <m v="tram">
                             <line cap="butt" fix="true" stroke="#777777" width="0.9" />
                         </m>
-                        <m k="railway" v="subway|light_rail|narrow_gauge">
+                        <m v="subway|light_rail|narrow_gauge">
                             <line cap="butt" fix="true" stroke="#777777" width="0.9" />
                         </m>
-                        <m k="railway" v="rail">
+                        <m v="rail">
                             <line cap="butt" fix="true" stroke="#777777" width="0.9" />
                         </m>
                     </m>
                 </m>
 
                 <!-- railway casings and cores -->
-                <m k="railway" v="tram" zoom-min="15">
+                <m v="tram" zoom-min="15">
                     <line fix="true" stroke="#887766" width="1.0" />
                 </m>
-                <m k="railway" v="light_rail|subway|narrow_gauge" zoom-min="14">
+                <m v="light_rail|subway|narrow_gauge" zoom-min="14">
                     <line cap="butt" fix="true" stroke="#a0a0a0" width="0.9" />
                 </m>
-                <m k="railway" v="rail|turntable" zoom-max="14">
+                <m v="rail|turntable" zoom-max="14">
                     <line cap="butt" fade="12" fix="true" stroke="#ddaa9988" width="1.0" />
                 </m>
-                <m k="railway" v="rail|turntable" zoom-min="15">
+                <m v="rail|turntable" zoom-min="15">
                     <line cap="butt" fade="12" fix="true" stipple="10" stipple-stroke="#ffffff"
                         stipple-width="0.8" stroke="#aaa6a4" width="2.0" />
                 </m>
 
-                <!-- <m k="railway" v="rail" zoom-max="14" zoom-min="13">
+                <!-- <m v="rail" zoom-max="14" zoom-min="13">
                   <line stroke="#8888aa" width="0.6" cap="butt"
                   fix="true" />
                   </m> -->
-                <!-- <m k="railway" v="rail" zoom-max="13" zoom-min="11">
+                <!-- <m v="rail" zoom-max="13" zoom-min="11">
                   <line stroke="#bbbbcc" width="0.8" cap="butt" fix="true" />
                   </m> -->
                 <!-- whatever railway:spur means ... -->
-                <m k="railway" v="disused|spur|abandoned|preserved">
+                <m v="disused|spur|abandoned|preserved">
                     <line cap="butt" fade="12" fix="true" stroke="#cccccc" width="0.8" />
                 </m>
             </m>
@@ -921,11 +921,11 @@
 
         <!--<m k="boundary" v="administrative"> -->
         <m k="admin_level">
-            <m k="admin_level" v="4">
+            <m v="4">
                 <line fix="true" stipple="4" stipple-stroke="#888888" stipple-width="1.0"
                     stroke="#dadada" width="1.3" />
             </m>
-            <m k="admin_level" v="2">
+            <m v="2">
                 <line fix="true" stipple="6" stipple-stroke="#647b9c" stipple-width="1.0"
                     stroke="#dadada" width="1.6" />
             </m>
@@ -1062,10 +1062,10 @@
 
         <!-- aeroway -->
         <m k="aeroway">
-            <m k="aeroway" v="helipad" zoom-min="16">
+            <m v="helipad" zoom-min="16">
                 <symbol src="assets:symbols/transport/helicopter.svg" />
             </m>
-            <m k="aeroway" v="aerodrome|airport" zoom-min="9">
+            <m v="aerodrome|airport" zoom-min="9">
                 <symbol src="assets:symbols/transport/airport2.svg" />
             </m>
         </m>
@@ -1076,16 +1076,16 @@
                 <m v="hospital">
                     <symbol src="assets:symbols/health/hospital.svg" />
                 </m>
-                <m k="amenity" v="school">
+                <m v="school">
                     <symbol src="assets:symbols/education/school.svg" />
                 </m>
-                <m k="amenity" v="university|college">
+                <m v="university|college">
                     <symbol src="assets:symbols/education/university.svg" />
                 </m>
-                <m k="amenity" v="library">
+                <m v="library">
                     <symbol src="assets:symbols/amenity/library.svg" />
                 </m>
-                <m k="amenity" v="cinema">
+                <m v="cinema">
                     <symbol src="assets:symbols/tourist/cinema2.svg" />
                 </m>
 
@@ -1113,7 +1113,7 @@
                 <m v="restaurant">
                     <symbol src="assets:symbols/food/restaurant.svg" />
                 </m>
-                <m k="amenity" v="bus_station">
+                <m v="bus_station">
                     <symbol src="assets:symbols/transport/bus_station.svg" />
                 </m>
                 <m select="when-matched">
@@ -1122,37 +1122,37 @@
             </m>
 
             <m select="first" zoom-min="17">
-                <m k="amenity" v="bank">
+                <m v="bank">
                     <symbol src="assets:symbols/money/bank2.svg" />
                 </m>
-                <!--<m k="amenity" v="bench">
+                <!--<m v="bench">
                     <symbol src="assets:symbols/bench.svg" />
                 </m>-->
-                <m k="amenity" v="bicycle_rental">
+                <m v="bicycle_rental">
                     <symbol src="assets:symbols/transport/rental_bicycle.svg" />
                 </m>
-                <m k="amenity" v="drinking_water">
+                <m v="drinking_water">
                     <symbol src="assets:symbols/food/drinkingtap.svg" />
                 </m>
-                <m k="amenity" v="fire_station">
+                <m v="fire_station">
                     <symbol src="assets:symbols/amenity/firestation3.svg" />
                 </m>
-                <m k="amenity" v="fountain">
+                <m v="fountain">
                     <symbol src="assets:symbols/amenity/fountain2.svg" />
                 </m>
-                <m k="amenity" v="fuel">
+                <m v="fuel">
                     <symbol src="assets:symbols/transport/fuel.svg" />
                 </m>
-                <m k="amenity" v="kindergarten">
+                <m v="kindergarten">
                     <symbol src="assets:symbols/education/nursery3.svg" />
                 </m>
-                <m k="amenity" v="parking">
+                <m v="parking">
                     <symbol src="assets:symbols/transport/parking.svg" />
                 </m>
-                <m k="amenity" v="pharmacy">
+                <m v="pharmacy">
                     <symbol src="assets:symbols/health/pharmacy.svg" />
                 </m>
-                <m k="amenity" v="place_of_worship">
+                <m v="place_of_worship">
                     <m k="denomination|religion" v="buddhist">
                         <symbol src="assets:symbols/place_of_worship/buddhist.svg" />
                     </m>
@@ -1175,22 +1175,22 @@
                         <symbol src="assets:symbols/place_of_worship/unknown.svg" />
                     </m>
                 </m>
-                <m k="amenity" v="post_box">
+                <m v="post_box">
                     <symbol src="assets:symbols/amenity/post_box.svg" />
                 </m>
-                <m k="amenity" v="post_office">
+                <m v="post_office">
                     <symbol src="assets:symbols/amenity/post_office.svg" />
                 </m>
-                <m k="amenity" v="recycling">
+                <m v="recycling">
                     <symbol src="assets:symbols/amenity/recycling.svg" />
                 </m>
-                <m k="amenity" v="shelter">
+                <m v="shelter">
                     <symbol src="assets:symbols/accommodation/shelter2.svg" />
                 </m>
-                <m k="amenity" v="telephone">
+                <m v="telephone">
                     <symbol src="assets:symbols/amenity/telephone.svg" />
                 </m>
-                <m k="amenity" v="theatre">
+                <m v="theatre">
                     <symbol src="assets:symbols/tourist/theatre.svg" />
                 </m>
                 <m select="when-matched">
@@ -1199,7 +1199,7 @@
             </m>
 
             <m zoom-min="17">
-                <m k="amenity" v="toilets">
+                <m v="toilets">
                     <symbol src="assets:symbols/amenity/toilets.svg" />
                 </m>
             </m>
diff --git a/vtm-themes/resources/assets/vtm/newtron.xml b/vtm-themes/resources/assets/vtm/newtron.xml
index 9a7208bd..8530e4d3 100644
--- a/vtm-themes/resources/assets/vtm/newtron.xml
+++ b/vtm-themes/resources/assets/vtm/newtron.xml
@@ -452,10 +452,10 @@
 
             <!-- railway tunnel -->
             <m k="railway">
-                <!-- <m k="railway" v="tram|subway|light_rail|narrow_gauge">
+                <!-- <m v="tram|subway|light_rail|narrow_gauge">
                   <line stroke="#a0a0a0" width="0.8" cap="butt" fix="true"/>
                   </m> -->
-                <m k="railway" v="rail">
+                <m v="rail">
                     <line cap="butt" fix="true" stroke="#aaaaaa" width="0.9" />
                 </m>
             </m>
@@ -870,7 +870,7 @@
         <m k="railway" zoom-min="12">
             <m k="tunnel" v="~|false|no">
 
-                <m k="railway" v="station">
+                <m v="station">
                     <area fill="#aa000000" />
                     <line fix="true" stroke="#cccccc" width="1.0" />
                 </m>
@@ -878,29 +878,29 @@
                 <!-- railway bridge casings -->
                 <m zoom-min="14">
                     <m k="bridge" v="yes|true">
-                        <m k="railway" v="tram">
+                        <m v="tram">
                             <line cap="butt" fix="true" stroke="#777777" width="0.9" />
                         </m>
-                        <m k="railway" v="subway|light_rail|narrow_gauge">
+                        <m v="subway|light_rail|narrow_gauge">
                             <line cap="butt" fix="true" stroke="#777777" width="0.9" />
                         </m>
-                        <m k="railway" v="rail">
+                        <m v="rail">
                             <line cap="butt" fix="true" stroke="#777777" width="0.9" />
                         </m>
                     </m>
                 </m>
 
                 <!-- railway casings and cores -->
-                <m k="railway" v="tram" zoom-min="15">
+                <m v="tram" zoom-min="15">
                     <line fix="true" stroke="#887766" width="1.0" />
                 </m>
 
-                <m k="railway" v="light_rail|subway|narrow_gauge" zoom-min="14">
+                <m v="light_rail|subway|narrow_gauge" zoom-min="14">
                     <line cap="butt" fix="true" stroke="#a0a0a0" width="0.9" />
 
                 </m>
 
-                <m k="railway" v="rail|turntable">
+                <m v="rail|turntable">
                     <line cap="butt" fade="12" fix="true" stipple="12" stipple-stroke="#ff000000"
                         stipple-width="1.0" stroke="#dd00ffff" width="2.0" />
 
@@ -909,15 +909,15 @@
                 </m>
 
 
-                <!-- <m k="railway" v="rail" zoom-max="14" zoom-min="13">
+                <!-- <m v="rail" zoom-max="14" zoom-min="13">
                   <line stroke="#8888aa" width="0.6" cap="butt"
                   fix="true" />
                   </m> -->
-                <!-- <m k="railway" v="rail" zoom-max="13" zoom-min="11">
+                <!-- <m v="rail" zoom-max="13" zoom-min="11">
                   <line stroke="#bbbbcc" width="0.8" cap="butt" fix="true" />
                   </m> -->
                 <!-- whatever railway:spur means ... -->
-                <m k="railway" v="disused|spur|abandoned|preserved">
+                <m v="disused|spur|abandoned|preserved">
                     <line cap="butt" fade="12" fix="true" stroke="#cccccc" width="0.8" />
                 </m>
             </m>
@@ -931,27 +931,23 @@
 
         <!--<m k="boundary" v="administrative"> -->
         <m k="admin_level">
-            <!-- <m k="admin_level" v="11"> <line stroke="#f9574b" width="0.1"
-              fix="true" cap="butt" /> </m> <m k="admin_level"
-              v="10"> <line stroke="#f9574b" width="0.1" fix="true" cap="butt"
-              /> </m> <m k="admin_level" v="9"> <line stroke="#f9574b" width="0.1"
-              fix="true" cap="butt" /> </m> <m k="admin_level"
-              v="8"> <line stroke="#f9574b" width="0.3" fix="true" cap="butt"
-              /> </m> <m k="admin_level" v="7"> <line stroke="#f9574b" width="0.1"
-              fix="true" cap="butt" /> </m> <m k="admin_level"
-              v="6"> <line stroke="#f9574b" width="0.15" fix="true" cap="butt"
-              /> </m> <m k="admin_level" v="5"> <line stroke="#f9574b" width="0.15"
-              fix="true" cap="butt" /> </m> -->
-            <m k="admin_level" v="4">
+            <!-- <m v="11"> <line stroke="#f9574b" width="0.1" fix="true" cap="butt" /> </m>
+            <m v="10"> <line stroke="#f9574b" width="0.1" fix="true" cap="butt" /> </m>
+            <m v="9"> <line stroke="#f9574b" width="0.1" fix="true" cap="butt" /> </m>
+            <m v="8"> <line stroke="#f9574b" width="0.3" fix="true" cap="butt" /> </m>
+            <m v="7"> <line stroke="#f9574b" width="0.1" fix="true" cap="butt" /> </m>
+            <m v="6"> <line stroke="#f9574b" width="0.15" fix="true" cap="butt" /> </m>
+            <m v="5"> <line stroke="#f9574b" width="0.15" fix="true" cap="butt" /> </m> -->
+            <m v="4">
                 <line cap="butt" fix="true" stroke="#8f80dd" width="1.2" />
             </m>
-            <m k="admin_level" v="3">
+            <m v="3">
                 <line cap="butt" fix="true" stroke="#0000ff" width="1.0" />
             </m>
-            <m k="admin_level" v="2">
+            <m v="2">
                 <line blur="0.3" cap="butt" fix="true" stroke="#dddddd" width="1.0" />
             </m>
-            <m k="admin_level" v="1">
+            <m v="1">
                 <line cap="butt" fix="true" stroke="#ff0000" width="0.95" />
             </m>
 
@@ -1000,10 +996,10 @@
     <m e="node" select="first">
 
         <m k="aeroway">
-            <m k="aeroway" v="helipad" zoom-min="17">
+            <m v="helipad" zoom-min="17">
                 <symbol src="assets:symbols/transport/helicopter.svg" />
             </m>
-            <m k="aeroway" v="aerodrome|airport" zoom-max="13" zoom-min="9">
+            <m v="aerodrome|airport" zoom-max="13" zoom-min="9">
                 <symbol src="assets:symbols/transport/airport2.svg" />
             </m>
         </m>
@@ -1215,19 +1211,19 @@
 
 
         <m k="railway">
-            <m k="railway" v="crossing" zoom-min="16">
+            <m v="crossing" zoom-min="16">
                 <symbol src="assets:symbols/railway-crossing-small.svg" />
             </m>
             <!-- in Bremen this is also used for crossings between tram-lines and roads... -->
-            <m k="railway" v="level_crossing" zoom-min="14">
+            <m v="level_crossing" zoom-min="14">
                 <symbol src="assets:symbols/railway-crossing.svg" />
             </m>
-            <m k="railway" v="station" zoom-min="14">
+            <m v="station" zoom-min="14">
                 <symbol src="assets:symbols/transport/train_station2.svg" />
                 <caption style="bold" dy="-20" fill="#ec2d2d" k="name" size="14" stroke="#ffffff"
                     stroke-width="2.0" />
             </m>
-            <m k="railway" v="halt|tram_stop" zoom-min="15">
+            <m v="halt|tram_stop" zoom-min="15">
                 <symbol src="assets:symbols/transport/tram_stop.svg" />
                 <caption style="bold" dy="-20" fill="#ec2d2d" k="name" size="14" stroke="#ffffff"
                     stroke-width="2.0" />
diff --git a/vtm-themes/resources/assets/vtm/osmarender.xml b/vtm-themes/resources/assets/vtm/osmarender.xml
index b6c52683..b3a5bb0d 100644
--- a/vtm-themes/resources/assets/vtm/osmarender.xml
+++ b/vtm-themes/resources/assets/vtm/osmarender.xml
@@ -895,11 +895,11 @@
 
         <!-- runways cores -->
         <m k="aeroway">
-            <m k="aeroway" v="runway">
+            <m v="runway">
                 <line cap="square" stroke="#d4dcbd" width="4.5" />
                 <outline use="casing" />
             </m>
-            <m k="aeroway" v="taxiway">
+            <m v="taxiway">
                 <line cap="butt" stroke="#d4dcbd" width="1.8" />
                 <outline use="casing" />
             </m>
@@ -970,43 +970,43 @@
         <m k="railway">
             <m k="tunnel" v="~|false|no">
 
-                <m k="railway" v="station">
+                <m v="station">
                     <area fill="#9b9b79" stroke="#707070" stroke-width="0.3" />
                 </m>
 
                 <m k="bridge" v="yes|true">
-                    <m k="railway" v="tram">
+                    <m v="tram">
                         <line cap="butt" fix="true" stroke="#cc000000" width="1.4" />
                     </m>
-                    <m k="railway" v="subway|light_rail|narrow_gauge">
+                    <m v="subway|light_rail|narrow_gauge">
                         <line cap="butt" fix="true" stroke="#cc000000" width="1.6" />
                     </m>
-                    <m k="railway" v="rail">
+                    <m v="rail">
                         <line cap="butt" fix="true" stroke="#cc000000" width="1.6" />
                     </m>
                 </m>
 
-                <m k="railway" v="tram">
+                <m v="tram">
                     <line cap="butt" stroke="#e6b7e6" width="0.25" />
                     <line cap="butt" dasharray="12,18" stroke="#4c0f4c" width="0.25" />
                 </m>
-                <m k="railway" v="subway">
+                <m v="subway">
                     <line cap="butt" stroke="#0f0f4c" width="0.4" />
                     <line cap="butt" dasharray="12,18" stroke="#b7b7e6" width="0.25" />
                 </m>
-                <m k="railway" v="light_rail">
+                <m v="light_rail">
                     <!-- <line stroke="#0f4c0f" width="0.4" cap="butt" />
                       <line stroke="#b7e6e6" width="0.25" cap="butt" />
                       <line stroke="#0f4c0f" width="0.25" dasharray="12,18" cap="butt" /> -->
                     <line cap="butt" fade="12" stipple="10" stipple-stroke="#b7e6e6"
                         stipple-width="0.8" stroke="#0f4c0f" width="0.4" />
                 </m>
-                <m k="railway" v="narrow_gauge">
+                <m v="narrow_gauge">
                     <line cap="butt" stroke="#333333" width="0.4" />
                     <line cap="butt" stroke="#e6e6e6" width="0.25" />
                     <line cap="butt" dasharray="18,18" stroke="#333333" width="0.25" />
                 </m>
-                <m k="railway" v="rail">
+                <m v="rail">
                     <!-- <line stroke="#333333" width="0.55" cap="butt" />
                       <line stroke="#e6e6e6" width="0.4" cap="butt" />
                       <line stroke="#333333" width="0.4" dasharray="15,15" cap="butt" /> -->
@@ -1023,36 +1023,36 @@
             </m>
             <m k="boundary" v="administrative">
                 <m k="admin_level">
-                    <m k="admin_level" v="11">
+                    <m v="11">
                         <line dasharray="1, 5" fix="true" stroke="#f9574b" width="1.1" />
                     </m>
-                    <m k="admin_level" v="10">
+                    <m v="10">
                         <line dasharray="5, 25" fix="true" stroke="#f9574b" width="1.1" />
                     </m>
-                    <m k="admin_level" v="9">
+                    <m v="9">
                         <line dasharray="15, 15" fix="true" stroke="#f9574b" width="1.1" />
                     </m>
-                    <m k="admin_level" v="8">
+                    <m v="8">
                         <line dasharray="15, 5, 5, 5" fix="true" stroke="#f9574b" width="1.1" />
                     </m>
-                    <m k="admin_level" v="7">
+                    <m v="7">
                         <line fix="true" stroke="#f9574b" width="1.1" />
                     </m>
-                    <m k="admin_level" v="6">
+                    <m v="6">
                         <line dasharray="5, 5" fix="true" stroke="#f9574b" width="1.25" />
                     </m>
-                    <m k="admin_level" v="5">
+                    <m v="5">
                         <line dasharray="15, 15" fix="true" stroke="#f9574b" width="1.25" />
                     </m>
-                    <m k="admin_level" v="4">
+                    <m v="4">
                         <line dasharray="15, 5, 5, 5" fix="true" stipple="4"
                             stipple-stroke="#f9574b" stipple-width="0.9" stroke="#00000000"
                             width="1.25" />
                     </m>
-                    <m k="admin_level" v="3">
+                    <m v="3">
                         <line fix="true" stroke="#f9574b" width="1.25" />
                     </m>
-                    <m k="admin_level" v="2">
+                    <m v="2">
                         <!-- <line stroke="#80ffff00" width="0.75" />
                           <line stroke="#f9574b" width="1.25" fix="true" dasharray="15, 15" /> -->
                         <line dasharray="15, 5, 5, 5" fix="true" stipple="6"
@@ -1078,10 +1078,10 @@
     <m e="node" select="first">
 
         <m k="aeroway">
-            <m k="aeroway" v="helipad" zoom-min="17">
+            <m v="helipad" zoom-min="17">
                 <symbol src="assets:symbols/transport/helicopter.svg" />
             </m>
-            <m k="aeroway" v="aerodrome|airport" zoom-max="13" zoom-min="9">
+            <m v="aerodrome|airport" zoom-max="13" zoom-min="9">
                 <symbol src="assets:symbols/transport/airport2.svg" />
             </m>
         </m>
@@ -1293,19 +1293,19 @@
 
 
         <m k="railway">
-            <m k="railway" v="crossing" zoom-min="16">
+            <m v="crossing" zoom-min="16">
                 <symbol src="assets:symbols/railway-crossing-small.svg" />
             </m>
             <!-- in Bremen this is also used for crossings between tram-lines and roads... -->
-            <m k="railway" v="level_crossing" zoom-min="14">
+            <m v="level_crossing" zoom-min="14">
                 <symbol src="assets:symbols/railway-crossing.svg" />
             </m>
-            <m k="railway" v="station" zoom-min="14">
+            <m v="station" zoom-min="14">
                 <symbol src="assets:symbols/transport/train_station2.svg" />
                 <caption style="bold" dy="-20" fill="#ec2d2d" k="name" size="14" stroke="#ffffff"
                     stroke-width="2.0" />
             </m>
-            <m k="railway" v="halt|tram_stop" zoom-min="15">
+            <m v="halt|tram_stop" zoom-min="15">
                 <symbol src="assets:symbols/transport/tram_stop.svg" />
                 <caption style="bold" dy="-20" fill="#ec2d2d" k="name" size="14" stroke="#ffffff"
                     stroke-width="2.0" />
diff --git a/vtm-themes/resources/assets/vtm/tronrender.xml b/vtm-themes/resources/assets/vtm/tronrender.xml
index 102e8d9a..8552536c 100644
--- a/vtm-themes/resources/assets/vtm/tronrender.xml
+++ b/vtm-themes/resources/assets/vtm/tronrender.xml
@@ -452,10 +452,10 @@
 
             <!-- railway tunnel -->
             <m k="railway">
-                <!-- <m k="railway" v="tram|subway|light_rail|narrow_gauge">
+                <!-- <m v="tram|subway|light_rail|narrow_gauge">
                   <line stroke="#a0a0a0" width="0.8" cap="butt" fix="true"/>
                   </m> -->
-                <m k="railway" v="rail">
+                <m v="rail">
                     <line cap="butt" fix="true" stroke="#aaaaaa" width="0.9" />
                 </m>
             </m>
@@ -863,7 +863,7 @@
         <m k="railway" zoom-min="12">
             <m k="tunnel" v="~|false|no">
 
-                <m k="railway" v="station">
+                <m v="station">
                     <area fill="#aa000000" />
                     <line fix="true" stroke="#cccccc" width="1.0" />
                 </m>
@@ -871,46 +871,46 @@
                 <!-- railway bridge casings -->
                 <m zoom-min="14">
                     <m k="bridge" v="yes|true">
-                        <m k="railway" v="tram">
+                        <m v="tram">
                             <line cap="butt" fix="true" stroke="#777777" width="0.9" />
                         </m>
-                        <m k="railway" v="subway|light_rail|narrow_gauge">
+                        <m v="subway|light_rail|narrow_gauge">
                             <line cap="butt" fix="true" stroke="#777777" width="0.9" />
                         </m>
-                        <m k="railway" v="rail">
+                        <m v="rail">
                             <line cap="butt" fix="true" stroke="#777777" width="0.9" />
                         </m>
                     </m>
                 </m>
 
                 <!-- railway casings and cores -->
-                <m k="railway" v="tram" zoom-min="15">
+                <m v="tram" zoom-min="15">
                     <line fix="true" stroke="#887766" width="1.0" />
                 </m>
 
-                <m k="railway" v="light_rail|subway|narrow_gauge" zoom-min="14">
+                <m v="light_rail|subway|narrow_gauge" zoom-min="14">
                     <line cap="butt" fix="true" stroke="#a0a0a0" width="0.9" />
 
                 </m>
 
-                <m k="railway" v="rail|turntable" zoom-max="15">
+                <m v="rail|turntable" zoom-max="15">
                     <line cap="butt" fade="12" fix="true" stroke="#ddaa9988" width="1.0" />
                 </m>
 
-                <m k="railway" v="rail|turntable" zoom-min="16">
-                    <line cap="butt" fade="12" fix="true" stipple="1" stroke="#ddaa9988"
-                        width="1.0" />
+                <m v="rail|turntable" zoom-min="16">
+                    <line cap="butt" fade="12" fix="true" stipple="12" stroke="#ddaa9988"
+                        width="2.0" />
                 </m>
 
-                <!-- <m k="railway" v="rail" zoom-max="14" zoom-min="13">
+                <!-- <m v="rail" zoom-max="14" zoom-min="13">
                   <line stroke="#8888aa" width="0.6" cap="butt"
                   fix="true" />
                   </m> -->
-                <!-- <m k="railway" v="rail" zoom-max="13" zoom-min="11">
+                <!-- <m v="rail" zoom-max="13" zoom-min="11">
                   <line stroke="#bbbbcc" width="0.8" cap="butt" fix="true" />
                   </m> -->
                 <!-- whatever railway:spur means ... -->
-                <m k="railway" v="disused|spur|abandoned|preserved">
+                <m v="disused|spur|abandoned|preserved">
                     <line cap="butt" fade="12" fix="true" stroke="#cccccc" width="0.8" />
                 </m>
             </m>
@@ -924,27 +924,23 @@
 
         <!--<m k="boundary" v="administrative"> -->
         <m k="admin_level">
-            <!-- <m k="admin_level" v="11"> <line stroke="#f9574b" width="0.1"
-              fix="true" cap="butt" /> </m> <m k="admin_level"
-              v="10"> <line stroke="#f9574b" width="0.1" fix="true" cap="butt"
-              /> </m> <m k="admin_level" v="9"> <line stroke="#f9574b" width="0.1"
-              fix="true" cap="butt" /> </m> <m k="admin_level"
-              v="8"> <line stroke="#f9574b" width="0.3" fix="true" cap="butt"
-              /> </m> <m k="admin_level" v="7"> <line stroke="#f9574b" width="0.1"
-              fix="true" cap="butt" /> </m> <m k="admin_level"
-              v="6"> <line stroke="#f9574b" width="0.15" fix="true" cap="butt"
-              /> </m> <m k="admin_level" v="5"> <line stroke="#f9574b" width="0.15"
-              fix="true" cap="butt" /> </m> -->
-            <m k="admin_level" v="4">
+            <!-- <m v="11"> <line stroke="#f9574b" width="0.1" fix="true" cap="butt" /> </m>
+            <m v="10"> <line stroke="#f9574b" width="0.1" fix="true" cap="butt" /> </m>
+            <m v="9"> <line stroke="#f9574b" width="0.1" fix="true" cap="butt" /> </m>
+            <m v="8"> <line stroke="#f9574b" width="0.3" fix="true" cap="butt" /> </m>
+            <m v="7"> <line stroke="#f9574b" width="0.1" fix="true" cap="butt" /> </m>
+            <m v="6"> <line stroke="#f9574b" width="0.15" fix="true" cap="butt" /> </m>
+            <m v="5"> <line stroke="#f9574b" width="0.15" fix="true" cap="butt" /> </m> -->
+            <m v="4">
                 <line cap="butt" fix="true" stroke="#8f80dd" width="1.2" />
             </m>
-            <m k="admin_level" v="3">
+            <m v="3">
                 <line cap="butt" fix="true" stroke="#0000ff" width="1.0" />
             </m>
-            <m k="admin_level" v="2">
+            <m v="2">
                 <line blur="0.3" cap="butt" fix="true" stroke="#dddddd" width="1.0" />
             </m>
-            <m k="admin_level" v="1">
+            <m v="1">
                 <line cap="butt" fix="true" stroke="#ff0000" width="0.95" />
             </m>
 
@@ -993,10 +989,10 @@
     <m e="node" select="first">
 
         <m k="aeroway">
-            <m k="aeroway" v="helipad" zoom-min="17">
+            <m v="helipad" zoom-min="17">
                 <symbol src="assets:symbols/transport/helicopter.svg" />
             </m>
-            <m k="aeroway" v="aerodrome|airport" zoom-max="13" zoom-min="9">
+            <m v="aerodrome|airport" zoom-max="13" zoom-min="9">
                 <symbol src="assets:symbols/transport/airport2.svg" />
             </m>
         </m>
@@ -1208,19 +1204,19 @@
 
 
         <m k="railway">
-            <m k="railway" v="crossing" zoom-min="16">
+            <m v="crossing" zoom-min="16">
                 <symbol src="assets:symbols/railway-crossing-small.svg" />
             </m>
             <!-- in Bremen this is also used for crossings between tram-lines and roads... -->
-            <m k="railway" v="level_crossing" zoom-min="14">
+            <m v="level_crossing" zoom-min="14">
                 <symbol src="assets:symbols/railway-crossing.svg" />
             </m>
-            <m k="railway" v="station" zoom-min="14">
+            <m v="station" zoom-min="14">
                 <symbol src="assets:symbols/transport/train_station2.svg" />
                 <caption style="bold" dy="-20" fill="#ec2d2d" k="name" size="14" stroke="#ffffff"
                     stroke-width="2.0" />
             </m>
-            <m k="railway" v="halt|tram_stop" zoom-min="15">
+            <m v="halt|tram_stop" zoom-min="15">
                 <symbol src="assets:symbols/transport/tram_stop.svg" />
                 <caption style="bold" dy="-20" fill="#ec2d2d" k="name" size="14" stroke="#ffffff"
                     stroke-width="2.0" />