From 3df5727f40a29d190394c71cf99896261f78474d Mon Sep 17 00:00:00 2001
From: Pieter Vander Vennet <pietervdvn@posteo.net>
Date: Fri, 30 Jun 2023 02:32:57 +0200
Subject: [PATCH] Themes: add shoe repair services to the climbing map, add
 question if a shoemaker also repairs climbing shoes, add craft=shoemaker to
 shops theme

---
 assets/layers/shops/shops.json       | 19 +++++-
 assets/themes/climbing/climbing.json | 93 +++++++++++++++++++++++++++-
 2 files changed, 109 insertions(+), 3 deletions(-)

diff --git a/assets/layers/shops/shops.json b/assets/layers/shops/shops.json
index f4159b8c8..f27c2c7b9 100644
--- a/assets/layers/shops/shops.json
+++ b/assets/layers/shops/shops.json
@@ -16,7 +16,13 @@
   "source": {
     "osmTags": {
       "and": [
-        "shop~*",
+        {
+          "or": [
+            "shop~*",
+            "craft=shoe_repair",
+            "craft=key_cutter"
+          ]
+        },
         "shop!=mall"
       ]
     }
@@ -128,7 +134,8 @@
           "addExtraTags": [
             "fixme=freeform shop key used, to be reviewed"
           ]
-        }
+        },
+        "condition": "craft="
       }
     },
     "opening_hours",
@@ -333,6 +340,14 @@
                 ]
               },
               "then": "circle:white;./assets/layers/shops/shop-disused.svg"
+            },
+            {
+              "if": "craft=shoemaker",
+              "then": "circle:white;./assets/layers/id_presets/temaki-hammer_shoe.svg"
+            },
+            {
+              "if": "craft=key_cutter",
+              "then": "circle:white;./assets/layers/id_presets/fas-key.svg"
             }
           ]
         }
diff --git a/assets/themes/climbing/climbing.json b/assets/themes/climbing/climbing.json
index 92d5eb77d..c39e44264 100644
--- a/assets/themes/climbing/climbing.json
+++ b/assets/themes/climbing/climbing.json
@@ -335,7 +335,98 @@
           "reviews"
         ]
       }
+    },
+    {
+      "builtin": [
+        "shops"
+      ],
+      "override": {
+        "id": "shops_with_climbing_shoe_repair",
+        "source": {
+          "=osmTags": {
+            "and": [
+              "service:repair:climbing_shoes=yes",
+              {
+                "or": [
+                  "shop=shoe_repair",
+                  "craft=shoemaker"
+                ]
+              }
+            ]
+          }
+        },
+        "=presets": [],
+        "minzoom": 8,
+        "+tagRenderings": [
+          {
+            "id": "repairs_climbing_shoes",
+            "question": {
+              "en": "Does this shoe repair shop repair climbing shoes?"
+            },
+            "mappings": [
+              {
+                "if": "service:repair:climbing_shoes=yes",
+                "then": {
+                  "en": "This shop repairs climbing shoes"
+                }
+              },
+              {
+                "if": "service:repair:climbing_shoes=no",
+                "then": {
+                  "en": "This shop does not repair climbing shoes"
+                }
+              }
+            ]
+          }
+        ]
+      }
+    },
+    {
+      "builtin": [
+        "shops"
+      ],
+      "override": {
+        "=osmTags": {
+          "or": [
+            "shop=shoe_repair",
+            "craft=shoemaker"
+          ]
+        },
+        "minzoom": 16,
+        "+tagRenderings": [
+          {
+            "id": "repairs_climbing_shoes",
+            "question": {
+              "en": "Does this shoe repair shop also repair clibming shoes?"
+            },
+            "mappings": [
+              {
+                "if": "service:repair:climbing_shoes=yes",
+                "then": {
+                  "en": "This shop repairs climbing shoes"
+                }
+              },
+              {
+                "if": "service:repair:climbing_shoes=no",
+                "then": {
+                  "en": "This shop does not repair climbing shoes"
+                }
+              }
+            ]
+          }
+        ],
+        "=presets": [
+          {
+            "tags": [
+              "shop=shoe_repair"
+            ],
+            "title": {
+              "en": "a shoe repair shop"
+            }
+          }
+        ]
+      }
     }
   ],
   "credits": "Christian Neumann <christian@utopicode.de>"
-}
\ No newline at end of file
+}