From 257099b045abeff208b4e6b33a2a4a192b499b7e Mon Sep 17 00:00:00 2001
From: Bastian Greshake Tzovaras <bgreshake@googlemail.com>
Date: Mon, 17 Mar 2025 22:55:33 -0300
Subject: [PATCH] merge layers

---
 .../layers/wayside_shrine/wayside_shrine.json | 98 ++++++++++++++++---
 1 file changed, 87 insertions(+), 11 deletions(-)

diff --git a/assets/layers/wayside_shrine/wayside_shrine.json b/assets/layers/wayside_shrine/wayside_shrine.json
index a7b9a94ad3..e8846a9cd5 100644
--- a/assets/layers/wayside_shrine/wayside_shrine.json
+++ b/assets/layers/wayside_shrine/wayside_shrine.json
@@ -4,16 +4,35 @@
     "en": "Wayside Shrines"
   },
   "description": {
-    "en": "Shrines are religious places that are dedicated to specific deities, saints and other figures of religious importance. Typically, the contain religious depictions and people frequently leave offerings at those places. Wayside shrines are small shrines that can be found next to a road or pathway and are frequented by travellers passing by."
+    "en": "Shrines are religious places that are dedicated to specific deities, saints and other figures of religious importance. Typically, the contain religious depictions and people frequently leave offerings at those places. Wayside shrines are small shrines that can be found next to a road or pathway and are frequented by travellers passing by. Wayside crosses can be seen as a sub-type of a wayside shrine, typically in the form of a Christian cross at the side of the road, typically without votive offerings."
   },
   "source": {
-    "osmTags": "historic=wayside_shrine"
+    "osmTags": {
+      "or": [
+        "historic=wayside_shrine",
+        "historic=wayside_cross"
+      ]
+    }
   },
   "minzoom": 12,
   "title": {
     "render": {
-      "en": "Wayside Shrine {name}"
-    }
+      "en": "{title()} {name}"
+    },
+    "mappings": [
+      {
+        "if": "historic=wayside_shrine",
+        "then": {
+          "en": "Wayside Shrine"
+        }
+      },
+      {
+        "if": "historic=wayside_cross",
+        "then": {
+          "en": "Wayside Cross"
+        }
+      }
+    ]
   },
   "pointRendering": [
     {
@@ -28,7 +47,19 @@
           "color": "white"
         },
         {
-          "icon": "./assets/layers/wayside_shrine/shrine.svg"
+          "icon": {
+            "render": "./assets/layers/wayside_shrine/shrine.svg",
+            "mappings": [
+              {
+                "if": "historic=wayside_cross",
+                "then": "./assets/layers/wayside_shrine/wayside_cross.svg"
+              },
+              {
+                "if": "historic=wayside_shrine",
+                "then": "./assets/layers/wayside_shrine/shrine.svg"
+              }
+            ]
+          }
         }
       ]
     }
@@ -72,13 +103,45 @@
       "exampleImages": [
         "./assets/layers/wayside_shrine/MountedShrineExample.jpg"
       ]
+    },
+    {
+      "title": {
+        "en": "a wayside cross"
+      },
+      "tags": [
+        "historic=wayside_cross",
+        "religion=christian"
+      ],
+      "description": {
+        "en": "A wayside cross is a christian cross that is placed by a road or pathway."
+      },
+      "exampleImages": [
+        "./assets/layers/wayside_shrine/wayside_cross_example1.jpg",
+        "./assets/layers/wayside_shrine/wayside_cross_example2.jpg",
+        "./assets/layers/wayside_shrine/wayside_cross_example3.jpg"
+      ]
+    },
+    {
+      "title": {
+        "en": "a wayside cross mounted on a wall"
+      },
+      "tags": [
+        "religion=christian",
+        "historic=wayside_cross"
+      ],
+      "snapToLayer": [
+        "walls_and_buildings"
+      ],
+      "description": {
+        "en": "A wayside cross is a christian cross that is placed by a road or pathway. This cross is mounted on a wall"
+      }
     }
   ],
   "tagRenderings": [
     "images",
     {
       "question": {
-        "en": "What's the name of this shrine?"
+        "en": "What's the name of this {title()}?"
       },
       "id": "shrine_name",
       "labels": [
@@ -92,7 +155,7 @@
         ]
       },
       "render": {
-        "en": "The name of this shrine is <b>{name}</b>"
+        "en": "The name of this {title()} is <b>{name}</b>"
       },
       "mappings": [
         {
@@ -180,18 +243,19 @@
           }
         }
       ],
-      "multiAnswer": true,
+      "multiAnswer": false,
       "freeform": {
         "key": "religion",
         "type": "string"
       },
       "render": {
         "en": "This shrine is {religion}"
-      }
+      },
+      "condition": "historic!=wayside_cross"
     },
     {
       "question": {
-        "en": "What's the Christian denomination of the shrine?"
+        "en": "What's the Christian denomination of this {title()}?"
       },
       "id": "denomination_christian",
       "labels": [
@@ -267,7 +331,7 @@
       "render": {
         "en": "The religious denomination is <b>{denomination}</b>"
       },
-      "multiAnswer": true,
+      "multiAnswer": false,
       "freeform": {
         "key": "denomination"
       }
@@ -383,6 +447,18 @@
         ]
       }
     },
+    {
+      "question": {
+        "en": "What is the inscription on this {title()}?"
+      },
+      "id": "wayside_cross_inscription",
+      "freeform": {
+        "key": "inscription"
+      },
+      "render": {
+        "en": "The inscription on this {title()} is: {inscription}"
+      }
+    },
     "level"
   ],
   "deletion": {