From c14e93e25d8f642d681825279cf5d58dd2e1e4b0 Mon Sep 17 00:00:00 2001
From: Emux <devemux86@gmail.com>
Date: Sun, 28 May 2017 21:19:59 +0300
Subject: [PATCH] Render themes: add highway ref tag #41

---
 vtm-themes/resources/assets/vtm/default.xml   | 11 ++++++
 vtm-themes/resources/assets/vtm/mapzen.xml    | 11 ++++++
 vtm-themes/resources/assets/vtm/newtron.xml   | 20 ++++++++---
 vtm-themes/resources/assets/vtm/osmagray.xml  | 36 +++++++++----------
 .../resources/assets/vtm/osmarender.xml       | 36 +++++++++----------
 .../resources/assets/vtm/tronrender.xml       | 20 ++++++++---
 6 files changed, 90 insertions(+), 44 deletions(-)

diff --git a/vtm-themes/resources/assets/vtm/default.xml b/vtm-themes/resources/assets/vtm/default.xml
index a4ef62af..9b1ffb0c 100644
--- a/vtm-themes/resources/assets/vtm/default.xml
+++ b/vtm-themes/resources/assets/vtm/default.xml
@@ -11,6 +11,8 @@
 
     <style-text style="bold" fill="#101010" id="major-road" k="name" priority="1" size="16"
         stroke="#eeeeee" stroke-width="2.0" />
+    <style-text style="bold" fill="#606060" id="ref" k="ref" priority="2" size="12" stroke="#ffffff"
+        stroke-width="2.0" />
 
     <style-text caption="true" dy="20" fill="#404000" id="poi" k="name" size="16" stroke="#aaffffff"
         stroke-width="2.0" />
@@ -488,16 +490,19 @@
                         <m v="primary">
                             <line outline="0" use="primary:z11" />
                             <text use="major-road" />
+                            <text use="ref" />
                         </m>
                         <m v="trunk">
                             <line blur="0.3" outline="0" use="trunk" />
                             <!-- <outline use="glow"/> -->
                             <text use="major-road" />
+                            <text use="ref" />
                         </m>
                         <m v="motorway">
                             <line blur="0.3" outline="0" use="highway:z11" />
                             <!-- <outline use="glow"/> -->
                             <text use="major-road" />
+                            <text use="ref" />
                         </m>
                     </m>
                     <!-- railway tunnel -->
@@ -710,14 +715,17 @@
                         <m v="primary">
                             <line outline="primary" use="primary:z11" />
                             <text use="major-road" />
+                            <text use="ref" />
                         </m>
                         <m v="trunk">
                             <line outline="motorway" use="trunk" />
                             <text use="major-road" />
+                            <text use="ref" />
                         </m>
                         <m v="motorway">
                             <line outline="motorway" use="highway:z11" />
                             <text use="major-road" />
+                            <text use="ref" />
                         </m>
                     </m> <!-- end area=~|no|false -->
                 </m><!-- end tunnel|bridge=~|no|false -->
@@ -795,14 +803,17 @@
                                 <m v="primary">
                                     <line cap="square" outline="bridge" use="primary:z11" />
                                     <text use="major-road" />
+                                    <text use="ref" />
                                 </m>
                                 <m v="trunk">
                                     <line cap="square" outline="bridge" use="trunk" />
                                     <text use="major-road" />
+                                    <text use="ref" />
                                 </m>
                                 <m v="motorway">
                                     <line cap="square" outline="bridge" use="highway:z11" />
                                     <text use="major-road" />
+                                    <text use="ref" />
                                 </m>
                             </m>
                         </m><!-- end area=~|no|false -->
diff --git a/vtm-themes/resources/assets/vtm/mapzen.xml b/vtm-themes/resources/assets/vtm/mapzen.xml
index 9e20acae..fe7da405 100644
--- a/vtm-themes/resources/assets/vtm/mapzen.xml
+++ b/vtm-themes/resources/assets/vtm/mapzen.xml
@@ -11,6 +11,8 @@
 
     <style-text style="bold" fill="#101010" id="major-road" k="name" priority="1" size="16"
         stroke="#eeeeee" stroke-width="2.0" />
