From c4de36c7e4ed5e8108cb6e41c3fe1b1652a26523 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20T=C5=AFma?= <tumic@cbox.cz>
Date: Tue, 19 Nov 2024 00:25:12 +0100
Subject: [PATCH] Saddles + natural POIs cleanup

---
 data/style/style.xml         | 30 ++++++++++++++++++------------
 gpxsee.qrc                   |  1 +
 icons/map/symbols/saddle.svg |  7 +++++++
 3 files changed, 26 insertions(+), 12 deletions(-)
 create mode 100644 icons/map/symbols/saddle.svg

diff --git a/data/style/style.xml b/data/style/style.xml
index 0ebe74c0..c52a8603 100644
--- a/data/style/style.xml
+++ b/data/style/style.xml
@@ -549,25 +549,29 @@
         <rule e="node" k="name" v="*">
             <symbol id="peak" src=":/POI/mountain-11.svg" symbol-width="11"/>
             <caption fill="#000000" font-size="10" font-family="serif" font-style="italic" k="name" priority="10" stroke="#FFFFFF" stroke-width="2" symbol-id="peak"/>
-            <rule e="any" k="*" v="*" zoom-min="17">
-                <caption fill="#000000" font-size="10" font-family="serif" font-style="italic" k="ele" priority="9" stroke="#FFFFFF" stroke-width="2" symbol-id="peak"/>
-            </rule>
+        </rule>
+    </rule>
+    <rule e="node" k="natural" v="saddle" zoom-min="13">
+        <rule e="node" k="name" v="*">
+            <symbol id="saddle" src=":/symbols/saddle.svg" symbol-width="9" symbol-height="11"/>
+            <caption fill="#000000" font-size="10" font-family="serif" font-style="italic" k="name" priority="10" stroke="#FFFFFF" stroke-width="2" symbol-id="saddle"/>
         </rule>
     </rule>
     <rule e="node" k="natural" v="volcano" zoom-min="13">
-        <symbol id="volcano" src=":/POI/volcano-11.svg" symbol-width="11"/>
-        <caption fill="#000000" font-size="10" font-family="serif" font-style="italic" k="name" priority="10" stroke="#FFFFFF" stroke-width="2" symbol-id="volcano"/>
-        <rule e="any" k="*" v="*" zoom-min="17">
-            <caption fill="#000000" font-size="10" font-family="serif" font-style="italic" k="ele" priority="9" stroke="#FFFFFF" stroke-width="2" symbol-id="volcano"/>
+        <rule e="node" k="name" v="*">
+            <symbol id="volcano" src=":/POI/volcano-11.svg" symbol-width="11"/>
+            <caption fill="#000000" font-size="10" font-family="serif" font-style="italic" k="name" priority="10" stroke="#FFFFFF" stroke-width="2" symbol-id="volcano"/>
         </rule>
     </rule>
     <rule e="node" k="waterway" v="waterfall" zoom-min="15">
-        <symbol id="waterfall" src=":/POI/waterfall-11.svg" symbol-width="11"/>
-        <rule e="any" k="*" v="*" zoom-min="16">
-            <caption fill="#000000" font-size="10" font-family="serif" font-style="italic" k="name" priority="10" stroke="#FFFFFF" stroke-width="2" symbol-id="waterfall"/>
+        <rule e="any" k="name" v="*">
+            <symbol id="waterfall" src=":/POI/waterfall-11.svg" symbol-width="11"/>
+            <rule e="any" k="*" v="*" zoom-min="16">
+                <caption fill="#000000" font-size="10" font-family="serif" font-style="italic" k="name" priority="10" stroke="#FFFFFF" stroke-width="2" symbol-id="waterfall"/>
+            </rule>
         </rule>
     </rule>
-    <rule e="node" k="natural" v="spring" zoom-min="15">
+    <rule e="node" k="natural" v="spring|hot_spring" zoom-min="15">
         <rule e="any" k="name" v="*">
             <symbol id="spring" src=":/POI/water-11.svg" symbol-width="11"/>
             <rule e="any" k="*" v="*" zoom-min="16">
@@ -578,7 +582,9 @@
     <rule e="node" k="tourism" v="viewpoint" zoom-min="15">
         <rule e="node" k="name" v="*">
             <symbol id="viewpoint" src=":/POI/viewpoint-11.svg" symbol-width="11"/>
-            <caption fill="#000000" font-size="10" font-family="serif" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="viewpoint"/>
+            <rule e="any" k="*" v="*" zoom-min="16">
+                <caption fill="#000000" font-size="10" font-family="serif" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="viewpoint"/>
+            </rule>
         </rule>
     </rule>
 
diff --git a/gpxsee.qrc b/gpxsee.qrc
index 6fc4f5da..de2a2040 100644
--- a/gpxsee.qrc
+++ b/gpxsee.qrc
@@ -10,6 +10,7 @@
 		<file alias="exit.svg">icons/map/symbols/exit.svg</file>
 		<file alias="flow.svg">icons/map/symbols/flow.svg</file>
 		<file alias="oneway.svg">icons/map/symbols/oneway.svg</file>
+		<file alias="saddle.svg">icons/map/symbols/saddle.svg</file>
 	</qresource>
 
 	<!-- POIs (IMG, Mapsforge & ENC style) -->
diff --git a/icons/map/symbols/saddle.svg b/icons/map/symbols/saddle.svg
new file mode 100644
index 00000000..7c78ff6b
--- /dev/null
+++ b/icons/map/symbols/saddle.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg viewBox="0 0 9 11" height="11" width="9" version="1.1">
+	<g>
+		<path d="M 1.5,1.5 L3,3 L 3,8 L 1.5,9.5" stroke-width="1" stroke="#000000" fill="none"/>
+		<path d="M 7.5,1.5 L6,3 L 6,8 L 7.5,9.5" stroke-width="1" stroke="#000000" fill="none"/>
+	</g>
+</svg>