midgard/mapcomplete
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' into project/natuurpunt

Browse source
This commit is contained in:
pietervdvn 2021-07-27 22:01:36 +02:00
commit 9345c6ce75
6 changed files with 200 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
assets/layers/crossings/crossings.json
View file

@ -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?",

97
assets/themes/cycle_infra/cycle_infra.json
View file

@ -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="

21
langs/layers/en.json
View file

@ -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": {

21
langs/layers/nl.json
View file

@ -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": {

30
langs/themes/en.json
View file

@ -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?"

30
langs/themes/nl.json
View file

@ -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?"