midgard/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Merge develop

Browse source
This commit is contained in:
Pieter Vander Vennet 2021-07-29 10:39:16 +02:00
commit 1571fa478b
42 changed files with 927 additions and 461 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -23,9 +23,9 @@
"startLat": 51,
"startLon": 3.75,
"startZoom": 11,
"widenFactor": 0.05,
"widenFactor": 0,
"socialImage": "./assets/themes/cycle_infra/cycle-infra.svg",
"enableExportButton": true,
"enableDownload": true,
"layers": [
{
"id": "cycleways",
@ -33,7 +33,7 @@
"en": "Cycleways",
"nl": "Fietspaden"
},
"minzoom": 14,
"minzoom": 16,
"source": {
"osmTags": {
"or": [
@ -239,7 +239,7 @@
"if": "cyclestreet=",
"then": {
"en": "This is not a cyclestreet.",
"nl": "Dit is niet een fietstraat"
"nl": "Dit is geen fietsstraat"
},
"addExtraTags": [
"overtaking:motor_vehicle="
@ -427,49 +427,57 @@
{
"if": "cycleway:smoothness=excellent",
"then": {
"en": "Usable for thin rollers: rollerblade, skateboard"
"en": "Usable for thin rollers: rollerblade, skateboard",
"nl": "Geschikt voor fijne rollers: rollerblade, skateboard"
}
},
{
"if": "cycleway:smoothness=good",
"then": {
"en": "Usable for thin wheels: racing bike"
"en": "Usable for thin wheels: racing bike",
"nl": "Geschikt voor fijne wielen: racefiets"
}
},
{
"if": "cycleway:smoothness=intermediate",
"then": {
"en": "Usable for normal wheels: city bike, wheelchair, scooter"
"en": "Usable for normal wheels: city bike, wheelchair, scooter",
"nl": "Geschikt voor normale wielen: stadsfiets, rolstoel, scooter"
}
},
{
"if": "cycleway:smoothness=bad",
"then": {
"en": "Usable for robust wheels: trekking bike, car, rickshaw"
"en": "Usable for robust wheels: trekking bike, car, rickshaw",
"nl": "Geschikt voor brede wielen: trekfiets, auto, rickshaw"
}
},
{
"if": "cycleway:smoothness=very_bad",
"then": {
"en": "Usable for vehicles with high clearance: light duty off-road vehicle"
"en": "Usable for vehicles with high clearance: light duty off-road vehicle",
"nl": "Geschikt voor voertuigen met hoge banden: lichte terreinwagen"
}
},
{
"if": "cycleway:smoothness=horrible",
"then": {
"en": "Usable for off-road vehicles: heavy duty off-road vehicle"
"en": "Usable for off-road vehicles: heavy duty off-road vehicle",
"nl": "Geschikt voor terreinwagens: zware terreinwagen"
}
},
{
"if": "cycleway:smoothness=very_horrible",
"then": {
"en": "Usable for specialized off-road vehicles: tractor, ATV"
"en": "Usable for specialized off-road vehicles: tractor, ATV",
"nl": "Geschikt voor gespecialiseerde terreinwagens: tractor, alleterreinwagen"
}
},
{
"if": "cycleway:smoothness=impassable",
"then": {
"en": "Impassable / No wheeled vehicle"
"en": "Impassable / No wheeled vehicle",
"nl": "Niet geschikt voor voertuigen met wielen"
}
}
]
@ -625,8 +633,11 @@
},
"freeform": {
"key": "width:carriageway",
"addExtraTags": [],
"type": "pfloat"
"type": "length",
"helperArgs": [
"20",
"map"
]
},
"question": {
"en": "What is the carriage width of this road (in meters)?",
@ -648,24 +659,24 @@
{
"if": "cycleway:traffic_sign=BE:D7",
"then": {
"en": "Compulsory cycleway <img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='height: 3em'>",
"nl": "Verplicht fietspad <img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='height: 3em'>"
"en": "Compulsory cycleway <img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 3em'>",
"nl": "Verplicht fietspad <img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 3em'>"
},
"hideInAnswer": "_country!=be"
},
{
"if": "cycleway:traffic_sign~BE:D7;.*",
"then": {
"en": "Compulsory cycleway (with supplementary sign)<img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='height: 3em'> ",
"nl": "Verplicht fietspad (met onderbord)<img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='height: 3em'>"
"en": "Compulsory cycleway (with supplementary sign)<br><img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 3em'> ",
"nl": "Verplicht fietspad (met onderbord)<br><img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 3em'>"
},
"hideInAnswer": true
},
{
"if": "cycleway:traffic_sign=BE:D9",
"then": {
"en": "Segregated foot/cycleway <img src='./assets/themes/cycle_infra/Belgian_road_sign_D09.svg' style='height: 3em'>",
"nl": "Afgescheiden voet-/fietspad <img src='./assets/themes/cycle_infra/Belgian_road_sign_D09.svg' style='height: 3em'>"
"en": "Segregated foot/cycleway <img src='./assets/themes/cycle_infra/Belgian_road_sign_D09.svg' style='width: 3em'>",
"nl": "Afgescheiden voet-/fietspad <img src='./assets/themes/cycle_infra/Belgian_road_sign_D09.svg' style='width: 3em'>"
},
"hideInAnswer": "_country!=be",
"addExtraTags": [
@ -676,8 +687,8 @@
{
"if": "cycleway:traffic_sign=BE:D10",
"then": {
"en": "Unsegregated foot/cycleway <img src='./assets/themes/cycle_infra/Belgian_road_sign_D10.svg' style='height: 3em'>",
"nl": "Gedeeld voet-/fietspad <img src='./assets/themes/cycle_infra/Belgian_road_sign_D10.svg' style='height: 3em'>"
"en": "Unsegregated foot/cycleway <img src='./assets/themes/cycle_infra/Belgian_road_sign_D10.svg' style='width: 3em'>",
"nl": "Gedeeld voet-/fietspad <img src='./assets/themes/cycle_infra/Belgian_road_sign_D10.svg' style='width: 3em'>"
},
"hideInAnswer": "_country!=be",
"addExtraTags": [
@ -709,8 +720,8 @@
{
"if": "traffic_sign=BE:D7",
"then": {
"en": "Compulsory cycleway <img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='height: 3em'>",
"nl": "Verplicht fietspad <img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='height: 3em'>"
"en": "Compulsory cycleway <img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 3em'>",
"nl": "Verplicht fietspad <img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 3em'>"
},
"hideInAnswer": "_country!=be",
"addExtraTags": [
@ -723,16 +734,16 @@
{
"if": "traffic_sign~BE:D7;.*",
"then": {
"en": "Compulsory cycleway (with supplementary sign)<img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='height: 3em'> ",
"nl": "Verplicht fietspad (met onderbord)<img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='height: 3em'>"
"en": "Compulsory cycleway (with supplementary sign)<img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 3em'> ",
"nl": "Verplicht fietspad (met onderbord)<img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 3em'>"
},
"hideInAnswer": true
},
{
"if": "traffic_sign=BE:D9",
"then": {
"en": "Segregated foot/cycleway <img src='./assets/themes/cycle_infra/Belgian_road_sign_D09.svg' style='height: 3em'>",
"nl": "Afgescheiden voet-/fietspad <img src='./assets/themes/cycle_infra/Belgian_road_sign_D09.svg' style='height: 3em'>"
"en": "Segregated foot/cycleway <img src='./assets/themes/cycle_infra/Belgian_road_sign_D09.svg' style='width: 3em'>",
"nl": "Afgescheiden voet-/fietspad <img src='./assets/themes/cycle_infra/Belgian_road_sign_D09.svg' style='width: 3em'>"
},
"hideInAnswer": "_country!=be",
"addExtraTags": [
@ -747,8 +758,8 @@
{
"if": "traffic_sign=BE:D10",
"then": {
"en": "Unsegregated foot/cycleway <img src='./assets/themes/cycle_infra/Belgian_road_sign_D10.svg' style='height: 3em'>",
"nl": "Gedeeld voet-/fietspad <img src='./assets/themes/cycle_infra/Belgian_road_sign_D10.svg' style='height: 3em'>"
"en": "Unsegregated foot/cycleway <img src='./assets/themes/cycle_infra/Belgian_road_sign_D10.svg' style='width: 3em'>",
"nl": "Gedeeld voet-/fietspad <img src='./assets/themes/cycle_infra/Belgian_road_sign_D10.svg' style='width: 3em'>"
},
"hideInAnswer": "_country!=be",
"addExtraTags": [
@ -771,8 +782,8 @@
},
{
"question": {
"en": "Does the traffic sign D7 (<img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='height: 1.5em'>) have a supplementary sign?",
"nl": "Heeft het verkeersbord D7 (<img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='height: 1.5em'>) een onderbord?"
"en": "Does the traffic sign D7 (<img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 1.5em'>) have a supplementary sign?",
"nl": "Heeft het verkeersbord D7 (<img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 1.5em'>) een onderbord?"
},
"condition": {
"or": [
@ -784,8 +795,8 @@
{
"if": "cycleway:traffic_sign=BE:D7;BE:M6",
"then": {
"en": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M6.svg' style='height: 3em'>",
"nl": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M6.svg' style='height: 3em'>"
"en": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M6.svg' style='width: 3em'>",
"nl": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M6.svg' style='width: 3em'>"
},
"hideInAnswer": "_country!=be",
"addExtraTags": [
@ -795,8 +806,8 @@
{
"if": "cycleway:traffic_sign=BE:D7;BE:M13",
"then": {
"en": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M13.svg' style='height: 3em'>",
"nl": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M13.svg' style='height: 3em'>"
"en": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M13.svg' style='width: 3em'>",
"nl": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M13.svg' style='width: 3em'>"
},
"hideInAnswer": "_country!=be",
"addExtraTags": [
@ -806,8 +817,8 @@
{
"if": "cycleway:traffic_sign=BE:D7;BE:M14",
"then": {
"en": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M14.svg' style='height: 3em'>",
"nl": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M14.svg' style='height: 3em'>"
"en": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M14.svg' style='width: 3em'>",
"nl": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M14.svg' style='width: 3em'>"
},
"hideInAnswer": "_country!=be",
"addExtraTags": [
@ -818,8 +829,8 @@
{
"if": "cycleway:traffic_sign=BE:D7;BE:M7",
"then": {
"en": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M7.svg' style='height: 3em'>",
"nl": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M7.svg' style='height: 3em'>"
"en": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M7.svg' style='width: 3em'>",
"nl": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M7.svg' style='width: 3em'>"
},
"hideInAnswer": "_country!=be",
"addExtraTags": [
@ -829,8 +840,8 @@
{
"if": "cycleway:traffic_sign=BE:D7;BE:M15",
"then": {
"en": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M15.svg' style='height: 3em'>",
"nl": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M15.svg' style='height: 3em'>"
"en": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M15.svg' style='width: 3em'>",
"nl": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M15.svg' style='width: 3em'>"
},
"hideInAnswer": "_country!=be",
"addExtraTags": [
@ -840,8 +851,8 @@
{
"if": "cycleway:traffic_sign=BE:D7;BE:M16",
"then": {
"en": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M16.svg' style='height: 3em'>",
"nl": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M16.svg' style='height: 3em'>"
"en": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M16.svg' style='width: 3em'>",
"nl": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M16.svg' style='width: 3em'>"
},
"hideInAnswer": "_country!=be",
"addExtraTags": [
@ -860,8 +871,8 @@
},
{
"question": {
"en": "Does the traffic sign D7 (<img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='height: 1.5em'>) have a supplementary sign?",
"nl": "Heeft het verkeersbord D7 (<img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='height: 1.5em'>) een onderbord?"
"en": "Does the traffic sign D7 (<img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 1.5em'>) have a supplementary sign?",
"nl": "Heeft het verkeersbord D7 (<img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 1.5em'>) een onderbord?"
},
"condition": {
"or": [
@ -873,8 +884,8 @@
{
"if": "traffic_sign=BE:D7;BE:M6",
"then": {
"en": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M6.svg' style='height: 3em'>",
"nl": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M6.svg' style='height: 3em'>"
"en": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M6.svg' style='width: 3em'>",
"nl": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M6.svg' style='width: 3em'>"
},
"hideInAnswer": "_country!=be",
"addExtraTags": [
@ -884,8 +895,8 @@
{
"if": "traffic_sign=BE:D7;BE:M13",
"then": {
"en": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M13.svg' style='height: 3em'>",
"nl": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M13.svg' style='height: 3em'>"
"en": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M13.svg' style='width: 3em'>",
"nl": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M13.svg' style='width: 3em'>"
},
"hideInAnswer": "_country!=be",
"addExtraTags": [
@ -895,8 +906,8 @@
{
"if": "traffic_sign=BE:D7;BE:M14",
"then": {
"en": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M14.svg' style='height: 3em'>",
"nl": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M14.svg' style='height: 3em'>"
"en": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M14.svg' style='width: 3em'>",
"nl": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M14.svg' style='width: 3em'>"
},
"hideInAnswer": "_country!=be",
"addExtraTags": [
@ -907,8 +918,8 @@
{
"if": "traffic_sign=BE:D7;BE:M7",
"then": {
"en": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M7.svg' style='height: 3em'>",
"nl": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M7.svg' style='height: 3em'>"
"en": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M7.svg' style='width: 3em'>",
"nl": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M7.svg' style='width: 3em'>"
},
"hideInAnswer": "_country!=be",
"addExtraTags": [
@ -918,8 +929,8 @@
{
"if": ":traffic_sign=BE:D7;BE:M15",
"then": {
"en": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M15.svg' style='height: 3em'>",
"nl": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M15.svg' style='height: 3em'>"
"en": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M15.svg' style='width: 3em'>",
"nl": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M15.svg' style='width: 3em'>"
},
"hideInAnswer": "_country!=be",
"addExtraTags": [
@ -929,8 +940,8 @@
{
"if": "traffic_sign=BE:D7;BE:M16",
"then": {
"en": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M16.svg' style='height: 3em'>",
"nl": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M16.svg' style='height: 3em'>"
"en": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M16.svg' style='width: 3em'>",
"nl": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M16.svg' style='width: 3em'>"
},
"hideInAnswer": "_country!=be",
"addExtraTags": [
@ -964,7 +975,11 @@
},
"freeform": {
"key": "cycleway:buffer",
"type": "pfloat"
"type": "length",
"helperArgs": [
"20",
"map"
]
}
},
{
@ -1151,7 +1166,7 @@
"calculatedTags": [
"_comfort_score=feat.score('https://raw.githubusercontent.com/pietervdvn/AspectedRouting/master/Examples/bicycle/aspects/bicycle.comfort.json')"
],
"minzoom": 14,
"minzoom": 16,
"wayHandling": 0,
"title": {
"render": {
@ -1286,13 +1301,31 @@
"if": "cyclestreet=",
"then": {
"en": "This is not a cyclestreet.",
"nl": "Dit is niet een fietstraat"
"nl": "Dit is geen fietsstraat"
},
"addExtraTags": [
"overtaking:motor_vehicle="
]
}
]
},
{
"render": {
"en": "The carriage width of this road is <strong>{width:carriageway}m</strong>",
"nl": "De breedte van deze rijbaan in deze straat is <strong>{width:carriageway}m</strong>"
},
"freeform": {
"key": "width:carriageway",
"type": "length",
"helperArgs": [
"20",
"map"
]
},
"question": {
"en": "What is the carriage width of this road (in meters)?<br/><span class='subtle'>This is measured from kerb to kerb, including parking lanes</span>",
"nl": "Hoe breed is de rijbaan in deze straat (in meters)?<br/><span class='subtle'>Gemeten van stoepsteen tot stoepsten, inclusief parkeerstroken</span>"
}
}
]
},
@ -1465,7 +1498,8 @@
{
"if": "cycle_barrier:type=squeeze",
"then": {
"en": "Squeeze gate, gap is smaller at top, than at the bottom <img src='./assets/themes/cycle_infra/Cycle_barrier_squeeze.png' style='width:8em'>"
"en": "Squeeze gate, gap is smaller at top, than at the bottom <img src='./assets/themes/cycle_infra/Cycle_barrier_squeeze.png' style='width:8em'>",
"nl": "Knijppoort, ruimte is smaller aan de top, dan aan de bodem <img src='./assets/themes/cycle_infra/Cycle_barrier_squeeze.png' style='width:8em'>"
}
}
]
@ -1487,15 +1521,21 @@
},
"freeform": {
"key": "maxwidth:physical",
"type": "pfloat"
"type": "length",
"helperArgs": [
"20",
"map"
]
}
},
{
"render": {
"en": "Space between barriers (along the length of the road): {width:seperation} m"
"en": "Space between barriers (along the length of the road): {width:seperation} m",
"nl": "Ruimte tussen barrières (langs de lengte van de weg): {width:seperation} m"
},
"question": {
"en": "How much space is there between the barriers (along the length of the road)?"
"en": "How much space is there between the barriers (along the length of the road)?",
"nl": "Hoeveel ruimte is er tussen de barrières (langs de lengte van de weg)?"
},
"condition": {
"or": [
@ -1505,15 +1545,21 @@
},
"freeform": {
"key": "width:seperation",
"type": "pfloat"
"type": "length",
"helperArgs": [
"20",
"map"
]
}
},
{
"render": {
"en": "Width of opening: {width:opening} m"
"en": "Width of opening: {width:opening} m",
"nl": "Breedte van de opening: {width:opening} m"
},
"question": {
"en": "How wide is the smallest opening next to the barriers?"
"en": "How wide is the smallest opening next to the barriers?",
"nl": "Hoe breed is de smalste opening naast de barrières?"
},
"condition": {
"or": [
@ -1531,7 +1577,8 @@
"en": "Overlap: {overlap} m"
},
"question": {
"en": "How much overlap do the barriers have?"
"en": "How much overlap do the barriers have?",
"nl": "Hoeveel overlappen de barrières?"
},
"condition": {
"or": [