diff --git a/assets/layers/bench/bench.json b/assets/layers/bench/bench.json
index f74b33eeec..dc8fdb9d69 100644
--- a/assets/layers/bench/bench.json
+++ b/assets/layers/bench/bench.json
@@ -21,6 +21,7 @@
"source": {
"osmTags": "amenity=bench"
},
+ "wayHandling": 1,
"title": {
"render": {
"en": "Bench",
diff --git a/assets/layers/defibrillator/defibrillator.json b/assets/layers/defibrillator/defibrillator.json
index 66034deb82..1295f880ed 100644
--- a/assets/layers/defibrillator/defibrillator.json
+++ b/assets/layers/defibrillator/defibrillator.json
@@ -59,7 +59,10 @@
},
"tags": [
"emergency=defibrillator"
- ]
+ ],
+ "preciseInput": {
+ "preferredBackground": "map"
+ }
}
],
"tagRenderings": [
@@ -352,73 +355,7 @@
"key": "defibrillator:location:fr"
}
},
- {
- "question": {
- "nl": "Is deze defibrillator rolstoeltoegankelijk?",
- "en": "Is this defibrillator accessible with a wheelchair?",
- "fr": "Ce défibrillatuer est-il accessible en fauteuil roulant ?",
- "it": "Questo defibrillatore è accessibile con la sedia a rotelle?",
- "de": "Ist dieser Defibrillator mit einem Rollstuhl erreichbar?"
- },
- "mappings": [
- {
- "if": {
- "and": [
- "wheelchair=designated"
- ]
- },
- "then": {
- "nl": "Deze defibrillator is speciaal aangepast voor gebruikers van een rolstoel",
- "en": "This defibrillator is specially adapated for wheelchair users",
- "fr": "Ce défibrillateur est spécialement adapté aux utilisateurs en fauteuil roulant",
- "it": "Questo defibrillatore è stato appositamente adattato per gli utenti con la sedia a rotelle",
- "de": "Dieser Defibrillator ist speziell für Rollstuhlfahrer angepasst"
- }
- },
- {
- "if": {
- "and": [
- "wheelchair=yes"
- ]
- },
- "then": {
- "nl": "Deze defibrillator is vlot bereikbaar met een rolstoel",
- "en": "This defibrillator is easily reachable with a wheelchair",
- "fr": "Ce défibrillateur est facilement atteignable en fauteuil roulant",
- "it": "Questo defibrillatore è facilmente raggiungibile con un sedia a rotelle",
- "de": "Dieser Defibrillator ist mit einem Rollstuhl leicht zu erreichen"
- }
- },
- {
- "if": {
- "and": [
- "wheelchair=limited"
- ]
- },
- "then": {
- "nl": "Je kan er raken met een rolstoel, maar het is niet makkelijk",
- "en": "It is possible to reach the defibrillator in a wheelchair, but it is not easy",
- "fr": "Il est possible d'atteindre ce défibrillateur en fauteuil roulant, mais ce n'est pas facile",
- "it": "È possibile raggiungere questo defibrillatore con la sedia a rotelle ma non è semplice",
- "de": "Es ist möglich, den Defibrillator mit einem Rollstuhl zu erreichen, aber es ist nicht einfach"
- }
- },
- {
- "if": {
- "and": [
- "wheelchair=no"
- ]
- },
- "then": {
- "nl": "Niet rolstoeltoegankelijk",
- "en": "This defibrillator is not reachable with a wheelchair",
- "fr": "Ce défibrillateur n'est pas atteignable en fauteuil roulant",
- "it": "Questo defibrillatore non è raggiungibile con la sedia a rotelle",
- "de": "Dieser Defibrillator ist mit einem Rollstuhl nicht erreichbar"
- }
- }
- ]
- },
+ "wheelchair-access",
{
"render": {
"nl": "Officieel identificatienummer van het toestel: {ref}",
diff --git a/assets/layers/food/food.json b/assets/layers/food/food.json
index 27ea83983d..a139f239d4 100644
--- a/assets/layers/food/food.json
+++ b/assets/layers/food/food.json
@@ -84,7 +84,8 @@
"amenity=fast_food"
],
"description": {
- "nl": "Een zaak waar je snel bediend wordt, vaak met de focus op afhalen. Zitgelegenheid is eerder beperkt tot afwezig"
+ "nl": "Een zaak waar je snel bediend wordt, vaak met de focus op afhalen. Zitgelegenheid is eerder beperkt (of zelfs afwezig)",
+ "en": "A food business concentrating on fast counter-only service and take-away food"
},
"preciseInput": {
"preferredBackground": "map"
@@ -92,8 +93,8 @@
},
{
"title": {
- "en": "Friture",
- "nl": "Friture"
+ "en": "fries shop",
+ "nl": "frituur"
},
"tags": [
"amenity=fast_food",
@@ -141,6 +142,7 @@
"tagRenderings": [
"images",
{
+ "#": "Name",
"question": {
"nl": "Wat is de naam van deze eetgelegenheid?"
},
@@ -151,12 +153,175 @@
"key": "name"
}
},
+ {"#": "Fastfood vs restaurant",
+ "question": {
+ "en": "What type of business is this?",
+ "nl": "Wat voor soort zaak is dit?"
+ },
+ "mappings": [
+ {
+ "if": "amenity=fast_food",
+ "then": {
+ "nl": "Dit is een fastfood-zaak. De focus ligt op snelle bediening, zitplaatsen zijn vaak beperkt en functioneel"
+ }
+ },
+ {
+ "if": "amenity=restaurant",
+ "then": {
+ "nl": "Dit is een restaurant. De focus ligt op een aangename ervaring waar je aan tafel wordt bediend"
+ }
+ }
+ ]
+ },
"opening_hours",
"website",
"email",
"phone",
-
+ "wheelchair-access",
{
+ "#": "Cuisine",
+ "question": {
+ "nl": "Welk soort gerechten worden hier geserveerd?",
+ "en": "Which food is served here?"
+ },
+ "render": {
+ "nl": "Deze plaats serveert vooral {cuisine}",
+ "en": "This place mostly serves {cuisine}"
+ },
+ "freeform": {
+ "key": "cuisine",
+ "addExtraTags": [
+ "fixme=Freeform tag `cuisine` used, to be doublechecked"
+ ]
+ },
+ "mappings": [
+ {
+ "if": "cuisine=pizza",
+ "then": {
+ "en": "This is a pizzeria",
+ "nl": "Dit is een pizzeria"
+ }
+ },
+ {
+ "if": "cuisine=friture",
+ "then": {
+ "en": "This is a friture",
+ "nl": "Dit is een frituur"
+ }
+ },
+ {
+ "if": "cuisine=pasta",
+ "then": {
+ "en": "Mainly serves pasta",
+ "nl": "Dit is een pastazaak"
+ }
+ },
+ {
+ "if": "cuisine=kebab",
+ "then": {
+ "nl": "Dit is een kebabzaak"
+ }
+ },
+ {
+ "if": "cuisine=sandwich",
+ "then": {
+ "nl": "Dit is een broodjeszaak"
+ }
+ },
+ {
+ "if": "cuisine=burger",
+ "then": {
+ "nl": "Dit is een hamburgerrestaurant"
+ }
+ },
+ {
+ "if": "cuisine=sushi",
+ "then": {
+ "nl": "Dit is een sushirestaurant"
+ }
+ },
+ {
+ "if": "cuisine=coffee",
+ "then": {
+ "nl": "Dit is een koffiezaak"
+ }
+ },
+ {
+ "if": "cuisine=italian",
+ "then": {
+ "nl": "Dit is een Italiaans restaurant (dat meer dan enkel pasta of pizza verkoopt)"
+ }
+ },
+ {
+ "if": "cuisine=french",
+ "then": {
+ "nl": "Dit is een Frans restaurant"
+ }
+ },
+ {
+ "if": "cuisine=chinese",
+ "then": {
+ "nl": "Dit is een Chinees restaurant"
+ }
+ },
+ {
+ "if": "cuisine=greek",
+ "then": {
+ "nl": "Dit is een Grieks restaurant"
+ }
+ },
+ {
+ "if": "cuisine=indian",
+ "then": {
+ "nl": "Dit is een Indisch restaurant"
+ }
+ },
+ {
+ "if": "cuisine=turkish",
+ "then": {
+ "nl": "Dit is een Turks restaurant (dat meer dan enkel kebab verkoopt)"
+ }
+ },
+ {
+ "if": "cuisine=thai",
+ "then": {
+ "nl": "Dit is een Thaïs restaurant"
+ }
+ }
+ ]
+ },
+ {
+ "#": "Takeaway",
+ "question": {
+ "nl": "Biedt deze zaak een afhaalmogelijkheid aan?",
+ "en": "Does this place offer takea-way?"
+ },
+ "mappings": [
+ {
+ "if": "takeaway=only",
+ "then": {
+ "en": "This is a take-away only business",
+ "nl": "Hier is enkel afhaal mogelijk"
+ }
+ },
+ {
+ "if": "takeaway=yes",
+ "then": {
+ "en": "Take-away is possible here",
+ "nl": "Eten kan hier afgehaald worden"
+ }
+ },
+ {
+ "if": "takeaway=no",
+ "then": {
+ "en": "Take-away is not possible here",
+ "nl": "Hier is geen afhaalmogelijkheid"
+ }
+ }
+ ]
+ },
+ {
+ "#": "Vegetarion (no friture)",
"question": {
"nl": "Heeft deze eetgelegenheid een vegetarische optie?",
"en": "Does this restaurant have a vegetarian option?"
@@ -189,8 +354,8 @@
],
"condition": "cuisine!=friture"
},
-
{
+ "#": "Vegan (no friture)",
"question": {
"nl": "Heeft deze eetgelegenheid een veganistische optie?"
},
@@ -222,7 +387,6 @@
],
"condition": "cuisine!=friture"
},
-
{
"question": {
"nl": "Heeft deze frituur vegetarische snacks?",
diff --git a/assets/svg/direction_stroke.svg b/assets/svg/direction_stroke.svg
index af96495107..972d85dbe3 100644
--- a/assets/svg/direction_stroke.svg
+++ b/assets/svg/direction_stroke.svg
@@ -27,15 +27,15 @@
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
- inkscape:window-height="999"
+ inkscape:window-height="1043"
id="namedview16"
showgrid="false"
showguides="true"
inkscape:guide-bbox="true"
- inkscape:zoom="1"
- inkscape:cx="482.69344"
- inkscape:cy="931.96415"
- inkscape:window-x="0"
+ inkscape:zoom="11.313708"
+ inkscape:cx="957.92718"
+ inkscape:cy="973.59016"
+ inkscape:window-x="1920"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="svg14">
@@ -64,9 +64,42 @@ Created by potrace 1.15, written by Peter Selinger 2001-2017
+ style="fill:none;fill-opacity:1;stroke:#f8fff5;stroke-width:5.99999976;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="path814"
+ sodipodi:type="arc"
+ sodipodi:cx="-608.23303"
+ sodipodi:cy="-16.994486"
+ sodipodi:rx="430.74634"
+ sodipodi:ry="430.74634"
+ sodipodi:start="0"
+ sodipodi:end="1.6275175"
+ sodipodi:open="true"
+ d="M -177.48669,-16.994486 A 430.74634,430.74634 0 0 1 -312.40887,296.1037 430.74634,430.74634 0 0 1 -632.65237,413.05912"
+ transform="rotate(-136.60048)" />
+
+
+
+
+
diff --git a/assets/tagRenderings/questions.json b/assets/tagRenderings/questions.json
index b123d6f97e..112945115c 100644
--- a/assets/tagRenderings/questions.json
+++ b/assets/tagRenderings/questions.json
@@ -85,6 +85,58 @@
"type": "url"
}
},
+ "wheelchair-access": {
+ "question": {
+ "nl": "Is deze plaats rolstoeltoegankelijk?",
+ "en": "Is this place accessible with a wheelchair?"
+ },
+ "mappings": [
+ {
+ "if": {
+ "and": [
+ "wheelchair=designated"
+ ]
+ },
+ "then": {
+ "nl": "Deze plaats is speciaal aangepast voor gebruikers van een rolstoel",
+ "en": "This place is specially adapated for wheelchair users"
+ }
+ },
+ {
+ "if": {
+ "and": [
+ "wheelchair=yes"
+ ]
+ },
+ "then": {
+ "nl": "Deze plaats is vlot bereikbaar met een rolstoel",
+ "en": "This place is easily reachable with a wheelchair"
+ }
+ },
+ {
+ "if": {
+ "and": [
+ "wheelchair=limited"
+ ]
+ },
+ "then": {
+ "nl": "Deze plaats is bereikbaar met een rolstoel, maar het is niet makkelijk",
+ "en": "It is possible to reach this place in a wheelchair, but it is not easy"
+ }
+ },
+ {
+ "if": {
+ "and": [
+ "wheelchair=no"
+ ]
+ },
+ "then": {
+ "nl": "Niet rolstoeltoegankelijk",
+ "en": "This place is not reachable with a wheelchair"
+ }
+ }
+ ]
+ },
"description": {
"question": {
"nl": "Zijn er extra zaken die je niet in de bovenstaande vragen kwijt kon? Zet deze in de descriptionHerhaal geen antwoorden die je reeds gaf",