From c6a00efc1aa4916dff074ba1b71acff3837ab0e8 Mon Sep 17 00:00:00 2001
From: Emux <devemux86@gmail.com>
Date: Tue, 23 Dec 2025 15:25:28 +0200
Subject: [PATCH] Map theme improvements, #1183, #1192, #1229

---
 vtm-themes/resources/assets/vtm/biker.xml     | 10 +++++++---
 vtm-themes/resources/assets/vtm/dark.xml      |  8 ++++++--
 vtm-themes/resources/assets/vtm/indigo.xml    |  8 ++++++--
 vtm-themes/resources/assets/vtm/motorider.xml | 10 +++++++---
 4 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/vtm-themes/resources/assets/vtm/biker.xml b/vtm-themes/resources/assets/vtm/biker.xml
index 1812db4e2..f9528088e 100644
--- a/vtm-themes/resources/assets/vtm/biker.xml
+++ b/vtm-themes/resources/assets/vtm/biker.xml
@@ -4,7 +4,7 @@
     xsi:schemaLocation="http://opensciencemap.org/rendertheme https://raw.githubusercontent.com/mapsforge/vtm/master/resources/rendertheme.xsd">
     
     <!-- This is the 2nd generation OpenGL/VTM "Biker" theme -->
-    <!-- Version 38 17th December 2025-->
+    <!-- Version 39 23rd December 2025-->
 
     <!-- Defines LAYERS Menu -->
     <stylemenu defaultlang="en" defaultvalue="normal" id="menu">
@@ -549,12 +549,13 @@
     <style-text fill="#737373" id="border-caption" k="name" priority="6" size="11" style="bold" stroke="#FFFFFF" stroke-width="2.0" />
 
     <!-- POI captions/labels -->
-    <style-text priority="3" caption="true" dy="-20" fill="#b35900" font-family="medium" id="poi" k="name" size="12" stroke="#FFFFFF" stroke-width="2.0" />
+    <style-text priority="3" caption="true" dy="-20" fill="#734A08" font-family="medium" id="poi" k="name" size="12" stroke="#FFFFFF" stroke-width="2.0" />
     <style-text priority="4" caption="true" dy="-20" fill="#ff0066" font-family="medium" id="poi-accommodation" k="name" size="12" stroke="#FFFFFF" stroke-width="2.0" />
     <style-text priority="1" caption="true" dy="-20" fill="#ff0000" font-family="medium" id="poi-emergency" k="name" size="12" stroke="#FFFFFF" stroke-width="2.0" />
     <style-text priority="2" caption="true" dy="-20" fill="#ac39ac" font-family="medium" id="poi-fuel" k="name" size="12" stroke="#FFFFFF" stroke-width="2.0" />
     <style-text priority="5" caption="true" dy="-20" fill="#006633" font-family="medium" id="poi-misc" k="name" size="12" stroke="#FFFFFF" stroke-width="2.0" />
     <style-text priority="5" caption="true" dy="-20" fill="#0066cc" font-family="medium" id="poi-parking" k="name" size="12" stroke="#FFFFFF" stroke-width="2.0" />
+    <style-text priority="2" caption="true" dy="-20" fill="#ac39ac" font-family="medium" id="poi-shop" k="name" size="12" stroke="#FFFFFF" stroke-width="2.0" />
     <style-text priority="5" caption="true" dy="-20" fill="#af3a3a" font-family="medium" id="poi-transport" k="name" size="12" stroke="#FFFFFF" stroke-width="2.0" />
     <style-text style="bold" caption="true" dy="-12" fill="#4D2F08" id="peak-name-caption" k="name" size="12" stroke="#FFFFFF" stroke-width="2.0" />
     <style-text style="bold" caption="true" dy="12" fill="#4D2F08" id="peak-ele-caption" k="ele" size="12" stroke="#FFFFFF" stroke-width="2.0" />
@@ -1255,6 +1256,9 @@
                                 <line outline="road-major-outline" use="road-highway-toll" />
                             </m>
                         </m>
+                        <m e="way" k="access" v="private" zoom-min="14">
+                            <line stroke="#ff4d4d" dasharray="3,6" cap="butt" width="0.3" />
+                        </m>
                     </m> <!-- end area=~|no|false -->
                 </m><!-- end tunnel|bridge=~|no|false -->
 
@@ -1934,7 +1938,7 @@
             </m>
         </m>
         <m select="when-matched" >
-            <text use="poi-fuel" />
+            <text use="poi-shop" />
         </m>
     </m>
 
