Merge pull request #2300 from pietervdvn/RobinLinde-patch-1

Several theme fixes

.vscode/settings.json

@@ -53,8 +53,5 @@
   "[svelte]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
-  "editor.formatOnSave": true,
+  "editor.formatOnSave": true
-  "files.associations": {
-    "*.protojson": "json"
-  }
 }

assets/layers/cafe_pub/cafe_pub.json

@@ -401,6 +401,7 @@
     "wheelchair-access",
     "smoking",
     "service:electricity",
+    "seating",
     "dog-access",
     "internet",
     "internet-fee",
@@ -412,7 +413,9 @@
     "accepts_cash",
     "accepts_cards",
     "has_internet",
-    "has_electricity"
+    "has_electricity",
+    "outdoor_seating",
+    "indoor_seating"
   ],
   "deletion": {
     "softDeletionTags": {

assets/layers/charging_station/charging_station.json

@@ -1790,9 +1790,9 @@
             {
               "en": "<b>Tesla Supercharger</b>",
               "nl": "<b>Tesla Supercharger</b>",
+              "cs": "<b>Tesla Supercharger</b>",
               "de": "<b>Tesla Supercharger</b>",
-              "es": "<b>Tesla Supercharger</b>",
+              "es": "<b>Tesla Supercharger</b>"
-              "cs": "<b>Tesla Supercharger</b>"
             },
             "Tesla-hpwc-model-s.svg",
             [
@@ -2530,43 +2530,15 @@
     },
     {
       "id": "maxstay",
-      "question": {
+      "builtin": "maxstay",
-        "en": "What is the maximum amount of time one is allowed to stay here?",
+      "override": {
-        "nl": "Hoelang mag een voertuig hier blijven staan?",
+        "condition": {
-        "ca": "Quina és la quantitat màxima de temps que es permet permaneixer aquí?",
+          "or": [
-        "de": "Wie lange darf man hier maximal parken?",
+            "motorcar=yes",
-        "es": "¿Cuál es el tiempo máximo que se permite permanecer aquí?"
+            "hgv=yes",
-      },
+            "bus=yes"
-      "freeform": {
+          ]
-        "key": "maxstay",
-        "type": "pfloat"
-      },
-      "render": {
-        "en": "One can stay at most <b>{canonical(maxstay)}</b>",
-        "nl": "De maximale parkeertijd hier is <b>{canonical(maxstay)}</b>",
-        "ca": "Un pot quedar-se com a màxim <b>{canonical(maxstay)}</b>",
-        "de": "Die maximale Parkdauer beträgt <b>{canonical(maxstay)}</b>",
-        "es": "Se puede permanecer como máximo <b>{canonical(maxstay)}</b>"
-      },
-      "mappings": [
-        {
-          "if": "maxstay=unlimited",
-          "then": {
-            "en": "No timelimit on leaving your vehicle here",
-            "nl": "Geen maximum parkeertijd",
-            "ca": "No hi ha límit de temps per a deixar el teu vehicle aquí",
-            "de": "Keine Höchstparkdauer",
-            "es": "Sin límite de tiempo para dejar tu vehículo aquí"
-          }
         }
-      ],
-      "condition": {
-        "or": [
-          "maxstay~*",
-          "motorcar=yes",
-          "hgv=yes",
-          "bus=yes"
-        ]
       }
     },
     {
@@ -2584,11 +2556,11 @@
         "en": "Is this charging station part of a network?",
         "nl": "Is dit oplaadpunt deel van een groter netwerk?",
         "ca": "Aquesta estació de càrrega forma part d'una xarxa?",
+        "cs": "Je tato nabíjecí stanice součástí sítě?",
         "de": "Ist diese Ladestation Teil eines Netzwerks?",
         "es": "¿Este punto de carga forma parte de una red?",
         "pl": "Czy ta stacja ładowania jest częścią sieci?",
-        "uk": "Чи є ця зарядна станція частиною мережі?",
+        "uk": "Чи є ця зарядна станція частиною мережі?"
-        "cs": "Je tato nabíjecí stanice součástí sítě?"
       },
       "freeform": {
         "key": "network"
@@ -2609,11 +2581,11 @@
           "then": {
             "en": "Not part of a bigger network",
             "nl": "Maakt geen deel uit van een groter netwerk",
+            "cs": "Není součástí větší sítě",
             "de": "Nicht Teil eines größeren Netzwerks",
             "es": "No forma parte de una red mayor",
             "pl": "Nie jest częścią większej sieci",
-            "uk": "Не є частиною великої мережі",
+            "uk": "Не є частиною великої мережі"
-            "cs": "Není součástí větší sítě"
           },
           "hideInAnswer": true
         },
@@ -3062,11 +3034,11 @@
             "en": "All vehicle types",
             "nl": "Alle voertuigen",
             "ca": "Tots els tipus de vehicles",
+            "cs": "Všechny typy vozidel",
             "de": "Ladestationen für alle Fahrzeugtypen",
             "es": "Todos los tipos de vehículos",
             "fr": "Tous les types de véhicules",
-            "it": "Tutti i tipi di veicoli",
+            "it": "Tutti i tipi di veicoli"
-            "cs": "Všechny typy vozidel"
           }
         },
         {
@@ -3074,11 +3046,11 @@
             "en": "Charging station for bicycles",
             "nl": "Oplaadpunten voor fietsen",
             "ca": "Punt de recàrrega per a bicicletes",
+            "cs": "Nabíjecí stanice pro kola",
             "de": "Ladestationen für Fahrräder",
             "es": "Punto de carga para bicicletas",
             "fr": "Station de recharge pour vélos",
-            "it": "Stazione di ricarica per biciclette",
+            "it": "Stazione di ricarica per biciclette"
-            "cs": "Nabíjecí stanice pro kola"
           },
           "osmTags": "bicycle=yes"
         },
@@ -3087,11 +3059,11 @@
             "en": "Charging station for cars",
             "nl": "Oplaadpunten voor auto's",
             "ca": "Estació de càrrega per a cotxes",
+            "cs": "Nabíjecí stanice pro auta",
             "de": "Ladestationen für Autos",
             "es": "Punto de carga para coches",
             "fr": "Station de recharge pour voitures",
-            "it": "Stazione di ricarica per auto",
+            "it": "Stazione di ricarica per auto"
-            "cs": "Nabíjecí stanice pro auta"
           },
           "osmTags": {
             "or": [
@@ -3110,11 +3082,11 @@
             "en": "Only working charging stations",
             "nl": "Enkel werkende oplaadpunten",
             "ca": "Només estacions de recàrrega en funcionament",
+            "cs": "Pouze funkční nabíjecí stanice",
             "de": "Nur Ladestationen in Betrieb",
             "es": "Solo puntos de carga en funcionamiento",
             "fr": "Seulement les stations de recharge qui fonctionnent",
-            "it": "Solo stazioni di ricarica funzionanti",
+            "it": "Solo stazioni di ricarica funzionanti"
-            "cs": "Pouze funkční nabíjecí stanice"
           },
           "osmTags": {
             "and": [
@@ -3133,10 +3105,10 @@
             "en": "All connectors",
             "nl": "Alle types",
             "ca": "Tots els connectors",
+            "cs": "Všechny konektory",
             "de": "Alle Anschlüsse",
             "es": "Todos los conectores",
-            "it": "Tutti i connettori",
+            "it": "Tutti i connettori"
-            "cs": "Všechny konektory"
           }
         },
         {

assets/layers/charging_station/charging_station.proto.json

@@ -559,34 +559,15 @@
     },
     {
       "id": "maxstay",
-      "question": {
+      "builtin": "maxstay",
-        "en": "What is the maximum amount of time one is allowed to stay here?",
+      "override": {
-        "nl": "Hoelang mag een voertuig hier blijven staan?"
+        "condition": {
-      },
+          "or": [
-      "freeform": {
+            "motorcar=yes",
-        "key": "maxstay",
+            "hgv=yes",
-        "type": "pfloat"
+            "bus=yes"
-      },
+          ]
-      "render": {
-        "en": "One can stay at most <b>{canonical(maxstay)}</b>",
-        "nl": "De maximale parkeertijd hier is <b>{canonical(maxstay)}</b>"
-      },
-      "mappings": [
-        {
-          "if": "maxstay=unlimited",
-          "then": {
-            "en": "No timelimit on leaving your vehicle here",
-            "nl": "Geen maximum parkeertijd"
-          }
         }
-      ],
-      "condition": {
-        "or": [
-          "maxstay~*",
-          "motorcar=yes",
-          "hgv=yes",
-          "bus=yes"
-        ]
       }
     },
     {

assets/layers/filters/filters.json

@@ -418,6 +418,29 @@
           }
         }
       ]
+    },
+    {
+      "id": "outdoor_seating",
+      "options": [
+        {
+          "question": {
+            "en": "Has outdoor seating"
+          },
+          "icon": "./assets/layers/outdoor_seating.svg",
+          "osmTags": "outdoor_seating=yes"
+        }
+      ]
+    },
+    {
+      "id": "indoor_seating",
+      "options": [
+        {
+          "question": {
+            "en": "Has indoor seating"
+          },
+          "osmTags": "indoor_seating=yes"
+        }
+      ]
     }
   ],
   "allowMove": false

