From 5615604170ea4d46a99293f4165e91f00b042681 Mon Sep 17 00:00:00 2001
From: Emux <devemux86@gmail.com>
Date: Thu, 12 Oct 2017 10:46:26 +0300
Subject: [PATCH] Render themes improvements #41

---
 .../org/oscim/tiling/source/mapnik/carto.xml  |  6 +++---
 vtm-themes/resources/assets/vtm/default.xml   |  8 ++++----
 vtm-themes/resources/assets/vtm/mapzen.xml    |  8 ++++----
 vtm-themes/resources/assets/vtm/newtron.xml   | 20 +++++++++----------
 .../resources/assets/vtm/openmaptiles.xml     |  8 ++++----
 vtm-themes/resources/assets/vtm/osmagray.xml  | 16 +++++++--------
 .../resources/assets/vtm/osmarender.xml       | 16 +++++++--------
 .../resources/assets/vtm/tronrender.xml       | 16 +++++++--------
 .../resources/assets/vtm/default_atlas.xml    |  6 +++---
 9 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/vtm-extras/src/org/oscim/tiling/source/mapnik/carto.xml b/vtm-extras/src/org/oscim/tiling/source/mapnik/carto.xml
index e165aae9..219d6d72 100644
--- a/vtm-extras/src/org/oscim/tiling/source/mapnik/carto.xml
+++ b/vtm-extras/src/org/oscim/tiling/source/mapnik/carto.xml
@@ -631,7 +631,7 @@
         <!--
           <m k="historic"> <circle r="3" fill="#4040ff" stroke="#606060"
           width="1.5" /> <m zoom-min="17"> <caption
-          k="name" dy="-10" font-style="bold" font-size="10" fill="#4040ff" stroke="#ffffff"
+          k="name" dy="10" font-style="bold" font-size="10" fill="#4040ff" stroke="#ffffff"
           width="2.0" /> </m> </m>
         -->
         <!-- house numbers -->
@@ -674,14 +674,14 @@
             <m v="station" zoom-min="14">
                 <circle fill="#ec2d2d" r="6" stroke="#606060" stroke-width="1.5" />
                 <!--
-                  <caption k="name" dy="-10" font-style="bold" font-size="13" fill="#ec2d2d"
+                  <caption k="name" dy="15" font-style="bold" font-size="13" fill="#ec2d2d"
                   stroke="#ffffff" stroke-width="2.0" />
                 -->
             </m>
             <m v="halt|tram_stop" zoom-min="17">
                 <circle fill="#ec2d2d" r="4" stroke="#606060" stroke-width="1.5" />
                 <!--
-                  <caption k="name" dy="-15" font-style="bold" font-size="11" fill="#ec2d2d"
+                  <caption k="name" dy="10" font-style="bold" font-size="11" fill="#ec2d2d"
                   stroke="#ffffff" stroke-width="2.0" />
                 -->
             </m>
diff --git a/vtm-themes/resources/assets/vtm/default.xml b/vtm-themes/resources/assets/vtm/default.xml
index 21da8638..40849752 100644
--- a/vtm-themes/resources/assets/vtm/default.xml
+++ b/vtm-themes/resources/assets/vtm/default.xml
@@ -1126,13 +1126,13 @@
         <m k="railway">
             <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"
+                <caption style="bold" dy="20" fill="#ec2d2d" k="name" size="14" stroke="#ffffff"
                     stroke-width="2.0" />
             </m>
 
             <m v="halt|tram_stop">
                 <symbol src="assets:symbols/transport/tram_stop.svg" />
-                <caption style="bold" dy="-20" fill="#ec2d2d" k="name" size="14" stroke="#ffffff"
+                <caption style="bold" dy="20" fill="#ec2d2d" k="name" size="14" stroke="#ffffff"
                     stroke-width="2.0" />
             </m>
             <m v="level_crossing">
@@ -1353,9 +1353,9 @@
 
         <m k="natural" v="peak" zoom-min="12">
             <symbol src="assets:symbols/peak.svg" />
-            <caption style="bold" dy="12" fill="#4D2F08" k="ele" size="12" stroke="#ffffff"
+            <caption style="bold" dy="12" fill="#4D2F08" k="name" size="14" stroke="#ffffff"
                 stroke-width="2.0" />
-            <caption style="bold" dy="-12" fill="#4D2F08" k="name" size="14" stroke="#ffffff"
+            <caption style="bold" dy="-12" fill="#4D2F08" k="ele" size="12" stroke="#ffffff"
                 stroke-width="2.0" />
         </m>
 
