Merge master

assets/layers/food/food.json

@@ -383,6 +383,26 @@
       ],
       "id": "Takeaway"
     },
+    {
+      "id": "delivery",
+      "question": {
+        "en": "Delivers {title()} their food at home?"
+      },
+      "mappings": [
+        {
+          "if": "delivery=yes",
+          "then": {
+            "en": "This business does home delivery (eventually via a third party)"
+          }
+        },
+        {
+          "if": "delivery=no",
+          "then": {
+            "en": "This business does not deliver at home"
+          }
+        }
+      ]
+    },
     {
       "question": {
         "nl": "Heeft deze eetgelegenheid een vegetarische optie?",

assets/layers/playground/playground.json

@@ -348,7 +348,13 @@
             "fr": "Non accessible",
             "de": "Der Spielplatz ist nicht öffentlich zugänglich"
           }
-        }
+        },
+        {"if": "leisure=playground",
+          "then":
+          {
+            "en": "This is a schoolyard - an outdoor area where the pupils can play during their breaks; but it is not accessible to the general public",
+            "nl": "Dit is een schoolplein - een zone waar de leerlingen kunnen spelen tijdens de pauze. Dit schoolplein is niet toegankelijk voor het publiek"
+          }}
       ]
     },
     "website",
@@ -510,6 +516,15 @@
     }
   ],
   "deletion": {
+    "nonDeleteMappings": [
+      {
+        "if": "leisure=schoolyard",
+        "then": {
+          "en": "This is a schoolyard - an (outdoor) area where pupils of a school can play during recess and which is not publicly accessible",
+          "nl": "Dit is een schoolplein - een ruimte waar de leerlingen van een school kunnen spelen tijdens de pauze maar die niet publiek toegankelijk is"
+        }
+      }
+    ],
     "softDeletionTags": {
       "and": [
         "disused:leisure=playground",

assets/layers/shops/shops.json

@@ -467,7 +467,8 @@
           "osmTags": "payment:cash=yes",
           "question": {
             "en": "Accepts cash",
-            "de": "Akzeptiert Bargeld"
+            "de": "Akzeptiert Bargeld",
+            "nl": "Accepteert cash"
           }
         }
       ]
@@ -479,7 +480,8 @@
           "osmTags": "payment:cards=yes",
           "question": {
             "en": "Accepts payment cards",
-            "de": "Akzeptiert Kartenzahlung"
+            "de": "Akzeptiert Kartenzahlung",
+            "nl": "Accepteert betaalkaarten"
           }
         }
       ]

assets/layers/street_lamps/street_lamps.json

@@ -56,6 +56,7 @@
     }
   ],
   "tagRenderings": [
+    "images",
     {
       "id": "ref",
       "render": {