assets/layers/food/food.json

@@ -804,6 +804,55 @@
         }
       ]
     },
+    {
+      "id": "drive-through",
+      "condition": "amenity=fast_food",
+      "question": {
+        "en": "Does this fast-food restaurant have a drive-through?",
+        "nl": "Heeft dit fastfoodrestaurant een drive-through?"
+      },
+      "mappings": [
+        {
+          "if": "drive_through=yes",
+          "then": {
+            "en": "This fast-food restaurant has a drive-through",
+            "nl": "Dit fastfoodrestaurant heeft een drive-through"
+          }
+        },
+        {
+          "if": "drive_through=no",
+          "then": {
+            "en": "This fast-food restaurant does not have a drive-through",
+            "nl": "Dit fastfoodrestaurant heeft geen drive-through"
+          }
+        }
+      ]
+    },
+    {
+      "id": "drive-through-opening_hours",
+      "condition": "drive_through=yes",
+      "question": {
+        "en": "What are the opening hours of the drive-through?",
+        "nl": "Wat zijn de openingsuren van de drive-through?"
+      },
+      "freeform": {
+        "key": "opening_hours:drive_through",
+        "type": "opening_hours"
+      },
+      "mappings": [
+        {
+          "if": "opening_hours:drive_through=",
+          "then": {
+            "en": "The opening hours of the drive-through are the same as the restaurant",
+            "nl": "De openingsuren van de drive-through zijn dezelfde als die van het restaurant"
+          }
+        }
+      ],
+      "render": {
+        "en": "<h3>Drive-through opening hours</h3>{opening_hours_table(opening_hours:drive_through)}",
+        "nl": "<h3>Openingsuren van de drive-through</h3>{opening_hours_table(opening_hours:drive_through)}"
+      }
+    },
     {
       "question": {
         "nl": "Heeft deze eetgelegenheid een vegetarische optie?",
@@ -1341,6 +1390,7 @@
     "lactose_free",
     "smoking",
     "service:electricity",
+    "seating",
     "dog-access",
     "internet",
     "internet-fee",
@@ -1488,6 +1538,8 @@
     "filters.sugar_free",
     "filters.gluten_free",
     "filters.lactose_free",
+    "outdoor_seating",
+    "indoor_seating",
     "accepts_cash",
     "accepts_cards",
     "dogs"

assets/layers/parking/parking.json

@@ -350,7 +350,8 @@
         "cs": "Počet parkovacích míst {capacity}",
         "es": "Hay {capacity} plazas de aparcamiento"
       }
-    }
+    },
+    "maxstay"
   ],
   "deletion": {
     "softDeletionTags": {

assets/layers/questions/questions.json

@@ -3181,7 +3181,70 @@
           }
         }
       ]
