From f729b08e8909e754d5b4cd1a0b65326ff4df6eb2 Mon Sep 17 00:00:00 2001
From: Harry Bond <endim8@pm.me>
Date: Tue, 14 Jun 2022 00:14:01 +0100
Subject: [PATCH] [styles] fountain scale improvements

Signed-off-by: Harry Bond <endim8@pm.me>
---
 data/styles/clear/include/Icons.mapcss        |  4 ++++
 .../clear/style-clear/symbols/fountain-m.svg  | 19 +++++++++----------
 .../clear/style-clear/symbols/fountain-s.svg  | 13 +++++++++++++
 .../clear/style-night/symbols/fountain-m.svg  | 19 +++++++++----------
 .../clear/style-night/symbols/fountain-s.svg  | 13 +++++++++++++
 5 files changed, 48 insertions(+), 20 deletions(-)
 create mode 100644 data/styles/clear/style-clear/symbols/fountain-s.svg
 create mode 100644 data/styles/clear/style-night/symbols/fountain-s.svg

diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss
index e9650b1b90..d594532281 100644
--- a/data/styles/clear/include/Icons.mapcss
+++ b/data/styles/clear/include/Icons.mapcss
@@ -531,6 +531,7 @@ area|z15-[waterway=waterfall]
 node|z17-[waterway=waterfall],
 area|z17-[waterway=waterfall]
 {icon-image: waterfall-m.svg;text-offset: 1;font-size: 10;text-optional: true;}
+
 node|z10-[natural=volcano],
 area|z10-[natural=volcano]
 {icon-image: volcano-s.svg;text-offset: 1;font-size: 10;text-optional: true;}
@@ -1834,6 +1835,9 @@ area|z17-[leisure=marina]
 
 node|z16-[amenity=fountain],
 area|z16-[amenity=fountain]
+{icon-image: fountain-s.svg;icon-min-distance: 20;}
+node|z19-[amenity=fountain],
+area|z19-[amenity=fountain]
 {icon-image: fountain-m.svg;icon-min-distance: 20;}
 
 node|z14[man_made=lighthouse],
diff --git a/data/styles/clear/style-clear/symbols/fountain-m.svg b/data/styles/clear/style-clear/symbols/fountain-m.svg
index 946204794e..8e056f4c96 100644
--- a/data/styles/clear/style-clear/symbols/fountain-m.svg
+++ b/data/styles/clear/style-clear/symbols/fountain-m.svg
@@ -1,14 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
     <title>fountain-m</title>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="fountain-m" fill-rule="nonzero">