diff --git a/vtm-themes/resources/assets/vtm/mapzen.xml b/vtm-themes/resources/assets/vtm/mapzen.xml
index 7fc003cf..6001e2f9 100644
--- a/vtm-themes/resources/assets/vtm/mapzen.xml
+++ b/vtm-themes/resources/assets/vtm/mapzen.xml
@@ -1148,13 +1148,13 @@
         <m k="kind">
             <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"
+                <caption style="bold" dy="20" fill="#ec2d2d" k="name" size="14" stroke="#ffffff"
                     stroke-width="2.0" />
             </m>
 
             <m v="halt|tram_stop">
                 <symbol src="assets:symbols/transport/tram_stop.svg" />
-                <caption style="bold" dy="-20" fill="#ec2d2d" k="name" size="14" stroke="#ffffff"
+                <caption style="bold" dy="20" fill="#ec2d2d" k="name" size="14" stroke="#ffffff"
                     stroke-width="2.0" />
             </m>
             <m v="level_crossing">
@@ -1376,9 +1376,9 @@
 
         <m k="kind" v="peak" zoom-min="12">
             <symbol src="assets:symbols/peak.svg" />
-            <caption style="bold" dy="12" fill="#4D2F08" k="ele" size="12" stroke="#ffffff"
+            <caption style="bold" dy="12" fill="#4D2F08" k="name" size="14" stroke="#ffffff"
                 stroke-width="2.0" />
-            <caption style="bold" dy="-12" fill="#4D2F08" k="name" size="14" stroke="#ffffff"
+            <caption style="bold" dy="-12" fill="#4D2F08" k="ele" size="12" stroke="#ffffff"
                 stroke-width="2.0" />
         </m>
 
diff --git a/vtm-themes/resources/assets/vtm/newtron.xml b/vtm-themes/resources/assets/vtm/newtron.xml
index c434cf81..09d33e03 100644
--- a/vtm-themes/resources/assets/vtm/newtron.xml
+++ b/vtm-themes/resources/assets/vtm/newtron.xml
@@ -1217,7 +1217,7 @@
         </m>
 
 
-        <!--<m k="natural">
+        <m k="natural">
             <m select="first">
                 <m v="cave_entrance" zoom-min="15">
                     <symbol src="assets:symbols/poi/cave.svg" />
@@ -1227,20 +1227,20 @@
                 </m>
                 <m v="peak" zoom-min="12">
                     <symbol src="assets:symbols/peak.svg" />
-                    <caption style="bold" dy="12" fill="#4D2F08" k="ele" size="12" stroke="#ffffff"
+                    <caption style="bold" dy="12" fill="#4D2F08" k="name" size="14" stroke="#ffffff"
+                        stroke-width="2.0" />
+                    <caption style="bold" dy="-12" fill="#4D2F08" k="ele" size="12" stroke="#ffffff"
                         stroke-width="2.0" />
-                    <caption style="bold" dy="-12" fill="#4D2F08" k="name" size="14"
-                        stroke="#ffffff" stroke-width="2.0" />
                 </m>
                 <m v="volcano" zoom-min="12">
                     <symbol src="assets:symbols/volcano.svg" />
-                    <caption style="bold" dy="12" fill="#4D2F08" k="ele" size="12" stroke="#ffffff"
+                    <caption style="bold" dy="12" fill="#4D2F08" k="name" size="14" stroke="#ffffff"
+                        stroke-width="2.0" />
+                    <caption style="bold" dy="-12" fill="#4D2F08" k="ele" size="12" stroke="#ffffff"
                         stroke-width="2.0" />
-                    <caption style="bold" dy="-12" fill="#4D2F08" k="name" size="14"
-                        stroke="#ffffff" stroke-width="2.0" />
                 </m>
             </m>
-        </m>-->
+        </m>
 
 
         <m k="place" select="first">
@@ -1281,12 +1281,12 @@
             </m>
             <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"
+                <caption style="bold" dy="20" fill="#ec2d2d" k="name" size="14" stroke="#ffffff"
                     stroke-width="2.0" />
             </m>
             <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"
+                <caption style="bold" dy="20" fill="#ec2d2d" k="name" size="14" stroke="#ffffff"
                     stroke-width="2.0" />
             </m>
         </m>
diff --git a/vtm-themes/resources/assets/vtm/openmaptiles.xml b/vtm-themes/resources/assets/vtm/openmaptiles.xml
index 7ab7ecf4..c599619c 100644
--- a/vtm-themes/resources/assets/vtm/openmaptiles.xml
+++ b/vtm-themes/resources/assets/vtm/openmaptiles.xml
@@ -1122,13 +1122,13 @@
         <m k="railway">
             <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"
+                <caption style="bold" dy="20" fill="#ec2d2d" k="name" size="14" stroke="#ffffff"
                     stroke-width="2.0" />
             </m>
 
             <m v="halt|tram_stop">
                 <symbol src="assets:symbols/transport/tram_stop.svg" />
