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

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

diff --git a/vtm-themes/resources/assets/vtm/biker.xml b/vtm-themes/resources/assets/vtm/biker.xml
index cbd078d2e..8b3adf534 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 36 18th November 2025-->
+    <!-- Version 38 17th December 2025-->
 
     <!-- Defines LAYERS Menu -->
     <stylemenu defaultlang="en" defaultvalue="normal" id="menu">
@@ -544,7 +544,7 @@
     <style-text caption="true" fill="#000000" id="town-lz-caption" k="name" priority="4" size="13" style="bold" stroke="#e8eae1" stroke-width="2.0" />
     <style-text caption="true" fill="#000000" id="village-caption" k="name" priority="6" size="12" stroke="#e8eae1" stroke-width="2.0" />
     <style-text caption="true" fill="#000000" id="suburb-caption" k="name" priority="5" size="12" style="italic" stroke="#e8eae1" stroke-width="2.0" />
-    <style-text caption="true" fill="#000000" id="hamlet-caption" k="name" priority="6" size="12" stroke="#e8eae1" stroke-width="2.0" />
+    <style-text caption="true" fill="#000000" id="hamlet-caption" k="name" priority="6" size="12" style="italic" stroke="#e8eae1" stroke-width="2.0" />
     <style-text caption="true" fill="#0000FF" id="island-caption" k="name" priority="6" size="12" style="italic" stroke="#FFFFFF" stroke-width="2.0" />
     <style-text fill="#737373" id="border-caption" k="name" priority="6" size="11" style="bold" stroke="#FFFFFF" stroke-width="2.0" />
 
@@ -581,7 +581,7 @@
     <style-area fade="6" fill="#e5efdc" id="area-field" />
     <style-area fade="6" fill="#BBC7F1A3" id="area-campsite" />
     <style-area fade="6" fill="#BBB7EBA4" id="area-cemetery" />
-    <style-area fade="6" fill="#bbffe6e6" id="area-military" />
+    <style-area fade="6" fill="#25ff3333" id="area-military" />
     <style-area fade="6" fill="#D0D9BF" id="area-mud" />
     <style-area fade="6" fill="#e8eff2" id="area-ice" />
     <style-area fade="6" fill="#c5c3c3" id="area-quarry" />
@@ -1479,6 +1479,10 @@
 
     </m><!-- end e="way" -->
 
+    <m k="highway" v="mini_roundabout">
+        <symbol src="assets:symbols/dot_black.svg" />
+    </m>
+
     <m e="node" select="first">
         <!-- motorway junctions -->
         <m k="highway">
diff --git a/vtm-themes/resources/assets/vtm/dark.xml b/vtm-themes/resources/assets/vtm/dark.xml
index 1b37a0c82..c45731984 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 36 18th November 2025-->
+    <!-- Version 38 17th December 2025-->
 
     <!-- Defines LAYERS Menu -->
     <stylemenu defaultlang="en" defaultvalue="normal" id="menu">
@@ -544,7 +544,7 @@
     <style-text caption="true" fill="#FFFFFF" id="town-lz-caption" k="name" priority="4" size="13" style="bold" stroke="#000000" stroke-width="2.0" />
     <style-text caption="true" fill="#FFFFFF" id="village-caption" k="name" priority="6" size="12" stroke="#000000" stroke-width="2.0" />
     <style-text caption="true" fill="#FFFFFF" id="suburb-caption" k="name" priority="5" size="12" style="italic" stroke="#000000" stroke-width="2.0" />
-    <style-text caption="true" fill="#FFFFFF" id="hamlet-caption" k="name" priority="6" size="12" stroke="#000000" stroke-width="2.0" />
+    <style-text caption="true" fill="#FFFFFF" id="hamlet-caption" k="name" priority="6" size="12" style="italic" stroke="#000000" stroke-width="2.0" />
     <style-text caption="true" fill="#FFFFFF" id="island-caption" k="name" priority="6" size="12" style="italic" stroke="#000000" stroke-width="2.0" />
     <style-text fill="#b3b3b3" id="border-caption" k="name" priority="6" size="11" style="bold" stroke="#000000" stroke-width="2.0" />
 
@@ -581,7 +581,7 @@
     <style-area fade="6" fill="#262626" id="area-field" />
     <style-area fade="6" fill="#262626" id="area-campsite" />
     <style-area fade="6" fill="#BB001a00" id="area-cemetery" />
-    <style-area fade="6" fill="#BB4d0000" id="area-military" />
+    <style-area fade="6" fill="#25ff3333" id="area-military" />
     <style-area fade="6" fill="#483805" id="area-mud" />
     <style-area fade="6" fill="#e8eff2" id="area-ice" />
     <style-area fade="6" fill="#CC675c32" id="area-quarry" />
@@ -1479,6 +1479,10 @@
 
     </m><!-- end e="way" -->
 
+    <m k="highway" v="mini_roundabout">
+        <symbol src="assets:symbols/dot_white.svg" />
+    </m>
+
     <m e="node" select="first">
         <!-- motorway junctions -->
         <m k="highway">
