From c5d91d7a403f0e6fa6bbe50e866616f9b2db2bb0 Mon Sep 17 00:00:00 2001
From: Pieter Vander Vennet <pietervdvn@posteo.net>
Date: Wed, 26 Mar 2025 01:06:08 +0100
Subject: [PATCH] Chore: various small fixes to wayside crosses

---
 .../layers/wayside_shrine/license_info.json   | 22 +++++++++----------
 .../wayside_shrine/wayside_cross.svg.license  |  4 ++--
 .../wayside_cross_example1.jpg.license        |  2 +-
 .../wayside_cross_example2.jpg.license        |  2 +-
 .../wayside_cross_example3.jpg.license        |  2 +-
 .../layers/wayside_shrine/wayside_shrine.json |  9 +++-----
 6 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/assets/layers/wayside_shrine/license_info.json b/assets/layers/wayside_shrine/license_info.json
index fbb4904af..336493a0b 100644
--- a/assets/layers/wayside_shrine/license_info.json
+++ b/assets/layers/wayside_shrine/license_info.json
@@ -49,6 +49,16 @@
       "https://source.mapcomplete.org/MapComplete/MapComplete/pulls/2349/files#diff-a27dbd36795c9186dfd9f614f3a7f06709b64d2c"
     ]
   },
+  {
+    "path": "wayside_cross.svg",
+    "license": "CC0-1.0",
+    "authors": [
+      "Geozeisig"
+    ],
+    "sources": [
+      "https://wiki.openstreetmap.org/wiki/File:Christian-16.svg"
+    ]
+  },
   {
     "path": "wayside_cross_example1.jpg",
     "license": "CC-BY-SA-4.0",
@@ -59,16 +69,6 @@
       "https://wiki.openstreetmap.org/wiki/File:Gor%C4%99dy_krzy%C5%BCe_13.07.2009_p.jpg"
     ]
   },
-  {
-    "path": wayside_cross.svg",
-    "license": "CC0-1.0",
-    "authors": [
-      "Geozeisig"
-    ],
-    "sources": [
-      "https://wiki.openstreetmap.org/wiki/File:Christian-16.svg"
-    ]
-  },
   {
     "path": "wayside_cross_example2.jpg",
     "license": "CC0-1.0",
@@ -89,4 +89,4 @@
       "https://wiki.openstreetmap.org/wiki/File:Schaederkreuz.jpg"
     ]
   }
-]
+]
\ No newline at end of file
diff --git a/assets/layers/wayside_shrine/wayside_cross.svg.license b/assets/layers/wayside_shrine/wayside_cross.svg.license
index 3a52805b4..5e3616ed7 100644
--- a/assets/layers/wayside_shrine/wayside_cross.svg.license
+++ b/assets/layers/wayside_shrine/wayside_cross.svg.license
@@ -1,2 +1,2 @@
-SPDX-FileCopyrightText: Geozeisig 
-SPDX-License-Identifier: CC0-1.0
+SPDX-FileCopyrightText: Geozeisig
+SPDX-License-Identifier: CC0-1.0
\ No newline at end of file
diff --git a/assets/layers/wayside_shrine/wayside_cross_example1.jpg.license b/assets/layers/wayside_shrine/wayside_cross_example1.jpg.license
index 41e72fb43..a13c1bdfc 100644
--- a/assets/layers/wayside_shrine/wayside_cross_example1.jpg.license
+++ b/assets/layers/wayside_shrine/wayside_cross_example1.jpg.license
@@ -1,2 +1,2 @@
 SPDX-FileCopyrightText: Przykuta
-SPDX-License-Identifier: CC-BY-SA-4.0
+SPDX-License-Identifier: CC-BY-SA-4.0
\ No newline at end of file
diff --git a/assets/layers/wayside_shrine/wayside_cross_example2.jpg.license b/assets/layers/wayside_shrine/wayside_cross_example2.jpg.license
index 8d09c5bce..83081ddf0 100644
--- a/assets/layers/wayside_shrine/wayside_cross_example2.jpg.license
+++ b/assets/layers/wayside_shrine/wayside_cross_example2.jpg.license
@@ -1,2 +1,2 @@
 SPDX-FileCopyrightText: Markus B
-SPDX-License-Identifier: CC0-1.0
+SPDX-License-Identifier: CC0-1.0
\ No newline at end of file
diff --git a/assets/layers/wayside_shrine/wayside_cross_example3.jpg.license b/assets/layers/wayside_shrine/wayside_cross_example3.jpg.license
index 3fcb3b74a..518bab6dc 100644
--- a/assets/layers/wayside_shrine/wayside_cross_example3.jpg.license
+++ b/assets/layers/wayside_shrine/wayside_cross_example3.jpg.license
@@ -1,2 +1,2 @@
 SPDX-FileCopyrightText: HeinzLW
-SPDX-License-Identifier: CC-BY-SA-3.0
+SPDX-License-Identifier: CC-BY-SA 3.0
\ No newline at end of file
diff --git a/assets/layers/wayside_shrine/wayside_shrine.json b/assets/layers/wayside_shrine/wayside_shrine.json
index 32913502e..a15491dd7 100644
--- a/assets/layers/wayside_shrine/wayside_shrine.json
+++ b/assets/layers/wayside_shrine/wayside_shrine.json
@@ -1,7 +1,7 @@
 {
   "id": "wayside_shrine",
   "name": {
-    "en": "Wayside Shrines"
+    "en": "Wayside Shrines and Crosses"
   },
   "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. 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."
@@ -16,20 +16,17 @@
   },
   "minzoom": 12,
   "title": {
-    "render": {
-      "en": "{title()} {name}"
-    },
     "mappings": [
       {
         "if": "historic=wayside_shrine",
         "then": {
-          "en": "Wayside Shrine"
+          "en": "Wayside Shrine {name}"
         }
       },
       {
         "if": "historic=wayside_cross",
         "then": {
-          "en": "Wayside Cross"
+          "en": "Wayside Cross {name}"
         }
       }
     ]