-            <g id="fountain" transform="translate(6.000000, 5.000000)" fill="#14A0C2">
-                <path d="M7.765625,0 C7.09548438,0 6.49947266,0.323121094 6.125,0.821734375 C5.75052734,0.323121094 5.15451563,0 4.484375,0 C3.35357422,0 2.43359375,0.919980469 2.43359375,2.05078125 L3.25390625,2.05078125 C3.25390625,1.37230078 3.80589453,0.8203125 4.484375,0.8203125 C5.16285547,0.8203125 5.71484375,1.37230078 5.71484375,2.05078125 L5.71484375,3.3359375 L6.53515625,3.3359375 L6.53515625,2.05078125 C6.53515625,1.37230078 7.08714453,0.8203125 7.765625,0.8203125 C8.44410547,0.8203125 8.99609375,1.37230078 8.99609375,2.05078125 L9.81640625,2.05078125 C9.81640625,0.919980469 8.89642578,0 7.765625,0 Z" id="Path"></path>
-                <path d="M2.43359375,4.15625 L2.43359375,4.9765625 L3.29516797,4.9765625 C3.48572656,5.9115 4.31432422,6.6171875 5.3046875,6.6171875 L6.9453125,6.6171875 C7.93567578,6.6171875 8.76427344,5.9115 8.95483203,4.9765625 L9.81640625,4.9765625 L9.81640625,4.15625 L2.43359375,4.15625 Z" id="Path"></path>
-                <path d="M0,7.4375 L0,8.2578125 L0.861574219,8.2578125 C1.05210547,9.19275 1.88070312,9.8984375 2.87109375,9.8984375 L4.89453125,9.8984375 L4.89453125,10.71875 L7.35546875,10.71875 L7.35546875,9.8984375 L9.37890625,9.8984375 C10.3692695,9.8984375 11.1978672,9.19275 11.3884258,8.2578125 L12.25,8.2578125 L12.25,7.4375 L0,7.4375 Z" id="Path"></path>
-                <path d="M10.595457,13.1796875 C10.4048984,12.24475 9.57630078,11.5390625 8.5859375,11.5390625 L3.6640625,11.5390625 C2.67369922,11.5390625 1.84510156,12.24475 1.65454297,13.1796875 L0.765625,13.1796875 L0.765625,14 L11.4570312,14 L11.4570312,13.1796875 L10.595457,13.1796875 Z" id="Path"></path>
+    <g fill="none" fill-rule="evenodd">
+        <g fill-rule="nonzero">
+            <g transform="matrix(1.5,0,0,1.5,2.8125,1.5)" fill="#14a0c2">
+                <path d="m7.7656249 0c-.6701406 0-1.2661523.32312109-1.640625.82173438-.3744727-.49861329-.9704844-.82173438-1.640625-.82173438-1.1308008 0-2.0507812.91998047-2.0507812 2.0507813h.8203125c0-.6784805.5519882-1.2304688 1.2304687-1.2304688s1.2304687.5519883 1.2304687 1.2304688v1.2851562h.8203125v-1.2851562c0-.6784805.5519883-1.2304688 1.2304688-1.2304688s1.2304689.5519883 1.2304689 1.2304688h.8203125c0-1.1308008-.9199806-2.0507813-2.0507814-2.0507813z"/>
+                <path d="m2.4335937 4.15625v.8203125h.8615742c.1905586.9349375 1.0191562 1.640625 2.0095195 1.640625h1.640625c.9903633 0 1.818961-.7056875 2.0095195-1.640625h.8615744v-.8203125z"/>
+                <path d="m0 7.4375v.8203125h.86157422c.19053128.9349375 1.0191289 1.640625 2.0095196 1.640625h2.0234374v.8203125h2.4609375v-.8203125h2.0234376c.9903637 0 1.8189607-.7056875 2.0095197-1.640625h.861574v-.8203125z"/>
+                <path d="m10.609129 13.179688c-.190559-.934938-1.0191562-1.640625-2.0095195-1.640625h-4.921875c-.9903633 0-1.8189609.705687-2.0095195 1.640625h-.888918v.820312h10.691406v-.820312z"/>
             </g>
         </g>
     </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/data/styles/clear/style-clear/symbols/fountain-s.svg b/data/styles/clear/style-clear/symbols/fountain-s.svg