+    },
+    {
+      "id": "seating",
+      "question": {
+        "en": "What kind of seating does {title()} have?",
+        "nl": "Wat voor zitplaatsen heeft {title()}?"
+      },
+      "mappings": [
+        {
+          "if": "outdoor_seating=yes",
+          "ifnot": "outdoor_seating=no",
+          "then": {
+            "en": "This place has outdoor seating",
+            "nl": "Deze plaats heeft zitplaatsen buiten"
+          },
+          "icon": "./assets/layers/outdoor_seating/outdoor_seating.svg"
+        },
+        {
+          "if": "indoor_seating=yes",
+          "ifnot": "indoor_seating=no",
+          "then": {
+            "en": "This place has indoor seating",
+            "nl": "Deze plaats heeft zitplaatsen binnen"
+          }
+        }
+      ],
+      "multiAnswer": true
+    },
+    {
+      "id": "maxstay",
+      "question": {
+        "en": "What is the maximum amount of time one is allowed to stay here?",
+        "nl": "Wat is de maximale tijd die je hier mag blijven?"
+      },
+      "freeform": {
+        "key": "maxstay",
+        "type": "pfloat"
+      },
+      "render": {
+        "en": "One can stay at most <b>{canonical(maxstay)}</b>",
+        "nl": "Je mag hier maximaal <b>{canonical(maxstay)}</b> blijven"
+      },
+      "mappings": [
+        {
+          "if": "maxstay=unlimited",
+          "then": {
+            "en": "There is no limit to the amount of time one can stay here",
+            "nl": "Er is geen limiet aan de tijd die je hier mag blijven"
+          }
+        }
+      ]
     }
   ],