+    <style-text style="bold" fill="#606060" id="ref" k="ref" priority="2" size="12" stroke="#ffffff"
+        stroke-width="2.0" />
 
     <style-text caption="true" dy="20" fill="#404000" id="poi" k="name" size="16" stroke="#aaffffff"
         stroke-width="2.0" />
@@ -485,16 +487,19 @@
                         <m v="primary">
                             <line outline="0" use="primary:z11" />
                             <text use="major-road" />
+                            <text use="ref" />
                         </m>
                         <m v="trunk">
                             <line blur="0.3" outline="0" use="trunk" />
                             <!-- <outline use="glow"/> -->
                             <text use="major-road" />
+                            <text use="ref" />
                         </m>
                         <m v="motorway">
                             <line blur="0.3" outline="0" use="highway:z11" />
                             <!-- <outline use="glow"/> -->
                             <text use="major-road" />
+                            <text use="ref" />
                         </m>
                     </m>
                     <!-- railway tunnel -->
@@ -707,14 +712,17 @@
                         <m v="primary">
                             <line outline="primary" use="primary:z11" />
                             <text use="major-road" />
+                            <text use="ref" />
                         </m>
                         <m v="trunk">
                             <line outline="motorway" use="trunk" />
                             <text use="major-road" />
+                            <text use="ref" />
                         </m>
                         <m v="motorway">
                             <line outline="motorway" use="highway:z11" />
                             <text use="major-road" />
+                            <text use="ref" />
                         </m>
                     </m> <!-- end area=~|no|false -->
                 </m><!-- end tunnel|bridge=~|no|false -->
@@ -792,14 +800,17 @@
                                 <m v="primary">
                                     <line cap="square" outline="bridge" use="primary:z11" />
                                     <text use="major-road" />
+                                    <text use="ref" />
                                 </m>
                                 <m v="trunk">
                                     <line cap="square" outline="bridge" use="trunk" />
                                     <text use="major-road" />
+                                    <text use="ref" />
                                 </m>
                                 <m v="motorway">
                                     <line cap="square" outline="bridge" use="highway:z11" />
                                     <text use="major-road" />
+                                    <text use="ref" />
                                 </m>
                             </m>
                         </m><!-- end area=~|no|false -->
diff --git a/vtm-themes/resources/assets/vtm/newtron.xml b/vtm-themes/resources/assets/vtm/newtron.xml
index 8530e4d3..9d8c2410 100644
--- a/vtm-themes/resources/assets/vtm/newtron.xml
+++ b/vtm-themes/resources/assets/vtm/newtron.xml
@@ -6,10 +6,13 @@
     <style-text style="italic" caption="true" dy="20" fill="#ee000000" id="caption-small-blue"
         k="name" size="14" stroke="#9930cfee" stroke-width="3.0" />
 
-    <style-text style="bold" fill="#eeffee" id="road" k="name" size="18" stroke="#606050"
-        stroke-width="2.5" />
-    <style-text style="bold" fill="#de3935" id="major-road" k="name" size="19" stroke="#f2df6d"
-        stroke-width="2.5" />
+    <style-text style="bold" fill="#eeffee" id="road" k="name" priority="2" size="18"
+        stroke="#606050" stroke-width="2.5" />
+
+    <style-text style="bold" fill="#de3935" id="major-road" k="name" priority="1" size="19"
+        stroke="#f2df6d" stroke-width="2.5" />
+    <style-text style="bold" fill="#606060" id="ref" k="ref" priority="2" size="12" stroke="#ffffff"
+        stroke-width="2.0" />
 
     <style-area fade="10" fill="#ff0000" id="residential" />
 
@@ -433,6 +436,7 @@
                     <line use="primary:z11" />
                     <outline use="0" />
                     <text use="major-road" />
+                    <text use="ref" />
                 </m>
 
                 <m v="trunk">
@@ -440,6 +444,7 @@
                     <outline use="0" />
                     <!-- <outline use="glow"/> -->
                     <text use="major-road" />
+                    <text use="ref" />
                 </m>
 
                 <m v="motorway">
