Merge branch 'expand_shrines' of source.mapcomplete.org:Bastian-Greshake-Tzovaras/MapComplete into expand_shrines

assets/layers/wayside_cross/license_info.json

@@ -1,42 +0,0 @@
-[
-  {
-    "path": "wayside_cross_example1.jpg",
-    "license": "CC-BY-SA-4.0",
-    "authors": [
-      "Przykuta"
-    ],
-    "sources": [
-      "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",
-    "authors": [
-      "Markus B"
-    ],
-    "sources": [
-      "https://wiki.openstreetmap.org/wiki/File:Wegkreuz.jpg"
-    ]
-  },
-  {
-    "path": "wayside_cross_example3.jpg",
-    "license": "CC-BY-SA 3.0",
-    "authors": [
-      "HeinzLW"
-    ],
-    "sources": [
-      "https://wiki.openstreetmap.org/wiki/File:Schaederkreuz.jpg"
-    ]
-  }
-]

assets/layers/wayside_cross/wayside_cross.json

@@ -1,182 +0,0 @@
-{
-  "minzoom": 15,
-  "pointRendering": [
-    {
-      "location": [
-        "point",
-        "centroid"
-      ],
-      "marker": [
-        {
-          "icon": "circle",
-          "color": "white"
-        },
-        {
-          "icon": "./assets/layers/wayside_cross/wayside_cross.svg"
-        }
-      ]
-    }
-  ],
-  "tagRenderings": [
-    "images",
-    {
-      "question": {
-        "en": "What is the name of this wayside cross?"
-      },
-      "id": "wayside_cross_name",
-      "render": {
-        "en": "This wayside cross is called {name}"
-      },
-      "freeform": {
-        "key": "name"
-      }
-    },
-    {
-      "question": {
-        "en": "What is the inscription on this cross?"
-      },
-      "id": "wayside_cross_inscription",
-      "freeform": {
-        "key": "inscription"
-      },
-      "render": {
-        "en": "The inscription on this shrine is: {inscription}"
-      }
-    },
-    {
-      "question": {
-        "en": "What's the Christian denomination of this cross?"
-      },
-      "id": "wayside_cross_denomination",
-      "labels": [
-        "shrine_questions"
-      ],
-      "mappings": [
-        {
-          "if": "denomination=catholic",
-          "then": {
-            "en": "The religious subdenomination is Catholic"
-          }
-        },
-        {
-          "if": "denomination=roman_catholic",
-          "then": {
-            "en": "The religious subdenomination is Roman Catholic"
-          }
-        },
-        {
-          "if": "denomination=orthodox",
-          "then": {
-            "en": "The religious subdenomination is Orthodox"
-          }
-        },
-        {
-          "if": "denomination=greek_orthodox",
-          "then": {
-            "en": "The religious subdenomination is Greek-Orthodox"
-          }
-        },
-        {
-          "if": "denomination=russian_orthodox",
-          "then": {
-            "en": "The religious subdenomination is Russian-Orthodox"
-          }
-        },
-        {
-          "if": "denomination=serbian_orthodox",
-          "then": {
-            "en": "The religious subdenomination is Serbian Orthodox"
-          }
-        },
-        {
-          "if": "denomination=protestant",
-          "then": {
-            "en": "The religious subdenomination is Protestant"
-          }
-        },
-        {
-          "if": "denomination=anglican",
-          "then": {
-            "en": "The religious subdenomination is Anglican"
-          }
-        },
-        {
-          "if": "denomination=adventist",
-          "then": {
-            "en": "The religious subdenomination is Adventist"
-          }
-        },
-        {
-          "if": "denomination=evangelical",
-          "then": {
-            "en": "The religious subdenomination is evangelical"
-          }
-        }
-      ],
-      "render": {
-        "en": "The religious denomination is <b>{denomination}</b>"
-      },
-      "multiAnswer": true,
-      "freeform": {
-        "key": "denomination"
-      }
-    }
-  ],
-  "lineRendering": [
-    {
-      "width": 1,
-      "color": "blue"
-    }
-  ],
-  "credits": "Bastian Greshake Tzovaras",
-  "credits:uid": 20617622,
-  "source": {
-    "osmTags": "historic=wayside_cross"
-  },
-  "id": "wayside_cross",
-  "name": {
-    "en": "Wayside crosses"
-  },
-  "description": {
-    "en": "Wayside crosses are (often historic) Christian crosses found along the road in many parts of the world."
-  },
-  "title": {
-    "render": {
-      "en": "Wayside Cross {name}"
-    }
-  },
-  "presets": [
-    {
-      "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_cross/wayside_cross_example1.jpg",
-        "./assets/layers/wayside_cross/wayside_cross_example2.jpg",
-        "./assets/layers/wayside_cross/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"
-      }
-    }
-  ]
-}

assets/layers/wayside_shrine/license_info.json

@@ -48,5 +48,45 @@
     "sources": [
       "https://source.mapcomplete.org/MapComplete/MapComplete/pulls/2349/files#diff-a27dbd36795c9186dfd9f614f3a7f06709b64d2c"
     ]
+  },
+  {
+    "path": "wayside_cross_example1.jpg",
+    "license": "CC-BY-SA-4.0",
+    "authors": [
+      "Przykuta"
+    ],
+    "sources": [
+      "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",
+    "authors": [
+      "Markus B"
+    ],
+    "sources": [
+      "https://wiki.openstreetmap.org/wiki/File:Wegkreuz.jpg"
+    ]
+  },
+  {
+    "path": "wayside_cross_example3.jpg",
+    "license": "CC-BY-SA 3.0",
+    "authors": [
+      "HeinzLW"
+    ],
+    "sources": [
+      "https://wiki.openstreetmap.org/wiki/File:Schaederkreuz.jpg"
+    ]
   }
-]
+]

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_inscription",
+      "freeform": {
+        "key": "inscription"
+      },
+      "render": {
+        "en": "The inscription on this {title()} is: {inscription}"
+      }
+    },
     "level"
   ],
   "deletion": {

assets/themes/wayside_shrines/wayside_shrines.json

@@ -8,8 +8,7 @@
   },
   "icon": "./assets/layers/wayside_shrine/shrine.svg",
   "layers": [
-    "wayside_shrine",
-    "wayside_cross",
+    "wayside_shrine"
     {
       "builtin": [
         "artwork"