From 67c2dcacdfcb50a88b9407f35d7181b70446f927 Mon Sep 17 00:00:00 2001
From: handymenny <handymenny@outlook.com>
Date: Tue, 20 Feb 2024 18:15:44 +0100
Subject: [PATCH] style: use a generic shop icon as fallback for shops

The generic icon replaces frozen_food, tattoo, watches icons
---
 layers/poi/style.json                     | 36 +++++++++-----
 style/icons/{frozen_food.svg => shop.svg} |  0
 style/icons/tattoo.svg                    | 59 -----------------------
 style/icons/watches.svg                   | 59 -----------------------
 4 files changed, 23 insertions(+), 131 deletions(-)
 rename style/icons/{frozen_food.svg => shop.svg} (100%)
 delete mode 100644 style/icons/tattoo.svg
 delete mode 100644 style/icons/watches.svg

diff --git a/layers/poi/style.json b/layers/poi/style.json
index e80fa94d..b117cb92 100644
--- a/layers/poi/style.json
+++ b/layers/poi/style.json
@@ -23,19 +23,29 @@
           ]
         },
         "icon-image": [
-          "match",
-          ["get", "subclass"],
-          "chocolate",
-          "confectionery",
-          "wine",
-          "alcohol",
-          "kiosk",
-          "newsagent",
-          "perfume",
-          "perfumery",
-          "wholesale",
-          "trade",
-          ["get", "subclass"]
+          "coalesce",
+          [
+            "image",
+            [
+              "match",
+              ["get", "subclass"],
+              "chocolate",
+              "confectionery",
+              "wine",
+              "alcohol",
+              "kiosk",
+              "newsagent",
+              "perfume",
+              "perfumery",
+              "wholesale",
+              "trade",
+              ["get", "subclass"]
+            ]
+          ],
+          [
+            "image",
+            "shop"
+          ]
         ],
         "text-field": "{name:latin}\n{name:nonlatin}",
         "visibility": "visible",
diff --git a/style/icons/frozen_food.svg b/style/icons/shop.svg
similarity index 100%
rename from style/icons/frozen_food.svg
rename to style/icons/shop.svg
diff --git a/style/icons/tattoo.svg b/style/icons/tattoo.svg
deleted file mode 100644
index d29e518e..00000000
--- a/style/icons/tattoo.svg
+++ /dev/null
@@ -1,59 +0,0 @@
-<?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="14"
-   height="14"
-   viewBox="0 0 14 14"
-   fill="none"
-   version="1.1"
-   id="svg29764"
-   sodipodi:docname="tattoo.svg"
-   inkscape:version="1.0.2 (e86c8708, 2021-01-15)">
-  <metadata
-     id="metadata29770">
-    <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="defs29768" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1265"
-     inkscape:window-height="714"
-     id="namedview29766"
-     showgrid="false"
-     inkscape:zoom="33.14"
-     inkscape:cx="7"
-     inkscape:cy="7"
-     inkscape:window-x="0"
-     inkscape:window-y="25"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg29764"
-     inkscape:pagecheckerboard="true" />
-  <circle
-     style="fill:#ac39ac;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;paint-order:stroke fill markers"
-     id="path30353"
-     cx="6.8497281"
-     cy="7.0609536"
-     r="2.6554012" />
-</svg>
diff --git a/style/icons/watches.svg b/style/icons/watches.svg
deleted file mode 100644
index df654b43..00000000
--- a/style/icons/watches.svg
+++ /dev/null
@@ -1,59 +0,0 @@
-<?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="14"
-   height="14"
-   viewBox="0 0 14 14"
-   fill="none"
-   version="1.1"
-   id="svg29764"
-   sodipodi:docname="other.svg"
-   inkscape:version="1.0.2 (e86c8708, 2021-01-15)">
-  <metadata
-     id="metadata29770">
-    <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="defs29768" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1265"
-     inkscape:window-height="714"
-     id="namedview29766"
-     showgrid="false"
-     inkscape:zoom="33.14"
-     inkscape:cx="7"
-     inkscape:cy="7"
-     inkscape:window-x="0"
-     inkscape:window-y="25"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg29764"
-     inkscape:pagecheckerboard="true" />
-  <circle
-     style="fill:#ac39ac;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;paint-order:stroke fill markers"
-     id="path30353"
-     cx="6.8497281"
-     cy="7.0609536"
-     r="2.6554012" />
-</svg>