new file mode 100644
index 0000000000..616e071f13
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/fountain-s.svg
@@ -0,0 +1,13 @@
+<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+    <title>fountain-s</title>
+    <g fill="none" fill-rule="evenodd">
+        <g fill-rule="nonzero">
+            <g transform="matrix(1.125,0,0,1.125,5.109375,4.125)" fill="#14a0c2">
+                <path d="m7.7656249 0c-.6701406 0-1.2661523.32312109-1.640625.82173438-.3744727-.49861329-.9704844-.82173438-1.640625-.82173438-1.1308008 0-2.0507812.91998047-2.0507812 2.0507813h.8203125c0-.6784805.5519882-1.2304688 1.2304687-1.2304688s1.2304687.5519883 1.2304687 1.2304688v1.2851562h.8203125v-1.2851562c0-.6784805.5519883-1.2304688 1.2304688-1.2304688s1.2304689.5519883 1.2304689 1.2304688h.8203125c0-1.1308008-.9199806-2.0507813-2.0507814-2.0507813z"/>
+                <path d="m2.4335937 4.15625v.8203125h.8615742c.1905586.9349375 1.0191562 1.640625 2.0095195 1.640625h1.640625c.9903633 0 1.818961-.7056875 2.0095195-1.640625h.8615744v-.8203125z"/>
+                <path d="m0 7.4375v.8203125h.86157422c.19053128.9349375 1.0191289 1.640625 2.0095196 1.640625h2.0234374v.8203125h2.4609375v-.8203125h2.0234376c.9903637 0 1.8189607-.7056875 2.0095197-1.640625h.861574v-.8203125z"/>
+                <path d="m10.609129 13.179688c-.190559-.934938-1.0191562-1.640625-2.0095195-1.640625h-4.921875c-.9903633 0-1.8189609.705687-2.0095195 1.640625h-.888918v.820312h10.691406v-.820312z"/>
+            </g>
+        </g>
+    </g>
+</svg>
diff --git a/data/styles/clear/style-night/symbols/fountain-m.svg b/data/styles/clear/style-night/symbols/fountain-m.svg
index d126303a67..12b41523a7 100644
--- a/data/styles/clear/style-night/symbols/fountain-m.svg
+++ b/data/styles/clear/style-night/symbols/fountain-m.svg
@@ -1,14 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
     <title>fountain-m</title>
-    <g id="Page-2:-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.6">
-        <g id="fountain-m" fill-rule="nonzero">
-            <g id="fountain" transform="translate(6.000000, 5.000000)" fill="#14A0C2">
-                <path d="M7.765625,0 C7.09548438,0 6.49947266,0.323121094 6.125,0.821734375 C5.75052734,0.323121094 5.15451563,0 4.484375,0 C3.35357422,0 2.43359375,0.919980469 2.43359375,2.05078125 L3.25390625,2.05078125 C3.25390625,1.37230078 3.80589453,0.8203125 4.484375,0.8203125 C5.16285547,0.8203125 5.71484375,1.37230078 5.71484375,2.05078125 L5.71484375,3.3359375 L6.53515625,3.3359375 L6.53515625,2.05078125 C6.53515625,1.37230078 7.08714453,0.8203125 7.765625,0.8203125 C8.44410547,0.8203125 8.99609375,1.37230078 8.99609375,2.05078125 L9.81640625,2.05078125 C9.81640625,0.919980469 8.89642578,0 7.765625,0 Z" id="Path"></path>
-                <path d="M2.43359375,4.15625 L2.43359375,4.9765625 L3.29516797,4.9765625 C3.48572656,5.9115 4.31432422,6.6171875 5.3046875,6.6171875 L6.9453125,6.6171875 C7.93567578,6.6171875 8.76427344,5.9115 8.95483203,4.9765625 L9.81640625,4.9765625 L9.81640625,4.15625 L2.43359375,4.15625 Z" id="Path"></path>
-                <path d="M0,7.4375 L0,8.2578125 L0.861574219,8.2578125 C1.05210547,9.19275 1.88070312,9.8984375 2.87109375,9.8984375 L4.89453125,9.8984375 L4.89453125,10.71875 L7.35546875,10.71875 L7.35546875,9.8984375 L9.37890625,9.8984375 C10.3692695,9.8984375 11.1978672,9.19275 11.3884258,8.2578125 L12.25,8.2578125 L12.25,7.4375 L0,7.4375 Z" id="Path"></path>
-                <path d="M10.595457,13.1796875 C10.4048984,12.24475 9.57630078,11.5390625 8.5859375,11.5390625 L3.6640625,11.5390625 C2.67369922,11.5390625 1.84510156,12.24475 1.65454297,13.1796875 L0.765625,13.1796875 L0.765625,14 L11.4570312,14 L11.4570312,13.1796875 L10.595457,13.1796875 Z" id="Path"></path>
+    <g fill="none" fill-rule="evenodd" opacity="0.6">
+        <g fill-rule="nonzero">
+            <g transform="matrix(1.5,0,0,1.5,2.8125,1.5)" fill="#14A0C2">
+                <path d="m7.7656249 0c-.6701406 0-1.2661523.32312109-1.640625.82173438-.3744727-.49861329-.9704844-.82173438-1.640625-.82173438-1.1308008 0-2.0507812.91998047-2.0507812 2.0507813h.8203125c0-.6784805.5519882-1.2304688 1.2304687-1.2304688s1.2304687.5519883 1.2304687 1.2304688v1.2851562h.8203125v-1.2851562c0-.6784805.5519883-1.2304688 1.2304688-1.2304688s1.2304689.5519883 1.2304689 1.2304688h.8203125c0-1.1308008-.9199806-2.0507813-2.0507814-2.0507813z"/>
+                <path d="m2.4335937 4.15625v.8203125h.8615742c.1905586.9349375 1.0191562 1.640625 2.0095195 1.640625h1.640625c.9903633 0 1.818961-.7056875 2.0095195-1.640625h.8615744v-.8203125z"/>
+                <path d="m0 7.4375v.8203125h.86157422c.19053128.9349375 1.0191289 1.640625 2.0095196 1.640625h2.0234374v.8203125h2.4609375v-.8203125h2.0234376c.9903637 0 1.8189607-.7056875 2.0095197-1.640625h.861574v-.8203125z"/>
+                <path d="m10.609129 13.179688c-.190559-.934938-1.0191562-1.640625-2.0095195-1.640625h-4.921875c-.9903633 0-1.8189609.705687-2.0095195 1.640625h-.888918v.820312h10.691406v-.820312z"/>
             </g>
         </g>
     </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/data/styles/clear/style-night/symbols/fountain-s.svg b/data/styles/clear/style-night/symbols/fountain-s.svg