@@ -447,6 +452,7 @@
                     <outline use="0" />
                     <!-- <outline use="glow"/> -->
                     <text use="major-road" />
+                    <text use="ref" />
                 </m>
             </m>
 
@@ -689,18 +695,21 @@
                             <line use="primary:z11" />
                             <outline use="primary" />
                             <text use="major-road" />
+                            <text use="ref" />
                         </m>
 
                         <m v="trunk">
                             <line use="trunk" />
                             <outline use="motorway" />
                             <text use="major-road" />
+                            <text use="ref" />
                         </m>
 
                         <m v="motorway">
                             <line use="highway:z11" />
                             <outline use="motorway" />
                             <text use="major-road" />
+                            <text use="ref" />
                         </m>
                     </m> <!-- end area=~|no|false -->
                 </m> <!-- end tunnel|bridge=~|no|false -->
@@ -782,18 +791,21 @@
                             <line cap="square" use="primary:z11" />
                             <outline use="bridge" />
                             <text use="major-road" />
+                            <text use="ref" />
                         </m>
 
                         <m v="trunk">
                             <line cap="square" use="trunk" />
                             <outline use="bridge" />
                             <text use="major-road" />
+                            <text use="ref" />
                         </m>
 
                         <m v="motorway">
                             <line cap="square" use="highway:z11" />
                             <outline use="bridge" />
                             <text use="major-road" />
+                            <text use="ref" />
                         </m>
                     </m> <!-- end area=~|no|false -->
 
diff --git a/vtm-themes/resources/assets/vtm/osmagray.xml b/vtm-themes/resources/assets/vtm/osmagray.xml
index 19fe7e1f..1c8c501d 100644
--- a/vtm-themes/resources/assets/vtm/osmagray.xml
+++ b/vtm-themes/resources/assets/vtm/osmagray.xml
@@ -729,27 +729,27 @@
                             <m v="primary">
                                 <line use="primary" />
                                 <m zoom-min="14">
-                                    <text style="bold" k="name" size="16" stroke="#868686"
-                                        stroke-width="2.0" />
-                                    <text style="bold" fill="#606060" k="ref" size="12"
+                                    <text style="bold" k="name" priority="1" size="16"
+                                        stroke="#868686" stroke-width="2.0" />
+                                    <text style="bold" fill="#606060" k="ref" priority="2" size="12"
                                         stroke="#ffffff" stroke-width="2.0" />
                                 </m>
                             </m>
                             <m v="trunk">
                                 <line use="trunk" />
                                 <m zoom-min="14">
-                                    <text style="bold" k="name" size="16" stroke="#b4b4b4"
-                                        stroke-width="2.0" />
-                                    <text style="bold" fill="#606060" k="ref" size="12"
+                                    <text style="bold" k="name" priority="1" size="16"
+                                        stroke="#b4b4b4" stroke-width="2.0" />
+                                    <text style="bold" fill="#606060" k="ref" priority="2" size="12"
                                         stroke="#ffffff" stroke-width="2.0" />
                                 </m>
                             </m>
                             <m v="motorway">
                                 <line use="motorway" />
                                 <m zoom-min="14">
-                                    <text style="bold" k="name" size="16" stroke="#979797"
-                                        stroke-width="2.0" />
-                                    <text style="bold" fill="#606060" k="ref" size="12"
+                                    <text style="bold" k="name" priority="1" size="16"
+                                        stroke="#979797" stroke-width="2.0" />
+                                    <text style="bold" fill="#606060" k="ref" priority="2" size="12"
                                         stroke="#ffffff" stroke-width="2.0" />
                                 </m>
                             </m>
@@ -863,27 +863,27 @@
                             <m v="primary">
                                 <line cap="square" outline="casing-bridge" use="primary" />
                                 <m zoom-min="14">
-                                    <text style="bold" k="name" size="16" stroke="#868686"
-                                        stroke-width="2.0" />
-                                    <text style="bold" fill="#606060" k="ref" size="12"
+                                    <text style="bold" k="name" priority="1" size="16"
+                                        stroke="#868686" stroke-width="2.0" />
+                                    <text style="bold" fill="#606060" k="ref" priority="2" size="12"
                                         stroke="#ffffff" stroke-width="2.0" />
                                 </m>
                             </m>
                             <m v="trunk">
                                 <line outline="casing-bridge" use="trunk" />
                                 <m zoom-min="14">