-                <caption style="bold" dy="-20" fill="#ec2d2d" k="name" size="14" stroke="#ffffff"
+                <caption style="bold" dy="20" fill="#ec2d2d" k="name" size="14" stroke="#ffffff"
                     stroke-width="2.0" />
             </m>
             <m v="level_crossing">
@@ -1349,9 +1349,9 @@
 
         <m k="natural" v="peak" zoom-min="12">
             <symbol src="assets:symbols/peak.svg" />
-            <caption style="bold" dy="12" fill="#4D2F08" k="ele" size="12" stroke="#ffffff"
+            <caption style="bold" dy="12" fill="#4D2F08" k="name" size="14" stroke="#ffffff"
                 stroke-width="2.0" />
-            <caption style="bold" dy="-12" fill="#4D2F08" k="name" size="14" stroke="#ffffff"
+            <caption style="bold" dy="-12" fill="#4D2F08" k="ele" size="12" stroke="#ffffff"
                 stroke-width="2.0" />
         </m>
 
diff --git a/vtm-themes/resources/assets/vtm/osmagray.xml b/vtm-themes/resources/assets/vtm/osmagray.xml
index 91a59740..775c76f9 100644
--- a/vtm-themes/resources/assets/vtm/osmagray.xml
+++ b/vtm-themes/resources/assets/vtm/osmagray.xml
@@ -1282,17 +1282,17 @@
                 </m>
                 <m v="peak" zoom-min="12">
                     <symbol src="assets:symbols/peak.svg" />
-                    <caption style="bold" dy="12" fill="#323232" k="ele" size="12" stroke="#ffffff"
+                    <caption style="bold" dy="12" fill="#323232" k="name" size="14" stroke="#ffffff"
+                        stroke-width="2.0" />
+                    <caption style="bold" dy="-12" fill="#323232" k="ele" size="12" stroke="#ffffff"
                         stroke-width="2.0" />
-                    <caption style="bold" dy="-12" fill="#323232" k="name" size="14"
-                        stroke="#ffffff" stroke-width="2.0" />
                 </m>
                 <m v="volcano" zoom-min="12">
                     <symbol src="assets:symbols/volcano.svg" />
-                    <caption style="bold" dy="12" fill="#323232" k="ele" size="12" stroke="#ffffff"
+                    <caption style="bold" dy="12" fill="#323232" k="name" size="14" stroke="#ffffff"
+                        stroke-width="2.0" />
+                    <caption style="bold" dy="-12" fill="#323232" k="ele" size="12" stroke="#ffffff"
                         stroke-width="2.0" />
-                    <caption style="bold" dy="-12" fill="#323232" k="name" size="14"
-                        stroke="#ffffff" stroke-width="2.0" />
                 </m>
             </m>
         </m>
@@ -1336,12 +1336,12 @@
             </m>
             <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"
+                <caption style="bold" dy="20" fill="#ec2d2d" k="name" size="14" stroke="#ffffff"
                     stroke-width="2.0" />
             </m>
             <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"
+                <caption style="bold" dy="20" fill="#ec2d2d" k="name" size="14" stroke="#ffffff"
                     stroke-width="2.0" />
             </m>
         </m>
diff --git a/vtm-themes/resources/assets/vtm/osmarender.xml b/vtm-themes/resources/assets/vtm/osmarender.xml
index 322dbc00..d5125d08 100644
--- a/vtm-themes/resources/assets/vtm/osmarender.xml
+++ b/vtm-themes/resources/assets/vtm/osmarender.xml
@@ -1282,17 +1282,17 @@
                 </m>
                 <m v="peak" zoom-min="12">
                     <symbol src="assets:symbols/peak.svg" />
-                    <caption style="bold" dy="12" fill="#4D2F08" k="ele" size="12" stroke="#ffffff"
+                    <caption style="bold" dy="12" fill="#4D2F08" k="name" size="14" stroke="#ffffff"
+                        stroke-width="2.0" />
+                    <caption style="bold" dy="-12" fill="#4D2F08" k="ele" size="12" stroke="#ffffff"
                         stroke-width="2.0" />
-                    <caption style="bold" dy="-12" fill="#4D2F08" k="name" size="14"
-                        stroke="#ffffff" stroke-width="2.0" />
                 </m>
                 <m v="volcano" zoom-min="12">
                     <symbol src="assets:symbols/volcano.svg" />
-                    <caption style="bold" dy="12" fill="#4D2F08" k="ele" size="12" stroke="#ffffff"
+                    <caption style="bold" dy="12" fill="#4D2F08" k="name" size="14" stroke="#ffffff"
+                        stroke-width="2.0" />
+                    <caption style="bold" dy="-12" fill="#4D2F08" k="ele" size="12" stroke="#ffffff"
                         stroke-width="2.0" />