-  "allowMove": false
+  "allowMove": false,
+  "units": [
+    {
+      "maxstay": {
+        "quantity": "duration",
+        "denominations": [
+          "minutes",
+          "hours",
+          "days"
+        ]
+      }
+    }
+  ]
 }

assets/layers/recycling/recycling.json

@@ -1292,8 +1292,7 @@
           "icon": {
             "path": "./assets/layers/waste_disposal/waste_disposal.svg",
             "class": "medium"
-          },
+          }
-          "hideInAnswer": "recycling_type=container"
         },
         {
           "if": "recycling:bicycles=yes",

assets/layers/stairs/escalator.svg

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg viewBox="0 0 515 400" xmlns="http://www.w3.org/2000/svg">
+<path d="m218.2 69.69c18.75 0 33.92-15.17 33.9-33.9.02-18.7-15.15-33.88-33.9-33.9-18.68.03-33.85 15.2-33.9 33.9.05 18.73 15.22 33.9 33.9 33.9"/>
+<path d="m251.8 130.7v-21.3c-.02-45.55-67.11-45.05-67.1 0v87.1h.1l-63.4 63.4c-5.95 5.93-6.68 6.19-18.4 6.2h-38.8c-38.98-.01-62.37 35.04-62.4 64.8.03 29.66 23.42 67.22 65.9 67.2 0 0 52.72.03 69 0 16.31.03 36.07-6.2 52.4-21.5l202.1-201.6c4.31-3.8 6.71-5 14.1-5h50c23.98 0 57.98-27.22 58-66.5-.03-38.82-34.28-64.72-60-64.8h-78.8c-16.33-.01-37.28 6.65-49.8 19.2l-72.9 72.8"/>
+<path d="m379.2 72.19h70.9c17.22.04 28.82 19.32 28.8 30.8.03 11.53-8.21 32.99-29.3 33h-42.6c-18.08-.01-26.08 2.53-36.5 12.9l-203.6 203.7c-8.28 8.25-18.74 11.52-32.2 11.5h-67.1c-17.28.02-32.48-14.58-32.5-33.7.02-19.22 14.52-29.96 29.5-30h46.1c13.42.04 22.25-3.79 29.9-11.5l207.1-207.1c8.56-8.5 16.98-9.56 31.5-9.6" fill="#fff"/>
+<div xmlns="" id="divScriptsUsed" style="display: none"/><script xmlns="" id="globalVarsDetection" src="moz-extension://191fb6fc-6816-4a50-b97f-142979bf7e1e/js/wrs_env.js"/></svg>

assets/layers/stairs/escalator.svg.license

@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: AIGA
+SPDX-License-Identifier: Public Domain

assets/layers/stairs/license_info.json

@@ -7,11 +7,21 @@
     ],
     "sources": []
   },