-                                    <text style="bold" k="name" size="16" stroke="#b4b4b4"
-                                        stroke-width="2.0" />
-                                    <text style="bold" fill="#606060" k="ref" size="12"
+                                    <text style="bold" k="name" priority="1" size="16"
+                                        stroke="#b4b4b4" stroke-width="2.0" />
+                                    <text style="bold" fill="#606060" k="ref" priority="2" size="12"
                                         stroke="#ffffff" stroke-width="2.0" />
                                 </m>
                             </m>
                             <m v="motorway">
                                 <line cap="square" outline="casing-bridge" use="motorway" />
                                 <m zoom-min="14">
-                                    <text style="bold" k="name" size="16" stroke="#979797"
-                                        stroke-width="2.0" />
-                                    <text style="bold" fill="#606060" k="ref" size="12"
+                                    <text style="bold" k="name" priority="1" size="16"
+                                        stroke="#979797" stroke-width="2.0" />
+                                    <text style="bold" fill="#606060" k="ref" priority="2" size="12"
                                         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 b3a5bb0d..66a74d8c 100644
--- a/vtm-themes/resources/assets/vtm/osmarender.xml
+++ b/vtm-themes/resources/assets/vtm/osmarender.xml
@@ -729,27 +729,27 @@
                             <m v="primary">
                                 <line use="primary" />
                                 <m zoom-min="14">
-                                    <text style="bold" k="name" size="16" stroke="#e46d71"
-                                        stroke-width="2.0" />
-                                    <text style="bold" fill="#606060" k="ref" size="12"
+                                    <text style="bold" k="name" priority="1" size="16"
+                                        stroke="#e46d71" stroke-width="2.0" />
+                                    <text style="bold" fill="#606060" k="ref" priority="2" size="12"
                                         stroke="#ffffff" stroke-width="2.0" />
                                 </m>
                             </m>
                             <m v="trunk">
                                 <line use="trunk" />
                                 <m zoom-min="14">
-                                    <text style="bold" k="name" size="16" stroke="#7fc97f"
-                                        stroke-width="2.0" />
-                                    <text style="bold" fill="#606060" k="ref" size="12"
+                                    <text style="bold" k="name" priority="1" size="16"
+                                        stroke="#7fc97f" stroke-width="2.0" />
+                                    <text style="bold" fill="#606060" k="ref" priority="2" size="12"
                                         stroke="#ffffff" stroke-width="2.0" />
                                 </m>
                             </m>
                             <m v="motorway">
                                 <line use="motorway" />
                                 <m zoom-min="14">
-                                    <text style="bold" k="name" size="16" stroke="#809bc0"
-                                        stroke-width="2.0" />
-                                    <text style="bold" fill="#606060" k="ref" size="12"
+                                    <text style="bold" k="name" priority="1" size="16"
+                                        stroke="#809bc0" stroke-width="2.0" />
+                                    <text style="bold" fill="#606060" k="ref" priority="2" size="12"
                                         stroke="#ffffff" stroke-width="2.0" />
                                 </m>
                             </m>
@@ -863,27 +863,27 @@
                             <m v="primary">
                                 <line cap="square" outline="casing-bridge" use="primary" />
                                 <m zoom-min="14">
-                                    <text style="bold" k="name" size="16" stroke="#e46d71"
-                                        stroke-width="2.0" />
-                                    <text style="bold" fill="#606060" k="ref" size="12"
+                                    <text style="bold" k="name" priority="1" size="16"
+                                        stroke="#e46d71" stroke-width="2.0" />
+                                    <text style="bold" fill="#606060" k="ref" priority="2" size="12"
                                         stroke="#ffffff" stroke-width="2.0" />
                                 </m>
                             </m>
                             <m v="trunk">
                                 <line outline="casing-bridge" use="trunk" />
                                 <m zoom-min="14">
