From 19869f4540f5f909e24e4b8f1167dc140473b62a Mon Sep 17 00:00:00 2001
From: Brian Sperlongano <zelonewolf@gmail.com>
Date: Fri, 12 Feb 2021 23:45:25 -0500
Subject: [PATCH 1/4] Adding volcano icon and changing natural=volcano to use
 the new icon.

---
 style/amenity-points.mss    |  2 +-
 symbols/natural/volcano.svg | 37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 symbols/natural/volcano.svg

diff --git a/style/amenity-points.mss b/style/amenity-points.mss
index f475ba627c..38e9d84576 100644
--- a/style/amenity-points.mss
+++ b/style/amenity-points.mss
@@ -1372,7 +1372,7 @@
   }
 
   [feature = 'natural_volcano'][zoom >= 11] {
-    marker-file: url('symbols/natural/peak.svg');
+    marker-file: url('symbols/natural/volcano.svg');
     marker-fill: #d40000;
     marker-clip: false;
   }
diff --git a/symbols/natural/volcano.svg b/symbols/natural/volcano.svg
new file mode 100644
index 0000000000..9e7e076840
--- /dev/null
+++ b/symbols/natural/volcano.svg
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   id="svg2"
+   height="8"
+   width="8"
+   version="1.1">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <rect
+     style="fill:none;stroke:none;visibility:hidden"
+     id="canvas"
+     y="0"
+     x="0"
+     height="8"
+     width="8" />
+  <path
+     id="path4339-5"
+     d="m 5.9999996,4.2542373e-7 c -1.125,0 -2.583217,0.43275500457627 -2.5,1.74999997457627 -0.25,0 -0.874405,0.35967 -0.875,0.875 0,0.62132 0.25368,1.3749996 0.875,1.3749996 0.5625,0 0.996808,-0.8267616 1,-1.4999996 1.25007,0.0473 3.432764,-0.235931 3.5,-1.5 0,-0.82842697 -0.550252,-0.99999997457627 -2,-0.99999997457627 z M 2.4999996,4.5 0,8 l 3.4999996,0 4.5,0 -3.5,-3.5 c -0.75,1.25 -1.25,1.25 -2,0 z"
+     style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;" />
+</svg>

From a8636ab4d116c8948326318fc7cb8e4a2ecd0f9a Mon Sep 17 00:00:00 2001
From: Brian Sperlongano <zelonewolf@gmail.com>
Date: Sat, 27 Feb 2021 00:08:22 -0500
Subject: [PATCH 2/4] volcano & peak style consolidation

Volcano and peak will now show at 50% width at zoom 10.  Combined peak/volcano section to take advantage of common styling.
---
 style/amenity-points.mss    | 20 +++++-----
 symbols/natural/volcano.svg | 74 ++++++++++++++++++++++++++++---------
 2 files changed, 68 insertions(+), 26 deletions(-)

diff --git a/style/amenity-points.mss b/style/amenity-points.mss
index 38e9d84576..374038d9f6 100644
--- a/style/amenity-points.mss
+++ b/style/amenity-points.mss
@@ -1365,16 +1365,19 @@
     marker-fill: @man-made-icon;
   }
 
