From 266e91e45db85d27d5271267a1db2175e2588c1d Mon Sep 17 00:00:00 2001
From: Pieter Vander Vennet <pietervdvn@posteo.net>
Date: Thu, 13 Mar 2025 20:01:13 +0100
Subject: [PATCH] Themes(wayside_shrine,artwork): add artwork as adjacent
 concept to shrines

---
 assets/layers/artwork/artwork.json            | 34 ++++++++++++++++++
 .../layers/wayside_shrine/wayside_shrine.json | 36 +++++++++++++++++--
 .../wayside_shrines/wayside_shrines.json      | 10 +++++-
 3 files changed, 76 insertions(+), 4 deletions(-)

diff --git a/assets/layers/artwork/artwork.json b/assets/layers/artwork/artwork.json
index 06259fb889..e661b9b845 100644
--- a/assets/layers/artwork/artwork.json
+++ b/assets/layers/artwork/artwork.json
@@ -832,6 +832,7 @@
       "mappings": [
         {
           "if": "historic=memorial",
+          "icon": "./assets/layers/memorial/memorial.svg",
           "then": {
             "en": "This artwork also serves as a memorial",
             "de": "Dieses Kunstwerk dient auch als Mahnmal",
@@ -889,6 +890,7 @@
       "mappings": [
         {
           "if": "amenity=bench",
+          "icon": "./assets/layers/bench/bench.svg",
           "then": {
             "en": "This artwork also serves as a bench",
             "de": "Dieses Kunstwerk dient auch als Sitzbank",
@@ -954,6 +956,38 @@
           ]
         }
       }
+    },
+    {
+      "id": "doubles_as_wayside_shrine",
+      "question": {
+        "en": "Does this artwork also double as wayside shrine?"
+      },
+      "mappings": [
+        {
+          "if": "historic=wayside_shrine",
+          "icon": "./assets/layers/wayside_shrine/shrine.svg",
+          "then": {
+            "en": "This artwork acts as a wayside shrine"
+          }
+        },
+        {
+          "if": "historic=",
+          "alsoShowIf": "historic!=wayside_shrine",
+          "then": {
+            "en": "This artwork does not act as a wayside shrine"
+          }
+        }
+      ]
+    },
+    {
+      "builtin": "wayside_shrine.shrine_questions",
+      "override": {
+        "condition": {
+          "and+": [
+            "historic=wayside_shrine"
+          ]
+        }
+      }
     }
   ],
   "filter": [
diff --git a/assets/layers/wayside_shrine/wayside_shrine.json b/assets/layers/wayside_shrine/wayside_shrine.json
index c209f9cbb0..d2bb7ddc31 100644
--- a/assets/layers/wayside_shrine/wayside_shrine.json
+++ b/assets/layers/wayside_shrine/wayside_shrine.json
@@ -81,6 +81,9 @@
         "en": "What's the name of this shrine?"
       },
       "id": "shrine_name",
+      "labels": [
+        "shrine_questions"
+      ],
       "freeform": {
         "key": "name",
         "type": "string",
@@ -106,6 +109,9 @@
         "en": "To which religion is this shrine dedicated?"
       },
       "id": "religion",
+      "labels": [
+        "shrine_questions"
+      ],
       "mappings": [
         {
           "if": "religion=christian",
@@ -188,7 +194,14 @@
         "en": "What's the Christian denomination of the shrine?"
       },
       "id": "denomination_christian",
-      "condition": "religion=christian",
+      "labels": [
+        "shrine_questions"
+      ],
+      "condition": {
+        "and": [
+          "religion=christian"
+        ]
+      },
       "mappings": [
         {
           "if": "denomination=catholic",
@@ -280,6 +293,9 @@
         }
       ],
       "id": "denomination_muslim",
+      "labels": [
+        "shrine_questions"
+      ],
       "freeform": {
         "key": "denomination"
       },
@@ -289,7 +305,11 @@
       "question": {
         "en": "What's the Muslim denomination of this shrine?"
       },
-      "condition": "religion=muslim"
+      "condition": {
+        "and": [
+          "religion=muslim"
+        ]
+      }
     },
     {
       "mappings": [
@@ -319,6 +339,9 @@
         }
       ],
       "id": "denomination_jewish",
+      "labels": [
+        "shrine_questions"
+      ],
       "freeform": {
         "key": "denomination"
       },
@@ -328,13 +351,20 @@
       "question": {
         "en": "What's the Jewish denomination of this shrine?"
       },
-      "condition": "religion=jewish"
+      "condition": {
+        "and": [
+          "religion=jewish"
+        ]
+      }
     },
     {
       "question": {
         "en": "What's the denomination of this shrine?"
       },
       "id": "denomination_other",
+      "labels": [
+        "shrine_questions"
+      ],
       "render": {
         "en": "The denomination of this shrine is {denomination}"
       },
diff --git a/assets/themes/wayside_shrines/wayside_shrines.json b/assets/themes/wayside_shrines/wayside_shrines.json
index 980d2773a1..4392d787d8 100644
--- a/assets/themes/wayside_shrines/wayside_shrines.json
+++ b/assets/themes/wayside_shrines/wayside_shrines.json
@@ -8,6 +8,14 @@
   },
   "icon": "./assets/layers/wayside_shrine/shrine.svg",
   "layers": [
-    "wayside_shrine"
+    "wayside_shrine",
+    {
+      "builtin": [
+        "artwork"
+      ],
+      "override": {
+        "minzoom": 18
+      }
+    }
   ]
 }