new file mode 100644
index 0000000000..07cd8df429
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/fountain-s.svg
@@ -0,0 +1,13 @@
+<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+    <title>fountain-s</title>
+    <g fill="none" fill-rule="evenodd" opacity="0.6">
+        <g fill-rule="nonzero">
+            <g transform="matrix(1.125,0,0,1.125,5.109375,4.125)" fill="#14a0c2">
+                <path d="m7.7656249 0c-.6701406 0-1.2661523.32312109-1.640625.82173438-.3744727-.49861329-.9704844-.82173438-1.640625-.82173438-1.1308008 0-2.0507812.91998047-2.0507812 2.0507813h.8203125c0-.6784805.5519882-1.2304688 1.2304687-1.2304688s1.2304687.5519883 1.2304687 1.2304688v1.2851562h.8203125v-1.2851562c0-.6784805.5519883-1.2304688 1.2304688-1.2304688s1.2304689.5519883 1.2304689 1.2304688h.8203125c0-1.1308008-.9199806-2.0507813-2.0507814-2.0507813z"/>
+                <path d="m2.4335937 4.15625v.8203125h.8615742c.1905586.9349375 1.0191562 1.640625 2.0095195 1.640625h1.640625c.9903633 0 1.818961-.7056875 2.0095195-1.640625h.8615744v-.8203125z"/>
+                <path d="m0 7.4375v.8203125h.86157422c.19053128.9349375 1.0191289 1.640625 2.0095196 1.640625h2.0234374v.8203125h2.4609375v-.8203125h2.0234376c.9903637 0 1.8189607-.7056875 2.0095197-1.640625h.861574v-.8203125z"/>
+                <path d="m10.609129 13.179688c-.190559-.934938-1.0191562-1.640625-2.0095195-1.640625h-4.921875c-.9903633 0-1.8189609.705687-2.0095195 1.640625h-.888918v.820312h10.691406v-.820312z"/>
+            </g>
+        </g>
+    </g>
+</svg>