diff --git a/assets/layers/cafe_pub/cafe_pub.json b/assets/layers/cafe_pub/cafe_pub.json index 14011a9053..75ebc293b7 100644 --- a/assets/layers/cafe_pub/cafe_pub.json +++ b/assets/layers/cafe_pub/cafe_pub.json @@ -164,8 +164,8 @@ "level", { "question": { - "nl": "Wat is de naam van dit café?", - "en": "What is the name of this pub?", + "nl": "Wat is de naam van deze zaak?", + "en": "What is the name of this business?", "de": "Wie heißt diese Kneipe?", "fr": "Quel est le nom de ce pub ?", "hu": "Mi a neve ennek a kocsmának?", @@ -173,8 +173,8 @@ "es": "¿Cual es el nombre de este pub?" }, "render": { - "nl": "De naam van dit café is {name}", - "en": "This pub is named {name}", + "nl": "De naam van deze zaak is {name}", + "en": "This business is named {name}", "de": "Diese Kneipe heißt {name}", "fr": "Ce pub se nomme {name}", "hu": "A kocsma neve: {name}", diff --git a/assets/layers/food/food.json b/assets/layers/food/food.json index a30199e23b..52cda35e3a 100644 --- a/assets/layers/food/food.json +++ b/assets/layers/food/food.json @@ -155,14 +155,14 @@ { "question": { "nl": "Wat is de naam van deze eetgelegenheid?", - "en": "What is the name of this restaurant?", + "en": "What is the name of this business?", "de": "Wie heißt dieses Restaurant?", "es": "¿Cual es el nombre de este restaurante?", "fr": "Quel est le nom de ce restaurant ?" }, "render": { "nl": "De naam van deze eetgelegeheid is {name}", - "en": "The name of this restaurant is {name}", + "en": "The name of this business is {name}", "de": "Das Restaurant heißt {name}", "es": "El nombre de este restaurante es {name}", "fr": "Le nom de ce restaurant est {name}" @@ -385,6 +385,44 @@ ], "id": "Cuisine" }, + { + "id": "Reservation", + "condition": "amenity=restaurant", + "question": { + "en": "Is a reservation required for this place?", + "nl": "Is reserveren verplicht voor deze zaak?" + }, + "mappings": [ + { + "if": "reservation=required", + "then": { + "en": "A reservation is required at this place", + "nl": "Reserveren is verplicht voor deze zaak" + } + }, + { + "if": "reservation=recommended", + "then": { + "en": "A reservation is not required, but still recommended to make sure you get a table", + "nl": "Reserveren is niet verplicht, maar wordt wel aangeraden om zeker te zijn van een tafel" + } + }, + { + "if": "reservation=yes", + "then": { + "en": "Reservation is possible at this place", + "nl": "Reserveren is mogelijk voor deze zaak" + } + }, + { + "if": "reservation=no", + "then": { + "en": "Reservation is not possible at this place", + "nl": "Reserveren is niet mogelijk voor deze zaak" + } + } + ] + }, { "question": { "nl": "Biedt deze zaak een afhaalmogelijkheid aan?", @@ -851,6 +889,24 @@ ], "filter": [ "open_now", + { + "id": "reservation", + "options": [ + { + "question": { + "en": "Reservation not required", + "nl": "Reserveren niet vereist" + }, + "osmTags": { + "or": [ + "reservation=no", + "reservation=optional", + "reservation=" + ] + } + } + ] + }, { "id": "vegetarian", "options": [ diff --git a/langs/layers/da.json b/langs/layers/da.json index fe3c7830e6..900c99092f 100644 --- a/langs/layers/da.json +++ b/langs/layers/da.json @@ -2052,7 +2052,7 @@ }, "food": { "filter": { - "3": { + "4": { "options": { "0": { "question": "Har en halalmenu" diff --git a/langs/layers/de.json b/langs/layers/de.json index ebafc8f530..934c7624e5 100644 --- a/langs/layers/de.json +++ b/langs/layers/de.json @@ -4232,21 +4232,21 @@ }, "description": "Eine Ebene mit Restaurants und Fast-Food-Einrichtungen (mit speziellem Rendering für Pommesbuden)", "filter": { - "1": { + "2": { "options": { "0": { "question": "Vegetarische Gerichte im Angebot" } } }, - "2": { + "3": { "options": { "0": { "question": "Vegane Gerichte im Angebot" } } }, - "3": { + "4": { "options": { "0": { "question": "Halal Gerichte im Angebot" diff --git a/langs/layers/en.json b/langs/layers/en.json index 2bd3aef798..019fa8976c 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -1498,8 +1498,8 @@ "question": "What kind of cafe is this?" }, "Name": { - "question": "What is the name of this pub?", - "render": "This pub is named {name}" + "question": "What is the name of this business?", + "render": "This business is named {name}" } }, "title": { @@ -4235,18 +4235,25 @@ "1": { "options": { "0": { - "question": "Has a vegetarian menu" + "question": "Reservation not required" } } }, "2": { "options": { "0": { - "question": "Has a vegan menu" + "question": "Has a vegetarian menu" } } }, "3": { + "options": { + "0": { + "question": "Has a vegan menu" + } + } + }, + "4": { "options": { "0": { "question": "Has a halal menu" @@ -4333,8 +4340,25 @@ "question": "What type of business is this?" }, "Name": { - "question": "What is the name of this restaurant?", - "render": "The name of this restaurant is {name}" + "question": "What is the name of this business?", + "render": "The name of this business is {name}" + }, + "Reservation": { + "mappings": { + "0": { + "then": "A reservation is required at this place" + }, + "1": { + "then": "A reservation is not required, but still recommended to make sure you get a table" + }, + "2": { + "then": "Reservation is possible at this place" + }, + "3": { + "then": "Reservation is not possible at this place" + } + }, + "question": "Is a reservation required for this place?" }, "Takeaway": { "mappings": { diff --git a/langs/layers/es.json b/langs/layers/es.json index 793c675791..032b5ba59c 100644 --- a/langs/layers/es.json +++ b/langs/layers/es.json @@ -2344,21 +2344,21 @@ }, "description": "Una capa que muestra restaurantes y facilidades de comida rápida", "filter": { - "1": { + "2": { "options": { "0": { "question": "Tiene menú vegetariano" } } }, - "2": { + "3": { "options": { "0": { "question": "Tiene menú vegano" } } }, - "3": { + "4": { "options": { "0": { "question": "Tiene menú halah" diff --git a/langs/layers/fr.json b/langs/layers/fr.json index 1780be8b2d..fbfb8adb18 100644 --- a/langs/layers/fr.json +++ b/langs/layers/fr.json @@ -2875,21 +2875,21 @@ }, "description": "Un claque montrant les restaurants et les endroits de nourriture rapide (avec un rendu spécial pour les friteries)", "filter": { - "1": { + "2": { "options": { "0": { "question": "A un menu végétarien" } } }, - "2": { + "3": { "options": { "0": { "question": "A un menu végétalien" } } }, - "3": { + "4": { "options": { "0": { "question": "A un menu halal" diff --git a/langs/layers/nl.json b/langs/layers/nl.json index e4402b62bc..370fc7280c 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -1481,8 +1481,8 @@ "question": "Welk soort café is dit?" }, "Name": { - "question": "Wat is de naam van dit café?", - "render": "De naam van dit café is {name}" + "question": "Wat is de naam van deze zaak?", + "render": "De naam van deze zaak is {name}" } }, "title": { @@ -4030,18 +4030,25 @@ "1": { "options": { "0": { - "question": "Heeft een vegetarisch menu" + "question": "Reserveren niet vereist" } } }, "2": { "options": { "0": { - "question": "Heeft een veganistisch menu" + "question": "Heeft een vegetarisch menu" } } }, "3": { + "options": { + "0": { + "question": "Heeft een veganistisch menu" + } + } + }, + "4": { "options": { "0": { "question": "Heeft een halal menu" @@ -4131,6 +4138,23 @@ "question": "Wat is de naam van deze eetgelegenheid?", "render": "De naam van deze eetgelegeheid is {name}" }, + "Reservation": { + "mappings": { + "0": { + "then": "Reserveren is verplicht voor deze zaak" + }, + "1": { + "then": "Reserveren is niet verplicht, maar wordt wel aangeraden om zeker te zijn van een tafel" + }, + "2": { + "then": "Reserveren is mogelijk voor deze zaak" + }, + "3": { + "then": "Reserveren is niet mogelijk voor deze zaak" + } + }, + "question": "Is reserveren verplicht voor deze zaak?" + }, "Takeaway": { "mappings": { "0": {