-                                    <text style="bold" k="name" size="16" stroke="#7fc97f"
-                                        stroke-width="2.0" />
-                                    <text style="bold" fill="#606060" k="ref" size="12"
+                                    <text style="bold" k="name" priority="1" size="16"
+                                        stroke="#7fc97f" stroke-width="2.0" />
+                                    <text style="bold" fill="#606060" k="ref" priority="2" size="12"
                                         stroke="#ffffff" stroke-width="2.0" />
                                 </m>
                             </m>
                             <m v="motorway">
                                 <line cap="square" outline="casing-bridge" use="motorway" />
                                 <m zoom-min="14">
-                                    <text style="bold" k="name" size="16" stroke="#809bc0"
-                                        stroke-width="2.0" />
-                                    <text style="bold" fill="#606060" k="ref" size="12"
+                                    <text style="bold" k="name" priority="1" size="16"
+                                        stroke="#809bc0" stroke-width="2.0" />
+                                    <text style="bold" fill="#606060" k="ref" priority="2" size="12"
                                         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 8552536c..d2da93ca 100644
--- a/vtm-themes/resources/assets/vtm/tronrender.xml
+++ b/vtm-themes/resources/assets/vtm/tronrender.xml
@@ -6,10 +6,13 @@
     <style-text style="bold" caption="true" dy="20" fill="#4040ff" id="caption-small-blue" k="name"
         size="16" stroke="#ffffff" stroke-width="2.0" />
 
-    <style-text style="bold" fill="#eeffee" id="road" k="name" size="18" stroke="#606050"
-        stroke-width="2.5" />
-    <style-text style="bold" fill="#ffef7d" id="major-road" k="name" size="19" stroke="#624f00"
-        stroke-width="2.5" />
+    <style-text style="bold" fill="#eeffee" id="road" k="name" priority="2" size="18"
+        stroke="#606050" stroke-width="2.5" />
+
+    <style-text style="bold" fill="#ffef7d" id="major-road" k="name" priority="1" size="19"
+        stroke="#624f00" stroke-width="2.5" />
+    <style-text style="bold" fill="#606060" id="ref" k="ref" priority="2" size="12" stroke="#ffffff"
+        stroke-width="2.0" />
 
     <style-area fade="10" fill="#ff0000" id="residential" />
 
@@ -433,6 +436,7 @@
                     <line use="primary:z11" />
                     <outline use="0" />
                     <text use="major-road" />
+                    <text use="ref" />
                 </m>
 
                 <m v="trunk">
@@ -440,6 +444,7 @@
                     <outline use="0" />
                     <!-- <outline use="glow"/> -->
                     <text use="major-road" />
+                    <text use="ref" />
                 </m>
 
                 <m v="motorway">
@@ -447,6 +452,7 @@
                     <outline use="0" />
                     <!-- <outline use="glow"/> -->
                     <text use="major-road" />
+                    <text use="ref" />
                 </m>
             </m>
 
@@ -682,18 +688,21 @@
                             <line use="primary:z11" />
                             <outline use="primary" />
                             <text use="major-road" />
+                            <text use="ref" />
                         </m>
 
                         <m v="trunk">
                             <line use="trunk" />
                             <outline use="motorway" />
                             <text use="major-road" />
+                            <text use="ref" />
                         </m>
 
                         <m v="motorway">
                             <line use="highway:z11" />
                             <outline use="motorway" />
                             <text use="major-road" />
+                            <text use="ref" />
                         </m>
                     </m> <!-- end area=~|no|false -->
                 </m> <!-- end tunnel|bridge=~|no|false -->
@@ -775,18 +784,21 @@
                             <line cap="square" use="primary:z11" />
                             <outline use="bridge" />
                             <text use="major-road" />
+                            <text use="ref" />
                         </m>
 
                         <m v="trunk">
                             <line cap="square" use="trunk" />
                             <outline use="bridge" />
                             <text use="major-road" />
+                            <text use="ref" />
                         </m>
 
                         <m v="motorway">
                             <line cap="square" use="highway:z11" />
                             <outline use="bridge" />
                             <text use="major-road" />
+                            <text use="ref" />
                         </m>
                     </m> <!-- end area=~|no|false -->