-  [feature = 'natural_peak'][zoom >= 11] {
-    marker-file: url('symbols/natural/peak.svg');
+  [feature = 'natural_peak'][zoom >= 10],
+  [feature = 'natural_volcano'][zoom >= 10] {
     marker-fill: @landform-color;
     marker-clip: false;
-  }
-
-  [feature = 'natural_volcano'][zoom >= 11] {
-    marker-file: url('symbols/natural/volcano.svg');
-    marker-fill: #d40000;
-    marker-clip: false;
+    [feature = 'natural_peak'] {
+      marker-file: url('symbols/natural/peak.svg');    
+    }
+    [feature = 'natural_volcano'] {
+      marker-file: url('symbols/natural/volcano.svg');    
+    }
+    [zoom = 10] {
+      marker-width: 4;
+    }
   }
 
   [feature = 'natural_saddle'][zoom >= 15] {
@@ -1833,7 +1836,6 @@
     text-wrap-width: @standard-wrap-width;
     text-line-spacing: @standard-line-spacing-size;
     text-fill: darken(@landform-color, 30%);
-    [feature = 'natural_volcano'] { text-fill: #d40000; }
     text-dy: 7;
     [feature = 'tourism_viewpoint'] { text-dy: 11; }
     text-face-name: @standard-font;
diff --git a/symbols/natural/volcano.svg b/symbols/natural/volcano.svg
index 9e7e076840..af6dc6f03b 100644
--- a/symbols/natural/volcano.svg
+++ b/symbols/natural/volcano.svg
@@ -5,12 +5,40 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   id="svg2"
-   height="8"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="8"
-   version="1.1">
+   height="8"
+   viewBox="0 0 2.1166667 2.1166667"
+   version="1.1"
+   id="svg8"
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15, custom)"
+   sodipodi:docname="volcano.svg">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="33.685562"
+     inkscape:cx="2.850346"
+     inkscape:cy="9.0452665"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     inkscape:document-rotation="0"
+     showgrid="false"
+     inkscape:window-width="1431"
+     inkscape:window-height="1030"
+     inkscape:window-x="128"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     units="px"
+     scale-x="0.5" />
   <metadata
-     id="metadata11">
+     id="metadata5">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
@@ -21,17 +49,29 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <defs
-     id="defs9" />
-  <rect
-     style="fill:none;stroke:none;visibility:hidden"
-     id="canvas"
-     y="0"
-     x="0"
-     height="8"
-     width="8" />
-  <path
-     id="path4339-5"
-     d="m 5.9999996,4.2542373e-7 c -1.125,0 -2.583217,0.43275500457627 -2.5,1.74999997457627 -0.25,0 -0.874405,0.35967 -0.875,0.875 0,0.62132 0.25368,1.3749996 0.875,1.3749996 0.5625,0 0.996808,-0.8267616 1,-1.4999996 1.25007,0.0473 3.432764,-0.235931 3.5,-1.5 0,-0.82842697 -0.550252,-0.99999997457627 -2,-0.99999997457627 z M 2.4999996,4.5 0,8 l 3.4999996,0 4.5,0 -3.5,-3.5 c -0.75,1.25 -1.25,1.25 -2,0 z"
-     style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;" />
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       id="path144"
+       style="stroke-width:0.244993"
+       d="M 0.57089056,1.2131908 -0.02824505,2.1197672 H 2.0796532 L 1.4805176,1.2131908 c -0.2343344,0.1186658 -0.48653269,0.2065535 -0.90962704,0 z"
+       sodipodi:nodetypes="ccccc" />
+    <ellipse
+       style="fill:#000000;stroke-width:0"
+       id="path45"
+       cx="1.0387298"
+       cy="0.7911762"
+       rx="0.33182466"
+       ry="0.34346956" />
+    <ellipse
+       style="fill:#000000;stroke-width:0"
+       id="path47"
+       cx="1.4521431"
+       cy="0.56489432"
+       rx="0.60117221"
+       ry="0.3531028"
+       transform="matrix(0.99491542,-0.10071399,0.09120868,0.9958318,0,0)" />
+  </g>
 </svg>

From 2bf7c799152eb79aca1dc06ff1068ad8f891c452 Mon Sep 17 00:00:00 2001
From: Brian Sperlongano <zelonewolf@gmail.com>
Date: Sat, 11 Sep 2021 20:11:37 -0400
Subject: [PATCH 3/4] Split up peak and volcano into separate blocks

---
 style/amenity-points.mss | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/style/amenity-points.mss b/style/amenity-points.mss
index a1a98b0df0..d5db63056a 100644
--- a/style/amenity-points.mss
+++ b/style/amenity-points.mss
@@ -1364,16 +1364,19 @@
     marker-fill: @man-made-icon;
   }
 
-  [feature = 'natural_peak'][zoom >= 10],
-  [feature = 'natural_volcano'][zoom >= 10] {
+  [feature = 'natural_peak'][zoom >= 10] {
     marker-fill: @landform-color;
     marker-clip: false;
-    [feature = 'natural_peak'] {
-      marker-file: url('symbols/natural/peak.svg');    
-    }
-    [feature = 'natural_volcano'] {
-      marker-file: url('symbols/natural/volcano.svg');    
+    marker-file: url('symbols/natural/peak.svg');    
+    [zoom = 10] {
+      marker-width: 4;
     }
+  }
+
+  [feature = 'natural_volcano'][zoom >= 10] {
+    marker-fill: @landform-color;
+    marker-clip: false;
+    marker-file: url('symbols/natural/volcano.svg');    
     [zoom = 10] {
       marker-width: 4;
     }

From f7da5c824b9d750c8469977b55dcf564ab76b59a Mon Sep 17 00:00:00 2001
From: Brian Sperlongano <zelonewolf@gmail.com>
Date: Sat, 11 Sep 2021 21:20:44 -0400
Subject: [PATCH 4/4] Update volcano SVG to clean copy

---
 symbols/natural/volcano.svg | 79 ++-----------------------------------
 1 file changed, 3 insertions(+), 76 deletions(-)

diff --git a/symbols/natural/volcano.svg b/symbols/natural/volcano.svg
index af6dc6f03b..f03d1059b5 100644
--- a/symbols/natural/volcano.svg
+++ b/symbols/natural/volcano.svg
@@ -1,77 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="8"
-   height="8"
-   viewBox="0 0 2.1166667 2.1166667"
-   version="1.1"
-   id="svg8"
-   inkscape:version="1.0.2 (e86c870879, 2021-01-15, custom)"
-   sodipodi:docname="volcano.svg">
-  <defs
-     id="defs2" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="33.685562"
-     inkscape:cx="2.850346"
-     inkscape:cy="9.0452665"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     inkscape:document-rotation="0"
-     showgrid="false"
-     inkscape:window-width="1431"
-     inkscape:window-height="1030"
-     inkscape:window-x="128"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     units="px"
-     scale-x="0.5" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <path
-       id="path144"
-       style="stroke-width:0.244993"
-       d="M 0.57089056,1.2131908 -0.02824505,2.1197672 H 2.0796532 L 1.4805176,1.2131908 c -0.2343344,0.1186658 -0.48653269,0.2065535 -0.90962704,0 z"
-       sodipodi:nodetypes="ccccc" />
-    <ellipse
-       style="fill:#000000;stroke-width:0"
-       id="path45"
-       cx="1.0387298"
-       cy="0.7911762"
-       rx="0.33182466"
-       ry="0.34346956" />
-    <ellipse
-       style="fill:#000000;stroke-width:0"
-       id="path47"
-       cx="1.4521431"
-       cy="0.56489432"
-       rx="0.60117221"
-       ry="0.3531028"
-       transform="matrix(0.99491542,-0.10071399,0.09120868,0.9958318,0,0)" />
-  </g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="8" height="8" viewBox="0 0 8 8">
+  <path d="m0,8 l2.275,-3.45 a3.25,3.25 0 0 0 3.45,0 l2.275,3.45 z M5.247,2.904 A1.33,2.27 84 1 0 3.48 1.804 A1.25,1.30 0 1 0 5.247,2.904z"/>
 </svg>