+  {
+    "path": "escalator.svg",
+    "license": "Public Domain",
+    "authors": [
+      "AIGA"
+    ],
+    "sources": [
+      "https://commons.wikimedia.org/wiki/File:Aiga_escalator.svg"
+    ]
+  },
   {
     "path": "stairs.svg",
     "license": "CC-BY SA 4.0",
     "authors": [
-      " \tFont Awesome"
+      "Font Awesome"
     ],
     "sources": [
       "https://commons.wikimedia.org/wiki/File:Stairs-solid.svg"

assets/layers/stairs/stairs.json

@@ -33,7 +33,14 @@
     },
     "mappings": [
       {
-        "if": "conveying=yes",
+        "if": {
+          "or": [
+            "conveying=yes",
+            "conveying=forward",
+            "conveying=backward",
+            "conveying=reversible"
+          ]
+        },
         "then": {
           "en": "Escalator",
           "nl": "Roltrap",
@@ -53,7 +60,22 @@
           "color": "white"
         },
         {
-          "icon": "./assets/layers/stairs/stairs.svg"
+          "icon": {
+            "render": "./assets/layers/stairs/stairs.svg",
+            "mappings": [
+              {
+                "if": {
+                  "or": [
+                    "conveying=yes",
+                    "conveying=forward",
+                    "conveying=backward",
+                    "conveying=reversible"
+                  ]
+                },
+                "then": "./assets/layers/stairs/escalator.svg"
+              }
+            ]
+          }
         }
       ],
       "location": [
@@ -63,9 +85,51 @@
   ],
   "lineRendering": [
     {
-      "color": "gray",
+      "color": {
+        "render": "gray",
+        "mappings": [
+          {
+            "if": {
+              "or": [
+                "conveying=yes",
+                "conveying=forward",
+                "conveying=backward",
+                "conveying=reversible"
+              ]
+            },
+            "then": "blue"
+          }
+        ]
+      },
       "width": 10,
-      "dashArray": "1 1"
+      "dashArray": "1 2",
+      "imageAlongWay": [
+        {
+          "if": {
+            "or": [
+              "conveying=yes",
+              "conveying=forward"
+            ]
+          },
+          "then": "./assets/png/oneway.png"
+        },
+        {
+          "if": {
+            "or": [
+              "conveying=backward"
+            ]
+          },
+          "then": "./assets/png/oneway_reversed.png"
+        },
+        {
+          "if": {
+            "or": [
+              "conveying=reversible"
+            ]
+          },
+          "then": "./assets/png/twoway.png"
+        }
+      ]
     }
   ],
   "tagRenderings": [
@@ -106,6 +170,26 @@
             "es": "Esta es una escalera mecánica"
           }
         },
+        {
+          "if": {
+            "or": [
+              "conveying=forward",
+              "conveying=backward"
+            ]
+          },
+          "then": {
+            "en": "This is an escalator moving in the direction of the arrows",
+            "nl": "Dit is een roltrap die beweegt in de richting van de pijlen"
+          },
+          "hideInAnswer": true
+        },
+        {
+          "if": "conveying=reversible",
+          "then": {
+            "en": "This is a reversible escalator",
+            "nl": "Dit is een roltrap die van richting kan veranderen"
+          }
+        },
         {
           "if": "conveying=no",
           "then": {
@@ -131,7 +215,11 @@
           },
           "hideInAnswer": true
         }
-      ]
+      ],
+      "question": {
+        "en": "Is this an escalator?",
+        "nl": "Is dit een roltrap?"
+      }
     },
     {
       "id": "handrail",

assets/layers/stairs/stairs.svg.license

@@ -1,2 +1,2 @@
-SPDX-FileCopyrightText:  	Font Awesome
+SPDX-FileCopyrightText: Font Awesome
 SPDX-License-Identifier: CC-BY SA 4.0

assets/png/license_info.json

@@ -15,6 +15,14 @@
     ],
     "sources": []
   },
+  {
+    "path": "oneway_reversed.png",
+    "license": "CC0-1.0",
+    "authors": [
+      "Pieter Vander Vennet"
+    ],
+    "sources": []
+  },
   {
     "path": "twoway.png",
     "license": "CC0-1.0",

assets/png/oneway_reversed.png.license

@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: Pieter Vander Vennet
+SPDX-License-Identifier: CC0-1.0

langs/layers/ca.json

@@ -2137,15 +2137,6 @@
                 },
                 "question": "Hi ha que pagar per utilitzar aquest punt de càrrega?"
             },
