Merge branch 'master' into develop

assets/layers/artwork/artwork.json

@@ -789,6 +789,37 @@
         "artwork-question"
       ]
     },
+    {
+      "id": "doubles_as_memorial",
+      "question": {
+        "en": "Does this artwork serve as a memorial?"
+      },
+      "mappings": [
+        {
+          "if": "historic=memorial",
+          "then": {
+            "en": "This artwork also serves as a memorial"
+          }
+        },
+        {
+          "if": "historic=",
+          "alsoShowIf": "historic!=memorial",
+          "then": {
+            "en": "This artwork does not serve as a bench"
+          }
+        }
+      ]
+    },
+    {
+      "builtin": "memorial.memorial-questions",
+      "override": {
+        "condition": {
+          "and+": [
+            "historic=memorial"
+          ]
+        }
+      }
+    },
     {
       "id": "doubles_as_bench",
       "question": {
@@ -867,7 +898,7 @@
       "builtin": "bench.bench-questions",
       "override": {
         "condition": {
-          "and": [
+          "and+": [
             "amenity=bench"
           ]
         }

assets/layers/memorial/memorial.json

@@ -93,6 +93,9 @@
     "images",
     {
       "id": "memorial-type",
+      "labels": [
+        "memorial-questions"
+      ],
       "question": {
         "en": "What type of memorial is this?",
         "de": "Was für eine Art von Denkmal ist das?",
@@ -255,6 +258,9 @@
     },
     {
       "id": "inscription",
+      "labels": [
+        "memorial-questions"
+      ],
       "question": {
         "en": "What is the inscription on this memorial?",
         "ca": "Quina és la inscripció d'aquesta placa?",
@@ -264,7 +270,11 @@
         "nl": "Wat is het opschrift van dit gedenkteken?"
       },
       "#:condition": "Benches have a separate inscription question",
-      "condition": "memorial!=bench",
+      "condition": {
+        "and": [
+          "memorial!=bench"
+        ]
+      },
       "render": {
         "en": "The inscription on this memorial reads: <p><i>{inscription}<i></p>",
         "ca": "La inscripció d'aquesta placa diu: <p><i>{inscription}<i></p>",

assets/layers/playground/playground.json

@@ -289,6 +289,12 @@
             "de": "Die Oberfläche besteht aus Gummi, z. B. aus Gummifliesen, Gummimulch oder einer großen Gummifläche",
             "fr": "La surface est en caoutchouc, comme des dalles de caoutchouc, des copeaux de caoutchouc ou une grande surface en caoutchouc"
           }
+        },{
+          "if": "surface=fine_gravel",
+          "then": {
+            "en": "The surface is <b>fine gravel</b> (less then 2 cm per stone)",
+            "nl": "De ondergrond bestaat uit <b>kleine grindsteentjes</b> (steentjes kleiner dan 2 cm)"
+          }
         }
       ],
       "id": "playground-surface",

assets/layers/toilet_at_amenity/toilet_at_amenity.json

@@ -15,7 +15,12 @@
     "cs": "Vrstva zobrazující (veřejné) toalety umístěné na různých místech."
   },
   "source": {
-    "osmTags": "toilets=yes"
+    "osmTags": {
+      "and": [
+        "toilets=yes",
+        "type!=route"
+      ]
+    }
   },
   "minzoom": 12,
   "title": {