diff --git a/vtm-themes/resources/assets/vtm/dark.xml b/vtm-themes/resources/assets/vtm/dark.xml
index c45731984..82162398c 100644
--- a/vtm-themes/resources/assets/vtm/dark.xml
+++ b/vtm-themes/resources/assets/vtm/dark.xml
@@ -4,7 +4,7 @@
     xsi:schemaLocation="http://opensciencemap.org/rendertheme https://raw.githubusercontent.com/mapsforge/vtm/master/resources/rendertheme.xsd">
     
     <!-- This is the 2nd generation OpenGL/VTM "dark" theme based on the Biker map theme -->
-    <!-- Version 38 17th December 2025-->
+    <!-- Version 39 23rd December 2025-->
 
     <!-- Defines LAYERS Menu -->
     <stylemenu defaultlang="en" defaultvalue="normal" id="menu">
@@ -555,6 +555,7 @@
     <style-text priority="2" caption="true" dy="-20" fill="#FFFFFF" font-family="medium" id="poi-fuel" k="name" size="12" stroke="#ac39ac" stroke-width="1.0" />
     <style-text priority="5" caption="true" dy="-20" fill="#FFFFFF" font-family="medium" id="poi-misc" k="name" size="12" stroke="#006633" stroke-width="1.0" />
     <style-text priority="3" caption="true" dy="-20" fill="#FFFFFF" font-family="medium" id="poi-parking" k="name" size="12" stroke="#004d99" stroke-width="1.0" />
+    <style-text priority="2" caption="true" dy="-20" fill="#FFFFFF" font-family="medium" id="poi-shop" k="name" size="12" stroke="#000000" stroke-width="1.0" />
     <style-text priority="5" caption="true" dy="-20" fill="#FFFFFF" font-family="medium" id="poi-transport" k="name" size="12" stroke="#af3a3a" stroke-width="1.0" />
     <style-text style="bold" caption="true" dy="-12" fill="#FFFFFF" id="peak-name-caption" k="name" size="12" stroke="#4D2F08" stroke-width="1.0" />
     <style-text style="bold" caption="true" dy="12" fill="#FFFFFF" id="peak-ele-caption" k="ele" size="12" stroke="#4D2F08" stroke-width="1.0" />
@@ -1255,6 +1256,9 @@
                                 <line outline="road-major-outline" use="road-highway-toll" />
                             </m>
                         </m>
+                        <m e="way" k="access" v="private" zoom-min="14">
+                            <line stroke="#ff4d4d" dasharray="3,6" cap="butt" width="0.3" />
+                        </m>
                     </m> <!-- end area=~|no|false -->
                 </m><!-- end tunnel|bridge=~|no|false -->
 
@@ -1934,7 +1938,7 @@
             </m>
         </m>
         <m select="when-matched" >
-            <text use="poi-fuel" />
+            <text use="poi-shop" />
         </m>
     </m>
 
diff --git a/vtm-themes/resources/assets/vtm/indigo.xml b/vtm-themes/resources/assets/vtm/indigo.xml
index efc15a5ae..b052ea3f0 100644
--- a/vtm-themes/resources/assets/vtm/indigo.xml
+++ b/vtm-themes/resources/assets/vtm/indigo.xml
@@ -4,7 +4,7 @@
     xsi:schemaLocation="http://opensciencemap.org/rendertheme https://raw.githubusercontent.com/mapsforge/vtm/master/resources/rendertheme.xsd">
     
     <!-- This is the OpenGL/VTM "Indigo" theme based on the Biker map theme -->
-    <!-- Version 38 17th December 2025-->
+    <!-- Version 39 23rd December 2025-->
 
     <!-- Defines LAYERS Menu -->
     <stylemenu defaultlang="en" defaultvalue="normal" id="menu">
@@ -555,6 +555,7 @@
     <style-text priority="2" caption="true" dy="-20" fill="#FFFFFF" font-family="medium" id="poi-fuel" k="name" size="12" stroke="#ac39ac" stroke-width="1.0" />
     <style-text priority="5" caption="true" dy="-20" fill="#FFFFFF" font-family="medium" id="poi-misc" k="name" size="12" stroke="#006633" stroke-width="1.0" />
     <style-text priority="3" caption="true" dy="-20" fill="#FFFFFF" font-family="medium" id="poi-parking" k="name" size="12" stroke="#004d99" stroke-width="1.0" />
+    <style-text priority="2" caption="true" dy="-20" fill="#FFFFFF" font-family="medium" id="poi-shop" k="name" size="12" stroke="#000000" stroke-width="1.0" />
     <style-text priority="5" caption="true" dy="-20" fill="#FFFFFF" font-family="medium" id="poi-transport" k="name" size="12" stroke="#af3a3a" stroke-width="1.0" />
     <style-text style="bold" caption="true" dy="-12" fill="#FFFFFF" id="peak-name-caption" k="name" size="12" stroke="#4D2F08" stroke-width="1.0" />
     <style-text style="bold" caption="true" dy="12" fill="#FFFFFF" id="peak-ele-caption" k="ele" size="12" stroke="#4D2F08" stroke-width="1.0" />