-            "maxstay": {
-                "mappings": {
-                    "0": {
-                        "then": "No hi ha límit de temps per a deixar el teu vehicle aquí"
-                    }
-                },
-                "question": "Quina és la quantitat màxima de temps que es permet permaneixer aquí?",
-                "render": "Un pot quedar-se com a màxim <b>{canonical(maxstay)}</b>"
-            },
             "phone": {
                 "question": "A quin número es pot cridar si hi ha algun problema amb aquest punt de càrrega?",
                 "render": "En cas de problemes, truqueu a <a href='tel:{phone}'>{phone}</a>"
@@ -7597,10 +7588,10 @@
                     "0": {
                         "then": "Açò és una escala mecànica"
                     },
-                    "1": {
+                    "3": {
                         "then": "Açò no és una escala mecànica"
                     },
-                    "2": {
+                    "4": {
                         "then": "Això no és una escala mecànica"
                     }
                 }

langs/layers/cs.json

@@ -8510,10 +8510,10 @@
                     "0": {
                         "then": "Jedná se o eskalátor"
                     },
-                    "1": {
+                    "3": {
                         "then": "Nejedná se o eskalátor"
                     },
-                    "2": {
+                    "4": {
                         "then": "Nejedná se o eskalátor"
                     }
                 }

langs/layers/de.json

@@ -2691,15 +2691,6 @@
                 },
                 "question": "Muss man für die Nutzung dieser Ladestation bezahlen?"
             },
-            "maxstay": {
-                "mappings": {
-                    "0": {
-                        "then": "Keine Höchstparkdauer"
-                    }
-                },
-                "question": "Wie lange darf man hier maximal parken?",
-                "render": "Die maximale Parkdauer beträgt <b>{canonical(maxstay)}</b>"
-            },
             "phone": {
                 "question": "Welche Nummer kann man anrufen, wenn es ein Problem mit dieser Ladestation gibt?",
                 "render": "Bei Problemen, anrufen unter <a href='tel:{phone}'>{phone}</a>"
@@ -10226,10 +10217,10 @@
                     "0": {
                         "then": "Das ist eine Rolltreppe"
                     },
-                    "1": {
+                    "3": {
                         "then": "Das ist keine Rolltreppe"
                     },
-                    "2": {
+                    "4": {
                         "then": "Das ist keine Rolltreppe"
                     }
                 }

langs/layers/en.json

@@ -2691,15 +2691,6 @@
                 },
                 "question": "Does one have to pay to use this charging station?"
             },
-            "maxstay": {
-                "mappings": {
-                    "0": {
-                        "then": "No timelimit on leaving your vehicle here"
-                    }
-                },
-                "question": "What is the maximum amount of time one is allowed to stay here?",
-                "render": "One can stay at most <b>{canonical(maxstay)}</b>"
-            },
             "phone": {
                 "question": "What number can one call if there is a problem with this charging station?",
                 "render": "In case of problems, call <a href='tel:{phone}'>{phone}</a>"
@@ -4963,6 +4954,20 @@
                     }
                 }
             },
