diff --git a/assets/layers/crossings/crossings.json b/assets/layers/crossings/crossings.json index ebbc91014..0dcfc9aa1 100644 --- a/assets/layers/crossings/crossings.json +++ b/assets/layers/crossings/crossings.json @@ -114,6 +114,29 @@ } ] }, + { + "question": { + "en": "Is this is a zebra crossing?", + "nl": "Is dit een zebrapad?" + }, + "condition": "crossing=uncontrolled", + "mappings": [ + { + "if": "crossing_ref=zebra", + "then": { + "en": "This is a zebra crossing", + "nl": "Dit is een zebrapad" + } + }, + { + "if": "crossing_ref=", + "then": { + "en": "This is not a zebra crossing", + "nl": "Dit is niet een zebrapad" + } + } + ] + }, { "question": { "en": "Is this crossing also for bicycles?", diff --git a/assets/themes/cycle_infra/cycle_infra.json b/assets/themes/cycle_infra/cycle_infra.json index f6bf2f477..8d4183a7c 100644 --- a/assets/themes/cycle_infra/cycle_infra.json +++ b/assets/themes/cycle_infra/cycle_infra.json @@ -69,7 +69,7 @@ }, "then": { "nl": "Fietsweg", - "en": "Bike road" + "en": "Cycleway" } }, { @@ -89,7 +89,7 @@ { "if": "cycleway=track", "then": { - "en": "Bike road next to the road", + "en": "Cycleway next to the road", "nl": "Fietsweg naast de weg" } }, @@ -219,7 +219,7 @@ "if": "cyclestreet=yes", "then": { "en": "This is a cyclestreet, and a 30km/h zone.", - "nl": "Dit is een fietstraat, en dus een 30km/h zone" + "nl": "Dit is een fietsstraat, en dus een 30km/h zone" }, "addExtraTags": [ "overtaking:motor_vehicle=no", @@ -231,7 +231,7 @@ "if": "cyclestreet=yes", "then": { "en": "This is a cyclestreet", - "nl": "Dit is een fietstraat" + "nl": "Dit is een fietsstraat" }, "hideInAnswer": "_country=be" }, @@ -239,7 +239,7 @@ "if": "cyclestreet=", "then": { "en": "This is not a cyclestreet.", - "nl": "Dit is niet een fietstraat" + "nl": "Dit is niet een fietsstraat" }, "addExtraTags": [ "overtaking:motor_vehicle=" @@ -343,18 +343,67 @@ } }, { - "if": "cycleway:surface=asphalt", + "if": "cycleway:surface=unhewn_cobblestone", "then": { "en": "This cycleway is made of asphalt", "nl": "Dit fietspad is gemaakt van asfalt" } }, { - "if": "cycleway:surface=paved", + "if": "cycleway:surface=sett", "then": { "en": "This cycleway is paved", "nl": "Dit fietspad is geplaveid" } + }, + { + "if": "cycleway:surface=asphalt", + "then": { + "en": "This cycleway is paved with stones with a flat top", + "nl": "Dit fietspad is geplaveid met stenen" + } + }, + { + "if": "cycleway:surface=paved", + "then": { + "en": "This cycleway is made of gravel", + "nl": "Dit fietspad is gemaakt van grind" + } + }, + { + "if": "cycleway:surface=paving_stones", + "then": { + "en": "This cycleway is unhardened", + "nl": "Dit fietspad is onverhard" + } + }, + { + "if": "cycleway:surface=gravel", + "then": { + "en": "This cycleway is made of gravel", + "nl": "Dit fietspad is gemaakt van grind" + } + }, + { + "if": "cycleway:surface=fine_gravel", + "then": { + "en": "This cycleway is made of fine gravel", + "nl": "Dit fietspad is gemaakt van fijn grind" + } + }, + { + "if": "cycleway:surface=pebblestone", + "then": { + "en": "This cycleway is made of pebblestone", + "nl": "Dit fietspad is gemaakt van kiezelsteentjes" + } + }, + { + "if": "cycleway:surface=ground", + "then": { + "en": "This cycleway is made from raw ground", + "nl": "Dit fietspad is gemaakt van aarde" + } } ], "question": { @@ -450,7 +499,7 @@ } }, { - "if": "surface=cobblestone", + "if": "surface=sett", "then": { "en": "This street is made of cobblestone", "nl": "Deze straat is gemaakt van kasseien" @@ -469,6 +518,30 @@ "en": "This street is paved", "nl": "Deze straat is geplaveid" } + }, + { + "if": "surface=fine_gravel", + "then": { + "en": "This street is made from fine gravel", + "nl": "Deze straat is gemaakt van fijn grind" + }, + "hideInAnswer": true + }, + { + "if": "surface=cobblestone", + "then": { + "en": "This street is made from cobblestone", + "nl": "Deze straat is gemaakt van kasseien" + }, + "hideInAnswer": true + }, + { + "if": "surface=paving_stones", + "then": { + "en": "This street is made from paving stones", + "nl": "Deze straat is gemaakt van geplaveide stenen" + }, + "hideInAnswer": true } ], "question": { @@ -1095,7 +1168,7 @@ "icon": "./assets/themes/cycle_infra/street.svg", "width": "5", "color": { - "render": "#aaaaaa", + "render": "rgba(170, 170, 170, 0.7)", "mappings": [] }, "tagRenderings": [ @@ -1193,7 +1266,7 @@ "if": "cyclestreet=yes", "then": { "en": "This is a cyclestreet, and a 30km/h zone.", - "nl": "Dit is een fietstraat, en dus een 30km/h zone" + "nl": "Dit is een fietsstraat, en dus een 30km/h zone" }, "addExtraTags": [ "overtaking:motor_vehicle=no", @@ -1205,7 +1278,7 @@ "if": "cyclestreet=yes", "then": { "en": "This is a cyclestreet", - "nl": "Dit is een fietstraat" + "nl": "Dit is een fietsstraat" }, "hideInAnswer": "_country=be" }, @@ -1213,7 +1286,7 @@ "if": "cyclestreet=", "then": { "en": "This is not a cyclestreet.", - "nl": "Dit is niet een fietstraat" + "nl": "Dit is niet een fietsstraat" }, "addExtraTags": [ "overtaking:motor_vehicle=" diff --git a/langs/layers/en.json b/langs/layers/en.json index fb2d15d9e..44c0b1495 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -741,6 +741,17 @@ } }, "1": { + "question": "Is this is a zebra crossing?", + "mappings": { + "0": { + "then": "This is a zebra crossing" + }, + "1": { + "then": "This is not a zebra crossing" + } + } + }, + "2": { "question": "Is this crossing also for bicycles?", "mappings": { "0": { @@ -751,7 +762,7 @@ } } }, - "2": { + "3": { "question": "Does this crossing have an island in the middle?", "mappings": { "0": { @@ -762,7 +773,7 @@ } } }, - "3": { + "4": { "question": "Does this crossing have tactile paving?", "mappings": { "0": { @@ -776,7 +787,7 @@ } } }, - "4": { + "5": { "question": "Does this traffic light have a button to request green light?", "mappings": { "0": { @@ -787,7 +798,7 @@ } } }, - "5": { + "6": { "question": "Can a cyclist turn right when the light is red?", "mappings": { "0": { @@ -801,7 +812,7 @@ } } }, - "6": { + "7": { "question": "Can a cyclist go straight on when the light is red?", "mappings": { "0": { diff --git a/langs/layers/nl.json b/langs/layers/nl.json index 642021cc0..c736486bb 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -831,6 +831,17 @@ } }, "1": { + "question": "Is dit een zebrapad?", + "mappings": { + "0": { + "then": "Dit is een zebrapad" + }, + "1": { + "then": "Dit is niet een zebrapad" + } + } + }, + "2": { "question": "Is deze oversteekplaats ook voor fietsers", "mappings": { "0": { @@ -841,7 +852,7 @@ } } }, - "2": { + "3": { "question": "Heeft deze oversteekplaats een verkeerseiland in het midden?", "mappings": { "0": { @@ -852,7 +863,7 @@ } } }, - "3": { + "4": { "question": "Heeft deze oversteekplaats een geleidelijn?", "mappings": { "0": { @@ -866,7 +877,7 @@ } } }, - "4": { + "5": { "question": "Heeft dit verkeerslicht een knop voor groen licht?", "mappings": { "0": { @@ -877,7 +888,7 @@ } } }, - "5": { + "6": { "question": "Mag een fietser rechtsaf slaan als het licht rood is?", "mappings": { "0": { @@ -891,7 +902,7 @@ } } }, - "6": { + "7": { "question": "Mag een fietser rechtdoor gaan als het licht rood is?", "mappings": { "0": { diff --git a/langs/themes/en.json b/langs/themes/en.json index 9e0fc9e2d..94744363f 100644 --- a/langs/themes/en.json +++ b/langs/themes/en.json @@ -812,6 +812,27 @@ }, "4": { "then": "This cycleway is paved" + }, + "5": { + "then": "This cycleway is paved with stones with a flat top" + }, + "6": { + "then": "This cycleway is made of gravel" + }, + "7": { + "then": "This cycleway is unhardened" + }, + "8": { + "then": "This cycleway is made of gravel" + }, + "9": { + "then": "This cycleway is made of fine gravel" + }, + "10": { + "then": "This cycleway is made of pebblestone" + }, + "11": { + "then": "This cycleway is made from raw ground" } }, "question": "What is the surface of the cycleway made from?" @@ -862,6 +883,15 @@ }, "4": { "then": "This street is paved" + }, + "5": { + "then": "This street is made from fine gravel" + }, + "6": { + "then": "This street is made from cobblestone" + }, + "7": { + "then": "This street is made from paving stones" } }, "question": "What is the surface of the street made from?" diff --git a/langs/themes/nl.json b/langs/themes/nl.json index 6e4c68c78..5f3953046 100644 --- a/langs/themes/nl.json +++ b/langs/themes/nl.json @@ -700,6 +700,27 @@ }, "4": { "then": "Dit fietspad is geplaveid" + }, + "5": { + "then": "Dit fietspad is geplaveid met stenen" + }, + "6": { + "then": "Dit fietspad is gemaakt van grind" + }, + "7": { + "then": "Dit fietspad is onverhard" + }, + "8": { + "then": "Dit fietspad is gemaakt van grind" + }, + "9": { + "then": "Dit fietspad is gemaakt van fijn grind" + }, + "10": { + "then": "Dit fietspad is gemaakt van kiezelsteentjes" + }, + "11": { + "then": "Dit fietspad is gemaakt van aarde" } }, "question": "Waaruit is het oppervlak van het fietspad van gemaakt?" @@ -724,6 +745,15 @@ }, "4": { "then": "Deze straat is geplaveid" + }, + "5": { + "then": "Deze straat is gemaakt van fijn grind" + }, + "6": { + "then": "Deze straat is gemaakt van kasseien" + }, + "7": { + "then": "Deze straat is gemaakt van geplaveide stenen" } }, "question": "Waaruit is het oppervlak van de straat gemaakt?"