@@ -1255,6 +1256,9 @@
                                 <line outline="road-major-outline" use="road-highway-toll" />
                             </m>
                         </m>
+                        <m e="way" k="access" v="private" zoom-min="14">
+                            <line stroke="#ff4d4d" dasharray="3,6" cap="butt" width="0.3" />
+                        </m>
                     </m> <!-- end area=~|no|false -->
                 </m><!-- end tunnel|bridge=~|no|false -->
 
@@ -1934,7 +1938,7 @@
             </m>
         </m>
         <m select="when-matched" >
-            <text use="poi-fuel" />
+            <text use="poi-shop" />
         </m>
     </m>
 
diff --git a/vtm-themes/resources/assets/vtm/motorider.xml b/vtm-themes/resources/assets/vtm/motorider.xml
index cead3e06b..51d57702f 100644
--- a/vtm-themes/resources/assets/vtm/motorider.xml
+++ b/vtm-themes/resources/assets/vtm/motorider.xml
@@ -4,7 +4,7 @@
     xsi:schemaLocation="http://opensciencemap.org/rendertheme https://raw.githubusercontent.com/mapsforge/vtm/master/resources/rendertheme.xsd">
     
     <!-- This is the 2nd generation OpenGL/VTM "light" theme based on the Biker map theme-->
-    <!-- Version 38 17th December 2025-->
+    <!-- Version 39 23rd December 2025-->
 
     <!-- Defines LAYERS Menu -->
     <stylemenu defaultlang="en" defaultvalue="normal" id="menu">
@@ -549,12 +549,13 @@
     <style-text fill="#737373" id="border-caption" k="name" priority="6" size="11" style="bold" stroke="#FFFFFF" stroke-width="2.0" />
 
     <!-- POI captions/labels -->
-    <style-text priority="3" caption="true" dy="-20" fill="#b35900" font-family="medium" id="poi" k="name" size="12" stroke="#FFFFFF" stroke-width="2.0" />
+    <style-text priority="3" caption="true" dy="-20" fill="#734A08" font-family="medium" id="poi" k="name" size="12" stroke="#FFFFFF" stroke-width="2.0" />
     <style-text priority="4" caption="true" dy="-20" fill="#ff0066" font-family="medium" id="poi-accommodation" k="name" size="12" stroke="#FFFFFF" stroke-width="2.0" />
     <style-text priority="1" caption="true" dy="-20" fill="#ff0000" font-family="medium" id="poi-emergency" k="name" size="12" stroke="#FFFFFF" stroke-width="2.0" />
     <style-text priority="2" caption="true" dy="-20" fill="#ac39ac" font-family="medium" id="poi-fuel" k="name" size="12" stroke="#FFFFFF" stroke-width="2.0" />
     <style-text priority="5" caption="true" dy="-20" fill="#006633" font-family="medium" id="poi-misc" k="name" size="12" stroke="#FFFFFF" stroke-width="2.0" />
     <style-text priority="5" caption="true" dy="-20" fill="#0066cc" font-family="medium" id="poi-parking" k="name" size="12" stroke="#FFFFFF" stroke-width="2.0" />
+    <style-text priority="2" caption="true" dy="-20" fill="#ac39ac" font-family="medium" id="poi-shop" k="name" size="12" stroke="#FFFFFF" stroke-width="2.0" />
     <style-text priority="5" caption="true" dy="-20" fill="#af3a3a" font-family="medium" id="poi-transport" k="name" size="12" stroke="#FFFFFF" stroke-width="2.0" />
     <style-text style="bold" caption="true" dy="-12" fill="#4D2F08" id="peak-name-caption" k="name" size="12" stroke="#FFFFFF" stroke-width="2.0" />
     <style-text style="bold" caption="true" dy="12" fill="#4D2F08" id="peak-ele-caption" k="ele" size="12" stroke="#FFFFFF" stroke-width="2.0" />
@@ -1255,6 +1256,9 @@
                                 <line outline="road-major-outline" use="road-highway-toll" />
                             </m>
                         </m>
+                        <m e="way" k="access" v="private" zoom-min="14">
+                            <line stroke="#ff4d4d" dasharray="3,6" cap="butt" width="0.3" />
+                        </m>
                     </m> <!-- end area=~|no|false -->
                 </m><!-- end tunnel|bridge=~|no|false -->
 
@@ -1934,7 +1938,7 @@
             </m>
         </m>
         <m select="when-matched" >
-            <text use="poi-fuel" />
+            <text use="poi-shop" />
         </m>
     </m>