+            "16": {
+                "options": {
+                    "0": {
+                        "question": "Has outdoor seating"
+                    }
+                }
+            },
+            "17": {
+                "options": {
+                    "0": {
+                        "question": "Has indoor seating"
+                    }
+                }
+            },
             "2": {
                 "options": {
                     "0": {
@@ -5541,6 +5546,26 @@
                 },
                 "question": "Does {title()} deliver food to your home?"
             },
+            "drive-through": {
+                "mappings": {
+                    "0": {
+                        "then": "This fast-food restaurant has a drive-through"
+                    },
+                    "1": {
+                        "then": "This fast-food restaurant does not have a drive-through"
+                    }
+                },
+                "question": "Does this fast-food restaurant have a drive-through?"
+            },
+            "drive-through-opening_hours": {
+                "mappings": {
+                    "0": {
+                        "then": "The opening hours of the drive-through are the same as the restaurant"
+                    }
+                },
+                "question": "What are the opening hours of the drive-through?",
+                "render": "<h3>Drive-through opening hours</h3>{opening_hours_table(opening_hours:drive_through)}"
+            },
             "friture-oil": {
                 "mappings": {
                     "0": {
@@ -8642,6 +8667,15 @@
             "mastodon": {
                 "question": "What is the Mastodon-handle of {title()}?"
             },
+            "maxstay": {
+                "mappings": {
+                    "0": {
+                        "then": "There is no limit to the amount of time one can stay here"
+                    }
+                },
+                "question": "What is the maximum amount of time one is allowed to stay here?",
+                "render": "One can stay at most <b>{canonical(maxstay)}</b>"
+            },
             "multilevels": {
                 "override": {
                     "question": "What levels does this elevator go to?",
@@ -8755,6 +8789,17 @@
                 },
                 "question": "Is {title()} available all around the year?"
             },
+            "seating": {
+                "mappings": {
+                    "0": {
+                        "then": "This place has outdoor seating"
+                    },
+                    "1": {
+                        "then": "This place has indoor seating"
+                    }
+                },
+                "question": "What kind of seating does {title()} have?"
+            },
             "service:electricity": {
                 "mappings": {
                     "0": {
@@ -10619,12 +10664,19 @@
                         "then": "This is an escalator"
                     },
                     "1": {
-                        "then": "This is not an escalator"
+                        "then": "This is an escalator moving in the direction of the arrows"
                     },
                     "2": {
+                        "then": "This is a reversible escalator"
+                    },
+                    "3": {
+                        "then": "This is not an escalator"
+                    },
+                    "4": {
                         "then": "This is not an escalator"
                     }
-                }
+                },
+                "question": "Is this an escalator?"
             },
             "handrail": {
                 "mappings": {

langs/layers/es.json

@@ -2691,15 +2691,6 @@
                 },
                 "question": "¿Hay que pagar para usar este punto de carga?"
             },
-            "maxstay": {
-                "mappings": {
-                    "0": {
-                        "then": "Sin límite de tiempo para dejar tu vehículo aquí"
-                    }
-                },
-                "question": "¿Cuál es el tiempo máximo que se permite permanecer aquí?",
-                "render": "Se puede permanecer como máximo <b>{canonical(maxstay)}</b>"
-            },
             "phone": {
                 "question": "¿A qué número se puede llamar si hay un problema con este punto de carga?",
                 "render": "En caso de problemas, llama a <a href='tel:{phone}'>{phone}</a>"
@@ -10192,10 +10183,10 @@
                     "0": {
                         "then": "Esta es una escalera mecánica"
                     },
-                    "1": {
+                    "3": {
                         "then": "Esta no es una escalera mecánica"
                     },
-                    "2": {
+                    "4": {
                         "then": "Esta no es una escalera mecánica"
                     }
                 }

langs/layers/id.json

@@ -719,10 +719,10 @@
                     "0": {
                         "then": "Ini adalah eskalator"
                     },
-                    "1": {
+                    "3": {
                         "then": "Ini bukan eskalator"
                     },
-                    "2": {
+                    "4": {
                         "then": "Ini bukan eskalator"
                     }
                 }

langs/layers/nl.json

@@ -1733,6 +1733,9 @@
         },
         "title": {
             "mappings": {
+                "0": {
+                    "then": "{name}"
+                },
                 "1": {
                     "then": "Vogelkijkhut {name}"
                 },
@@ -2349,15 +2352,6 @@
                 },
                 "question": "Moet men betalen om dit oplaadpunt te gebruiken?"
             },
-            "maxstay": {
-                "mappings": {
-                    "0": {
-                        "then": "Geen maximum parkeertijd"
-                    }
-                },
-                "question": "Hoelang mag een voertuig hier blijven staan?",
-                "render": "De maximale parkeertijd hier is <b>{canonical(maxstay)}</b>"
-            },
             "phone": {
                 "question": "Wat is het telefoonnummer van de beheerder van dit oplaadpunt?",
                 "render": "Bij problemen, bel naar <a href='tel:{phone}'>{phone}</a>"
@@ -4721,6 +4715,26 @@
                 },
                 "question": "Levert {title()} aan huis?"
             },
+            "drive-through": {
+                "mappings": {
+                    "0": {
+                        "then": "Dit fastfoodrestaurant heeft een drive-through"
+                    },
+                    "1": {
+                        "then": "Dit fastfoodrestaurant heeft geen drive-through"
+                    }
+                },
+                "question": "Heeft dit fastfoodrestaurant een drive-through?"
+            },
+            "drive-through-opening_hours": {
+                "mappings": {
+                    "0": {
+                        "then": "De openingsuren van de drive-through zijn dezelfde als die van het restaurant"
+                    }
+                },
+                "question": "Wat zijn de openingsuren van de drive-through?",
+                "render": "<h3>Openingsuren van de drive-through</h3>{opening_hours_table(opening_hours:drive_through)}"
+            },
             "friture-oil": {
                 "mappings": {
                     "0": {
@@ -5810,6 +5824,11 @@
             }
         },
         "title": {
+            "mappings": {
+                "0": {
+                    "then": "{name}"
+                }
+            },
             "render": "Natuurgebied"
         }
     },
@@ -6341,6 +6360,21 @@
             "render": "Picknicktafel"
         }
     },
+    "play_forest": {
+        "description": "Een speelbos is een vrij toegankelijke zone in een bos",
+        "name": "Speelbossen",
+        "title": {
+            "mappings": {
+                "0": {
+                    "then": "{name}"
+                },
+                "1": {
+                    "then": "Speelbos {name}"
+                }
+            },
+            "render": "Speelbos"
+        }
+    },
     "playground": {
         "deletion": {
             "nonDeleteMappings": {
@@ -6997,6 +7031,15 @@
                     }
                 }
             },
+            "maxstay": {
+                "mappings": {
+                    "0": {
+                        "then": "Er is geen limiet aan de tijd die je hier mag blijven"
+                    }
+                },
+                "question": "Wat is de maximale tijd die je hier mag blijven?",
+                "render": "Je mag hier maximaal <b>{canonical(maxstay)}</b> blijven"
+            },
             "multilevels": {
                 "override": {
                     "question": "Naar welke verdiepingen gaat deze lift?",
@@ -7110,6 +7153,17 @@
                 },
                 "question": "Is {title()} heel het jaar beschikbaar?"
             },
+            "seating": {
+                "mappings": {
+                    "0": {
+                        "then": "Deze plaats heeft zitplaatsen buiten"
+                    },
+                    "1": {
+                        "then": "Deze plaats heeft zitplaatsen binnen"
+                    }
+                },
+                "question": "Wat voor zitplaatsen heeft {title()}?"
+            },
             "service:electricity": {
                 "mappings": {
                     "0": {
@@ -7875,6 +7929,9 @@
         },
         "title": {
             "mappings": {
+                "0": {
+                    "then": "{name}"
+                },
                 "1": {
                     "then": "Voetpad"
                 },
@@ -8094,12 +8151,19 @@
                         "then": "Dit is een roltrap"
                     },
                     "1": {
-                        "then": "Dit is geen roltrap"
+                        "then": "Dit is een roltrap die beweegt in de richting van de pijlen"
                     },
                     "2": {
+                        "then": "Dit is een roltrap die van richting kan veranderen"
+                    },
+                    "3": {
+                        "then": "Dit is geen roltrap"
+                    },
+                    "4": {
                         "then": "Dit is geen roltrap"
                     }
-                }
+                },
+                "question": "Is dit een roltrap?"
             },
             "handrail": {
                 "mappings": {
@@ -9887,13 +9951,25 @@
         }
     },
     "village_green": {
-        "description": "Een laag die dorpsgroen toont (gemeenschapsgroen, maar niet echt een park)"
+        "description": "Een laag die dorpsgroen toont (gemeenschapsgroen, maar niet echt een park)",
+        "name": "Speelweide",
+        "title": {
+            "mappings": {
+                "0": {
+                    "then": "{name}"
+                }
+            },
+            "render": "Speelweide"
+        }
     },
     "visitor_information_centre": {
         "description": "Een bezoekerscentrum biedt informatie over een specifieke attractie of bezienswaardigheid waar het is gevestigd.",
         "name": "Bezoekerscentrum",
         "title": {
             "mappings": {
+                "0": {
+                    "then": "{name:nl}"
+                },
                 "1": {
                     "then": "{name}"
                 }