diff --git a/assets/layers/crossings/crossings.json b/assets/layers/crossings/crossings.json index c2100883df..874d55a81e 100644 --- a/assets/layers/crossings/crossings.json +++ b/assets/layers/crossings/crossings.json @@ -10,7 +10,10 @@ }, "source": { "osmTags": { - "or": ["highway=traffic_signals", "highway=crossing"] + "or": [ + "highway=traffic_signals", + "highway=crossing" + ] } }, "minzoom": 14, @@ -41,13 +44,44 @@ "mappings": [ { "if": { - "or": ["highway=traffic_signals", "crossing=traffic_signals"] + "or": [ + "highway=traffic_signals", + "crossing=traffic_signals" + ] }, "then": "./assets/layers/crossings/traffic_lights.svg" } ] }, "width": "5", + "presets": [ + { + "title": { + "en": "Crossing", + "nl": "Oversteekplaats" + }, + "tags": [ + "highway=crossing" + ], + "description": { + "en": "Crossing for pedestrians and/or cyclists", + "nl": "Oversteekplaats voor voetgangers en/of fietsers" + } + }, + { + "title": { + "en": "Traffic signal", + "nl": "Verkeerslicht" + }, + "tags": [ + "highway=traffic_signals" + ], + "description": { + "en": "Traffic signal on a road", + "nl": "Verkeerslicht op een weg" + } + } + ], "tagRenderings": [ { "question": { @@ -163,7 +197,10 @@ "nl": "Heeft dit verkeerslicht een knop voor groen licht?" }, "condition": { - "or": ["highway=traffic_signals", "crossing=traffic_signals"] + "or": [ + "highway=traffic_signals", + "crossing=traffic_signals" + ] }, "mappings": [ { @@ -183,4 +220,4 @@ ] } ] -} +} \ No newline at end of file diff --git a/assets/themes/cycle_infra/cycle_infra.json b/assets/themes/cycle_infra/cycle_infra.json index 53798cf07c..86bc140d28 100644 --- a/assets/themes/cycle_infra/cycle_infra.json +++ b/assets/themes/cycle_infra/cycle_infra.json @@ -12,7 +12,10 @@ "en": "A map where you can view and edit things related to the bicycle infrastructure made during osoc21.", "nl": "Een kaart waar je info over de fietsinfrastructuur kan bekijken en bewerken gemaakt tijdens osoc21." }, - "language": ["en", "nl"], + "language": [ + "en", + "nl" + ], "maintainer": "", "icon": "./assets/svg/cycle-infra.svg", "version": "0", @@ -37,7 +40,10 @@ "cycleway=^(?!no).*", "cyclestreet=yes", { - "and": ["highway=path", "bicycle=designated"] + "and": [ + "highway=path", + "bicycle=designated" + ] } ] } @@ -50,7 +56,10 @@ "mappings": [ { "if": { - "or": ["highway=cycleway", "highway=path"] + "or": [ + "highway=cycleway", + "highway=path" + ] }, "then": { "nl": "Fietsweg", @@ -99,7 +108,10 @@ "nl": "Wat voor fietspad is hier?" }, "condition": { - "and": ["highway!=cycleway", "highway!=path"] + "and": [ + "highway!=cycleway", + "highway!=path" + ] }, "mappings": [ { @@ -198,7 +210,10 @@ "addExtraTags": [] }, "condition": { - "or": ["cycleway=shared_lane", "cycleway=lane"] + "or": [ + "cycleway=shared_lane", + "cycleway=lane" + ] }, "mappings": [ { @@ -252,7 +267,11 @@ "addExtraTags": [] }, "condition": { - "or": ["cycleway=shared_lane", "cycleway=lane", "cycleway=track"] + "or": [ + "cycleway=shared_lane", + "cycleway=lane", + "cycleway=track" + ] }, "mappings": [ { @@ -302,7 +321,11 @@ "nl": "Wat is de kwaliteit van dit fietspad?" }, "condition": { - "or": ["cycleway=shared_lane", "cycleway=lane", "cycleway=track"] + "or": [ + "cycleway=shared_lane", + "cycleway=lane", + "cycleway=track" + ] }, "mappings": [ { @@ -412,7 +435,10 @@ "nl": "Wat is de kwaliteit van deze straat?" }, "condition": { - "or": ["cycleway=no", "highway=cycleway"] + "or": [ + "cycleway=no", + "highway=cycleway" + ] }, "mappings": [ { @@ -467,7 +493,11 @@ }, { "condition": { - "or": ["cycleway=shared_lane", "cycleway=no", "cycleway="] + "or": [ + "cycleway=shared_lane", + "cycleway=no", + "cycleway=" + ] }, "render": { "en": "The carriage width of this road is {width:carriageway}m", @@ -499,7 +529,10 @@ "mappings": [ { "if": { - "or": ["highway=cycleway", "highway=path"] + "or": [ + "highway=cycleway", + "highway=path" + ] }, "then": "#00ff00" }, @@ -575,7 +608,10 @@ "nl": "Is er een fietspad?" }, "condition": { - "and": ["highway!=cycleway", "highway!=path"] + "and": [ + "highway!=cycleway", + "highway!=path" + ] }, "mappings": [ { @@ -641,7 +677,10 @@ }, "source": { "osmTags": { - "or": ["barrier=bollard", "barrier=cycle_barrier"] + "or": [ + "barrier=bollard", + "barrier=cycle_barrier" + ] } }, "minzoom": 14, @@ -754,4 +793,4 @@ }, "crossings" ] -} +} \ No newline at end of file diff --git a/langs/layers/en.json b/langs/layers/en.json index 24a6bfac60..04122f5b79 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -690,6 +690,94 @@ } } }, + "crossings": { + "name": "Crossings", + "description": "Crossings for pedestrians and cyclists", + "title": { + "render": "Crossing", + "mappings": { + "0": { + "then": "Traffic signal" + }, + "1": { + "then": "Crossing with traffic signals" + } + } + }, + "presets": { + "0": { + "title": "Crossing", + "description": "Crossing for pedestrians and/or cyclists" + }, + "1": { + "title": "Traffic signal", + "description": "Traffic signal on a road" + } + }, + "tagRenderings": { + "0": { + "question": "What kind of crossing is this?", + "mappings": { + "0": { + "then": "Crossing, without traffic lights" + }, + "1": { + "then": "Crossing with traffic signals" + }, + "2": { + "then": "Zebra crossing" + } + } + }, + "1": { + "question": "Is this crossing also for bicycles?", + "mappings": { + "0": { + "then": "A cyclist can use this crossing" + }, + "1": { + "then": "A cyclist can not use this crossing" + } + } + }, + "2": { + "question": "Does this crossing have an island in the middle?", + "mappings": { + "0": { + "then": "This crossing has an island in the middle" + }, + "1": { + "then": "This crossing does not have an island in the middle" + } + } + }, + "3": { + "question": "Does this crossing have tactile paving?", + "mappings": { + "0": { + "then": "This crossing has tactile paving" + }, + "1": { + "then": "This crossing does not have tactile paving" + }, + "2": { + "then": "This crossing has tactile paving, but is not correct" + } + } + }, + "4": { + "question": "Does this traffic light have a button to request green light?", + "mappings": { + "0": { + "then": "This traffic light has a button to request green light" + }, + "1": { + "then": "This traffic light does not have a button to request green light" + } + } + } + } + }, "defibrillator": { "name": "Defibrillators", "title": { diff --git a/langs/layers/nl.json b/langs/layers/nl.json index ca4156d911..72d5473261 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -772,6 +772,94 @@ } } }, + "crossings": { + "name": "Oversteekplaatsen", + "description": "Oversteekplaatsen voor voetgangers en fietsers", + "title": { + "render": "Oversteekplaats", + "mappings": { + "0": { + "then": "Verkeerslicht" + }, + "1": { + "then": "Oversteektplaats met verkeerslichten" + } + } + }, + "presets": { + "0": { + "title": "Oversteekplaats", + "description": "Oversteekplaats voor voetgangers en/of fietsers" + }, + "1": { + "title": "Verkeerslicht", + "description": "Verkeerslicht op een weg" + } + }, + "tagRenderings": { + "0": { + "question": "Wat voor oversteekplaats is dit?", + "mappings": { + "0": { + "then": "Oversteekplaats, zonder verkeerslichten" + }, + "1": { + "then": "Oversteekplaats met verkeerslichten" + }, + "2": { + "then": "Zebrapad" + } + } + }, + "1": { + "question": "Is deze oversteekplaats ook voor fietsers", + "mappings": { + "0": { + "then": "Een fietser kan deze oversteekplaats gebruiken" + }, + "1": { + "then": "Een fietser kan niet deze oversteekplaats gebruiken" + } + } + }, + "2": { + "question": "Heeft deze oversteekplaats een verkeerseiland in het midden?", + "mappings": { + "0": { + "then": "Deze oversteekplaats heeft een verkeerseiland in het midden" + }, + "1": { + "then": "Deze oversteekplaats heeft niet een verkeerseiland in het midden" + } + } + }, + "3": { + "question": "Heeft deze oversteekplaats een geleidelijn?", + "mappings": { + "0": { + "then": "Deze oversteekplaats heeft een geleidelijn" + }, + "1": { + "then": "Deze oversteekplaats heeft niet een geleidelijn" + }, + "2": { + "then": "Deze oversteekplaats heeft een geleidelijn, die incorrect is." + } + } + }, + "4": { + "question": "Heeft dit verkeerslicht een knop voor groen licht?", + "mappings": { + "0": { + "then": "Dit verkeerslicht heeft een knop voor groen licht" + }, + "1": { + "then": "Dit verkeerlicht heeft niet een knop voor groen licht" + } + } + } + } + }, "defibrillator": { "name": "Defibrillatoren", "title": { diff --git a/langs/themes/en.json b/langs/themes/en.json index f5db488b97..070077cc44 100644 --- a/langs/themes/en.json +++ b/langs/themes/en.json @@ -692,6 +692,289 @@ } } }, + "cycle_infra": { + "title": "Bicycle infrastructure", + "shortDescription": "A map where you can view and edit things related to the bicycle infrastructure.", + "description": "A map where you can view and edit things related to the bicycle infrastructure made during osoc21.", + "layers": { + "0": { + "name": "Cycleways", + "title": { + "render": "Cycleways", + "mappings": { + "0": { + "then": "Bike road" + }, + "1": { + "then": "Shared lane" + }, + "2": { + "then": "Bike lane" + }, + "3": { + "then": "Bike road next to the road" + }, + "4": { + "then": "Cyclestreet" + } + } + }, + "tagRenderings": { + "0": { + "question": "What kind of cycleway is there?", + "mappings": { + "0": { + "then": "There is a shared lane" + }, + "1": { + "then": "There is a lane next to the road (seperated with paint)" + }, + "2": { + "then": "There is a track, but no cycleway drawn seperately from this road on the map." + }, + "3": { + "then": "There is a seperately drawn cycleway" + }, + "4": { + "then": "This is a cyclestreet." + }, + "5": { + "then": "There is no cycleway" + } + }, + "render": "Unknown cycleway situation" + }, + "1": { + "question": "Is this street lit?", + "mappings": { + "0": { + "then": "This street is lit" + }, + "1": { + "then": "This road is not lit" + }, + "2": { + "then": "This road is lit at night" + }, + "3": { + "then": "This road is lit 24/7" + } + } + }, + "2": { + "render": "The maximum speed on this road is {maxspeed} km/h", + "mappings": { + "0": { + "then": "The maximum speed is 20 km/h" + }, + "1": { + "then": "The maximum speed is 30 km/h" + }, + "2": { + "then": "The maximum speed is 50 km/h" + }, + "3": { + "then": "The maximum speed is 70 km/h" + }, + "4": { + "then": "The maximum speed is 90 km/h" + } + }, + "question": "What is the maximum speed in this street?" + }, + "3": { + "render": "This cyleway is made of {cycleway:surface}", + "mappings": { + "0": { + "then": "This street is made of wood" + }, + "1": { + "then": "This street is made of concrete" + }, + "2": { + "then": "This street is made of cobblestone" + }, + "3": { + "then": "This street is made of asphalt" + }, + "4": { + "then": "This street is paved" + } + }, + "question": "What is the cycleway:surface of the street made from?" + }, + "4": { + "question": "What is the smoothness of this cycleway?", + "mappings": { + "0": { + "then": "Usable for thin rollers: rollerblade, skateboard" + }, + "1": { + "then": "Usable for thin wheels: racing bike" + }, + "2": { + "then": "Usable for normal wheels: city bike, wheelchair, scooter" + }, + "3": { + "then": "Usable for robust wheels: trekking bike, car, rickshaw" + }, + "4": { + "then": "Usable for vehicles with high clearance: light duty off-road vehicle" + }, + "5": { + "then": "Usable for off-road vehicles: heavy duty off-road vehicle" + }, + "6": { + "then": "Usable for specialized off-road vehicles: tractor, ATV" + }, + "7": { + "then": "Impassable / No wheeled vehicle" + } + } + }, + "5": { + "render": "This road is made of {surface}", + "mappings": { + "0": { + "then": "This street is made of wood" + }, + "1": { + "then": "This street is made of concrete" + }, + "2": { + "then": "This street is made of cobblestone" + }, + "3": { + "then": "This street is made of asphalt" + }, + "4": { + "then": "This street is paved" + } + }, + "question": "What is the surface of the street made from?" + }, + "6": { + "question": "What is the smoothness of this street?", + "mappings": { + "0": { + "then": "Usable for thin rollers: rollerblade, skateboard" + }, + "1": { + "then": "Usable for thin wheels: racing bike" + }, + "2": { + "then": "Usable for normal wheels: city bike, wheelchair, scooter" + }, + "3": { + "then": "Usable for robust wheels: trekking bike, car, rickshaw" + }, + "4": { + "then": "Usable for vehicles with high clearance: light duty off-road vehicle" + }, + "5": { + "then": "Usable for off-road vehicles: heavy duty off-road vehicle" + }, + "6": { + "then": "Usable for specialized off-road vehicles: tractor, ATV" + }, + "7": { + "then": "Impassable / No wheeled vehicle" + } + } + }, + "7": { + "render": "The carriage width of this road is {width:carriageway}m", + "question": "What is the carriage width of this road (in meters)?" + } + } + }, + "1": { + "name": "All streets", + "description": "Layer to mark new cycleways", + "title": { + "render": "Street" + }, + "tagRenderings": { + "0": { + "question": "Is there a cycleway?", + "mappings": { + "0": { + "then": "There is a shared lane" + }, + "1": { + "then": "There is a lane next to the road (seperated with paint)" + }, + "2": { + "then": "There is a track, but no cycleway drawn seperately from this road on the map." + }, + "3": { + "then": "There is a seperately drawn cycleway" + }, + "4": { + "then": "This is a cyclestreet." + }, + "5": { + "then": "There is no cycleway" + } + }, + "render": "Unknown cycleway situation" + } + } + }, + "2": { + "name": "Barriers", + "description": "Obstacles while cycling, such as bollards and cycle barriers", + "title": { + "render": "Barrier", + "mappings": { + "0": { + "then": "Bollard" + }, + "1": { + "then": "Cycling Barrier" + } + } + }, + "tagRenderings": { + "0": { + "question": "Can a bicycle go past this barrier?", + "mappings": { + "0": { + "then": "A cyclist can go past this." + }, + "1": { + "then": "A cyclist can not go past this." + } + } + }, + "1": { + "question": "What kind of bollard is this?", + "mappings": { + "0": { + "then": "Removable bollard" + }, + "1": { + "then": "Fixed bollard" + }, + "2": { + "then": "Bollard that can be folded down" + }, + "3": { + "then": "Flexible bollard, usually plastic" + }, + "4": { + "then": "Rising bollard" + } + } + }, + "2": { + "render": "Maximum width: {maxwidth:physical} m", + "question": "How wide is the gap left over besides the barrier?" + } + } + } + } + }, "fietsstraten": { "title": "Cyclestreets", "shortDescription": "A map of cyclestreets", diff --git a/langs/themes/nl.json b/langs/themes/nl.json index 44bf09b5f4..83d4e63e4e 100644 --- a/langs/themes/nl.json +++ b/langs/themes/nl.json @@ -548,6 +548,237 @@ } } }, + "cycle_infra": { + "title": "Fietsinfrastructuur", + "shortDescription": "Een kaart waar je info over de fietsinfrastructuur kan bekijken en bewerken.", + "description": "Een kaart waar je info over de fietsinfrastructuur kan bekijken en bewerken gemaakt tijdens osoc21.", + "layers": { + "0": { + "name": "Fietspaden", + "title": { + "render": "Fietspaden", + "mappings": { + "0": { + "then": "Fietsweg" + }, + "1": { + "then": "Fietssuggestiestrook" + }, + "2": { + "then": "Fietsstrook" + }, + "3": { + "then": "Fietsweg naast de weg" + }, + "4": { + "then": "Fietsstraat" + } + } + }, + "tagRenderings": { + "0": { + "question": "Wat voor fietspad is hier?", + "mappings": { + "0": { + "then": "Er is een fietssugestiestrook" + }, + "1": { + "then": "Er is een fietspad aangrenzend aan de weg (gescheiden met verf)" + }, + "2": { + "then": "Er is een fietspad (los van de weg), maar geen fietspad afzonderlijk getekend naast deze weg." + }, + "3": { + "then": "Er is een apart getekend fietspad." + }, + "4": { + "then": "Dit is een fietsstraat." + }, + "5": { + "then": "Er is geen fietspad" + } + }, + "render": "Onbekende fietspad situatie" + }, + "1": { + "question": "Is deze weg verlicht?", + "mappings": { + "0": { + "then": "Deze weg is verlicht" + }, + "1": { + "then": "Deze weg is niet verlicht" + }, + "2": { + "then": "Deze weg is 's nachts verlicht" + }, + "3": { + "then": "Deze weg is 24/7 verlicht" + } + } + }, + "2": { + "render": "De maximumsnelheid op deze weg is {maxspeed} km/u", + "mappings": { + "0": { + "then": "De maximumsnelheid is 20 km/u" + }, + "1": { + "then": "De maximumsnelheid is 30 km/u" + }, + "2": { + "then": "De maximumsnelheid is 50 km/u" + }, + "3": { + "then": "De maximumsnelheid is 70 km/u" + }, + "4": { + "then": "De maximumsnelheid is 90 km/u" + } + }, + "question": "Wat is de maximumsnelheid in deze straat?" + }, + "3": { + "render": "Dit fietspad is gemaakt van {cycleway:surface}", + "mappings": { + "0": { + "then": "Deze weg is gemaakt van hout" + }, + "1": { + "then": "Deze straat is gemaakt van beton" + }, + "2": { + "then": "Deze straat is gemaakt van kasseien" + }, + "3": { + "then": "Deze straat is gemaakt van asfalt" + }, + "4": { + "then": "Deze straat is geplaveid" + } + }, + "question": "Waaruit is het oppervlak van de straat gemaakt?" + }, + "4": { + "question": "Wat is de kwaliteit van dit fietspad?" + }, + "5": { + "render": "Deze weg is gemaakt van {surface}", + "mappings": { + "0": { + "then": "Deze weg is gemaakt van hout" + }, + "1": { + "then": "Deze straat is gemaakt van beton" + }, + "2": { + "then": "Deze straat is gemaakt van kasseien" + }, + "3": { + "then": "Deze straat is gemaakt van asfalt" + }, + "4": { + "then": "Deze straat is geplaveid" + } + }, + "question": "Waaruit is het oppervlak van de straat gemaakt?" + }, + "6": { + "question": "Wat is de kwaliteit van deze straat?" + }, + "7": { + "render": "De breedte van deze rijbaan in deze straat is {width:carriageway}m", + "question": "Hoe breed is de rijbaan in deze straat (in meters)?" + } + } + }, + "1": { + "name": "Alle straten", + "description": "Laag waar je nieuwe fietspaden kan aanduiden", + "title": { + "render": "Straat" + }, + "tagRenderings": { + "0": { + "question": "Is er een fietspad?", + "mappings": { + "0": { + "then": "Er is een fietssugestiestrook" + }, + "1": { + "then": "Er is een fietspad aangrenzend aan de weg (gescheiden met verf)" + }, + "2": { + "then": "Er is een fietspad (los van de weg), maar geen fietspad afzonderlijk getekend naast deze weg." + }, + "3": { + "then": "Er is een apart getekend fietspad." + }, + "4": { + "then": "Dit is een fietsstraat." + }, + "5": { + "then": "Er is geen fietspad" + } + }, + "render": "Onbekende fietspad situatie" + } + } + }, + "2": { + "name": "Barrières", + "description": "Hindernissen tijdens het fietsen, zoals paaltjes en fietshekjes", + "title": { + "render": "Barrière", + "mappings": { + "0": { + "then": "Paaltje" + }, + "1": { + "then": "Fietshekjes" + } + } + }, + "tagRenderings": { + "0": { + "question": "Kan een fietser langs deze barrière?", + "mappings": { + "0": { + "then": "Een fietser kan hier langs." + }, + "1": { + "then": "Een fietser kan hier niet langs." + } + } + }, + "1": { + "question": "Wat voor soort paal is dit?", + "mappings": { + "0": { + "then": "Verwijderbare paal" + }, + "1": { + "then": "Vaste paal" + }, + "2": { + "then": "Paal die platgevouwen kan worden" + }, + "3": { + "then": "Flexibele paal, meestal plastic" + }, + "4": { + "then": "Verzonken poller" + } + } + }, + "2": { + "render": "Maximumbreedte: {maxwidth:physical} m", + "question": "Hoe breed is de ruimte naast de barrière?" + } + } + } + } + }, "fietsstraten": { "title": "Fietsstraten", "shortDescription": "Een kaart met alle gekende fietsstraten",