-                    <caption style="bold" dy="-12" fill="#4D2F08" k="name" size="14"
-                        stroke="#ffffff" stroke-width="2.0" />
                 </m>
             </m>
         </m>
@@ -1336,12 +1336,12 @@
             </m>
             <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"
+                <caption style="bold" dy="20" fill="#ec2d2d" k="name" size="14" stroke="#ffffff"
                     stroke-width="2.0" />
             </m>
             <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"
+                <caption style="bold" dy="20" fill="#ec2d2d" k="name" size="14" stroke="#ffffff"
                     stroke-width="2.0" />
             </m>
         </m>
diff --git a/vtm-themes/resources/assets/vtm/tronrender.xml b/vtm-themes/resources/assets/vtm/tronrender.xml
index fd164f2b..54b01dc1 100644
--- a/vtm-themes/resources/assets/vtm/tronrender.xml
+++ b/vtm-themes/resources/assets/vtm/tronrender.xml
@@ -1220,17 +1220,17 @@
                 </m>
                 <m v="peak" zoom-min="12">
                     <symbol src="assets:symbols/peak.svg" />
-                    <caption style="bold" dy="12" fill="#4D2F08" k="ele" size="12" stroke="#ffffff"
+                    <caption style="bold" dy="12" fill="#4D2F08" k="name" size="14" stroke="#ffffff"
+                        stroke-width="2.0" />
+                    <caption style="bold" dy="-12" fill="#4D2F08" k="ele" size="12" stroke="#ffffff"
                         stroke-width="2.0" />
-                    <caption style="bold" dy="-12" fill="#4D2F08" k="name" size="14"
-                        stroke="#ffffff" stroke-width="2.0" />
                 </m>
                 <m v="volcano" zoom-min="12">
                     <symbol src="assets:symbols/volcano.svg" />
-                    <caption style="bold" dy="12" fill="#4D2F08" k="ele" size="12" stroke="#ffffff"
+                    <caption style="bold" dy="12" fill="#4D2F08" k="name" size="14" stroke="#ffffff"
+                        stroke-width="2.0" />
+                    <caption style="bold" dy="-12" fill="#4D2F08" k="ele" size="12" stroke="#ffffff"
                         stroke-width="2.0" />
-                    <caption style="bold" dy="-12" fill="#4D2F08" k="name" size="14"
-                        stroke="#ffffff" stroke-width="2.0" />
                 </m>
             </m>
         </m>
@@ -1274,12 +1274,12 @@
             </m>
             <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"
+                <caption style="bold" dy="20" fill="#ec2d2d" k="name" size="14" stroke="#ffffff"
                     stroke-width="2.0" />
             </m>
             <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"
+                <caption style="bold" dy="20" fill="#ec2d2d" k="name" size="14" stroke="#ffffff"
                     stroke-width="2.0" />
             </m>
         </m>
diff --git a/vtm-web-app/resources/assets/vtm/default_atlas.xml b/vtm-web-app/resources/assets/vtm/default_atlas.xml
index 6b834522..2bc7f83a 100644
--- a/vtm-web-app/resources/assets/vtm/default_atlas.xml
+++ b/vtm-web-app/resources/assets/vtm/default_atlas.xml
@@ -1008,7 +1008,7 @@
         <!-- historic -->
         <!-- <m k="historic"> <circle r="3" fill="#4040ff" stroke="#606060"
           width="1.5" /> <m zoom-min="17"> <caption
-          k="name" dy="-10" style="bold" size="10" fill="#4040ff" stroke="#ffffff"
+          k="name" dy="10" style="bold" size="10" fill="#4040ff" stroke="#ffffff"
           width="2.0" /> </m> </m> -->
 
         <!-- house numbers -->
@@ -1054,13 +1054,13 @@
         <m k="railway">
             <m v="station" zoom-min="14">
                 <circle fill="#ec2d2d" radius="6" stroke="#606060" stroke-width="1.5" />
-                <caption style="bold" dy="-10" fill="#ec2d2d" k="name" size="13" stroke="#ffffff"
+                <caption style="bold" dy="15" fill="#ec2d2d" k="name" size="13" stroke="#ffffff"
                     stroke-width="2.0" />
             </m>
 
             <m v="halt|tram_stop">
                 <circle fill="#ec2d2d" radius="4" stroke="#606060" stroke-width="1.5" />
-                <caption style="bold" dy="-15" fill="#ec2d2d" k="name" size="11" stroke="#ffffff"
+                <caption style="bold" dy="10" fill="#ec2d2d" k="name" size="11" stroke="#ffffff"
                     stroke-width="2.0" />
             </m>
             <m v="level_crossing">