diff --git a/vtm-themes/resources/assets/vtm/indigo.xml b/vtm-themes/resources/assets/vtm/indigo.xml
index dcf813907..efc15a5ae 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 36 18th November 2025-->
+    <!-- Version 38 17th December 2025-->
 
     <!-- Defines LAYERS Menu -->
     <stylemenu defaultlang="en" defaultvalue="normal" id="menu">
@@ -544,7 +544,7 @@
     <style-text caption="true" fill="#FFFFFF" id="town-lz-caption" k="name" priority="4" size="13" style="bold" stroke="#000000" stroke-width="2.0" />
     <style-text caption="true" fill="#FFFFFF" id="village-caption" k="name" priority="6" size="12" stroke="#000000" stroke-width="2.0" />
     <style-text caption="true" fill="#FFFFFF" id="suburb-caption" k="name" priority="5" size="12" style="italic" stroke="#000000" stroke-width="2.0" />
-    <style-text caption="true" fill="#FFFFFF" id="hamlet-caption" k="name" priority="6" size="12" stroke="#000000" stroke-width="2.0" />
+    <style-text caption="true" fill="#FFFFFF" id="hamlet-caption" k="name" priority="6" size="12" style="italic" stroke="#000000" stroke-width="2.0" />
     <style-text caption="true" fill="#FFFFFF" id="island-caption" k="name" priority="6" size="12" style="italic" stroke="#000000" stroke-width="2.0" />
     <style-text fill="#b3b3b3" id="border-caption" k="name" priority="6" size="11" style="bold" stroke="#000000" stroke-width="2.0" />
 
@@ -581,7 +581,7 @@
     <style-area fade="6" fill="#0d1a26" id="area-field" />
     <style-area fade="6" fill="#0d1a26" id="area-campsite" />
     <style-area fade="6" fill="#BB001a00" id="area-cemetery" />
-    <style-area fade="6" fill="#BB4d0000" id="area-military" />
+    <style-area fade="6" fill="#25ff3333" id="area-military" />
     <style-area fade="6" fill="#483805" id="area-mud" />
     <style-area fade="6" fill="#e8eff2" id="area-ice" />
     <style-area fade="6" fill="#CC675c32" id="area-quarry" />
@@ -1479,6 +1479,10 @@
 
     </m><!-- end e="way" -->
 
+    <m k="highway" v="mini_roundabout">
+        <symbol src="assets:symbols/dot_white.svg" />
+    </m>
+
     <m e="node" select="first">
         <!-- motorway junctions -->
         <m k="highway">
diff --git a/vtm-themes/resources/assets/vtm/motorider.xml b/vtm-themes/resources/assets/vtm/motorider.xml
index 5ff24ab71..30ce557dd 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 36 18th November 2025-->
+    <!-- Version 38 17th December 2025-->
 
     <!-- Defines LAYERS Menu -->
     <stylemenu defaultlang="en" defaultvalue="normal" id="menu">
@@ -544,7 +544,7 @@
     <style-text caption="true" fill="#000000" id="town-lz-caption" k="name" priority="4" size="13" style="bold" stroke="#FFFFFF" stroke-width="2.0" />
     <style-text caption="true" fill="#000000" id="village-caption" k="name" priority="6" size="12" stroke="#FFFFFF" stroke-width="2.0" />
     <style-text caption="true" fill="#000000" id="suburb-caption" k="name" priority="5" size="12" style="italic" stroke="#FFFFFF" stroke-width="2.0" />
-    <style-text caption="true" fill="#000000" id="hamlet-caption" k="name" priority="6" size="12" stroke="#FFFFFF" stroke-width="2.0" />
+    <style-text caption="true" fill="#000000" id="hamlet-caption" k="name" priority="6" size="12" style="italic" stroke="#FFFFFF" stroke-width="2.0" />
     <style-text caption="true" fill="#0000FF" id="island-caption" k="name" priority="6" size="12" style="italic" stroke="#FFFFFF" stroke-width="2.0" />
     <style-text fill="#737373" id="border-caption" k="name" priority="6" size="11" style="bold" stroke="#FFFFFF" stroke-width="2.0" />
 
@@ -581,7 +581,7 @@
     <style-area fade="6" fill="#e5efdc" id="area-field" />
     <style-area fade="6" fill="#BBC7F1A3" id="area-campsite" />
     <style-area fade="6" fill="#BBB7EBA4" id="area-cemetery" />
-    <style-area fade="6" fill="#bbffe6e6" id="area-military" />
+    <style-area fade="6" fill="#25ff3333" id="area-military" />
     <style-area fade="6" fill="#D0D9BF" id="area-mud" />
     <style-area fade="6" fill="#e8eff2" id="area-ice" />
     <style-area fade="6" fill="#c5c3c3" id="area-quarry" />
@@ -1479,6 +1479,10 @@
 
     </m><!-- end e="way" -->
 
+    <m k="highway" v="mini_roundabout">
+        <symbol src="assets:symbols/dot_black.svg" />
+    </m>
+
     <m e="node" select="first">
         <!-- motorway junctions -->
         <m k="highway">