diff --git a/assets/themes/cycle_infra/cycle_infra.json b/assets/themes/cycle_infra/cycle_infra.json
index 8ffd1d8ab..f5460ae6d 100644
--- a/assets/themes/cycle_infra/cycle_infra.json
+++ b/assets/themes/cycle_infra/cycle_infra.json
@@ -102,10 +102,6 @@
"description": {},
"tagRenderings": [
{
- "freeform": {
- "key": "cycleway",
- "addExtraTags": []
- },
"question": {
"en": "What kind of cycleway is there?",
"nl": "Wat voor fietspad is hier?"
@@ -146,18 +142,26 @@
}
},
{
- "if": "cycleway=",
+ "if": "cycleway=no",
"then": {
"en": "There is no cycleway",
- "nl": "Er is geen fietspad"
+ "nl": "Er is geen fietspad aanwezig"
},
- "hideInAnswer": true
+ "hideInAnswer": "cycleway=opposite"
+ },
+ {
+ "if": "cycleway=no",
+ "then": {
+ "en": "There is no cycleway",
+ "nl": "Er is geen fietspad aanwezig"
+ },
+ "hideInAnswer": "cycleway!=opposite",
+ "addExtraTags": [
+ "oneway:bicycle=no",
+ "fixme=Changed from cycleway=opposite"
+ ]
}
- ],
- "render": {
- "en": "Unknown cycleway situation",
- "nl": "Onbekende fietspad situatie"
- }
+ ]
},
{
"question": {
@@ -211,9 +215,32 @@
{
"if": "cyclestreet=yes",
"then": {
- "en": "This is a cyclestreet.",
+ "en": "This is a cyclestreet, and a 30km/h zone.",
+ "nl": "Dit is een fietstraat, en dus een 30km/h zone"
+ },
+ "addExtraTags": [
+ "overtaking:motor_vehicle=no",
+ "maxspeed=30"
+ ],
+ "hideInAnswer": "_country!=be"
+ },
+ {
+ "if": "cyclestreet=yes",
+ "then": {
+ "en": "This is a cyclestreet",
"nl": "Dit is een fietstraat"
- }
+ },
+ "hideInAnswer": "_country=be"
+ },
+ {
+ "if": "cyclestreet=",
+ "then": {
+ "en": "This is not a cyclestreet.",
+ "nl": "Dit is niet een fietstraat"
+ },
+ "addExtraTags": [
+ "overtaking:motor_vehicle="
+ ]
}
]
},
@@ -224,7 +251,7 @@
},
"freeform": {
"key": "maxspeed",
- "addExtraTags": []
+ "type": "nat"
},
"condition": {
"or": [
@@ -553,8 +580,8 @@
{
"if": "cycleway:traffic_sign=BE:D9",
"then": {
- "en": "Compulsory cycleway 
'",
- "nl": "Verplicht fietspad '"
+ "en": "Segregated foot/cycleway ",
+ "nl": "Afgescheiden voet-/fietspad "
},
"hideInAnswer": "_country!=be",
"addExtraTags": [
@@ -564,13 +591,71 @@
{
"if": "cycleway:traffic_sign=BE:D10",
"then": {
- "en": "Compulsory cycleway 
'",
- "nl": "Verplicht fietspad '"
+ "en": "Unsegregated foot/cycleway ",
+ "nl": "Gedeeld voet-/fietspad "
},
"hideInAnswer": "_country!=be",
"addExtraTags": [
"segregated=no"
]
+ },
+ {
+ "if": "cycleway:traffic_sign=none",
+ "then": {
+ "en": "No traffic sign present",
+ "nl": "Geen verkeersbord aanwezig"
+ }
+ }
+ ]
+ },
+ {
+ "question": {
+ "en": "What traffic sign does this cycleway have?",
+ "nl": "Welk verkeersbord heeft dit fietspad?"
+ },
+ "condition": {
+ "or": [
+ "highway=cycleway",
+ "highway=path"
+ ]
+ },
+ "mappings": [
+ {
+ "if": "traffic_sign=BE:D7",
+ "then": {
+ "en": "Compulsory cycleway 
",
+ "nl": "Verplicht fietspad "
+ },
+ "hideInAnswer": "_country!=be"
+ },
+ {
+ "if": "traffic_sign=BE:D9",
+ "then": {
+ "en": "Segregated foot/cycleway ",
+ "nl": "Afgescheiden voet-/fietspad "
+ },
+ "hideInAnswer": "_country!=be",
+ "addExtraTags": [
+ "segregated=yes"
+ ]
+ },
+ {
+ "if": "traffic_sign=BE:D10",
+ "then": {
+ "en": "Unsegregated foot/cycleway ",
+ "nl": "Gedeeld voet-/fietspad "
+ },
+ "hideInAnswer": "_country!=be",
+ "addExtraTags": [
+ "segregated=no"
+ ]
+ },
+ {
+ "if": "cycleway:traffic_sign=none",
+ "then": {
+ "en": "No traffic sign present",
+ "nl": "Geen verkeersbord aanwezig"
+ }
}
]
},
@@ -586,15 +671,97 @@
"condition": {
"or": [
"cycleway=track",
- "cycleway=lane",
- "highway=cycleway",
- "highway=path"
+ "cycleway=lane"
]
},
"freeform": {
"key": "cycleway:buffer",
"type": "pfloat"
}
+ },
+ {
+ "question": {
+ "en": "How is this cycleway seperated from the road?",
+ "nl": "Hoe is dit fietspad gescheiden van de weg?"
+ },
+ "condition": {
+ "or": [
+ "cycleway=track",
+ "cycleway=lane"
+ ]
+ },
+ "mappings": [
+ {
+ "if": "cycleway:seperation=dashed_line",
+ "then": {
+ "en": "This cycleway is seperated by a dashed line",
+ "nl": "Dit fietspad is gescheiden van de weg met een onderbroken streep"
+ }
+ },
+ {
+ "if": "cycleway:seperation=solid_line",
+ "then": {
+ "en": "This cycleway is seperated by a solid line",
+ "nl": "Dit fietspad is gescheiden van de weg met een doorgetrokken streep"
+ }
+ },
+ {
+ "if": "cycleway:seperation=parking_lane",
+ "then": {
+ "en": "This cycleway is seperated by a parking lane",
+ "nl": "Dit fietspad is gescheiden van de weg met parkeervakken"
+ }
+ },
+ {
+ "if": "cycleway:seperation=kerb",
+ "then": {
+ "en": "This cycleway is seperated by a kerb",
+ "nl": "Dit fietspad is gescheiden van de weg met een stoeprand"
+ }
+ }
+ ]
+ },
+ {
+ "question": {
+ "en": "How is this cycleway seperated from the road?",
+ "nl": "Hoe is dit fietspad gescheiden van de weg?"
+ },
+ "condition": {
+ "or": [
+ "highway=cycleway",
+ "highway=path"
+ ]
+ },
+ "mappings": [
+ {
+ "if": "seperation=dashed_line",
+ "then": {
+ "en": "This cycleway is seperated by a dashed line",
+ "nl": "Dit fietspad is gescheiden van de weg met een onderbroken streep"
+ }
+ },
+ {
+ "if": "seperation=solid_line",
+ "then": {
+ "en": "This cycleway is seperated by a solid line",
+ "nl": "Dit fietspad is gescheiden van de weg met een doorgetrokken streep"
+ }
+ },
+ {
+ "if": "seperation=parking_lane",
+ "then": {
+ "en": "This cycleway is seperated by a parking lane",
+ "nl": "Dit fietspad is gescheiden van de weg met parkeervakken"
+ }
+ },
+ {
+ "if": "seperation=kerb",
+ "then": {
+ "en": "This cycleway is seperated by a kerb",
+ "nl": "Dit fietspad is gescheiden van de weg met een stoeprand"
+ }
+ }
+ ]
}
],
"hideUnderlayingFeaturesMinPercentage": 0,
@@ -761,26 +928,83 @@
"nl": "Er is een apart getekend fietspad."
}
},
- {
- "if": "cyclestreet=yes",
- "then": {
- "nl": "Dit is een fietsstraat.",
- "en": "This is a cyclestreet."
- }
- },
{
"if": "cycleway=",
"then": {
- "en": "There is no cycleway",
- "nl": "Er is geen fietspad"
+ "en": "There is no cycleway known here",
+ "nl": "Er is geen fietspad bekend hier"
},
"hideInAnswer": true
+ },
+ {
+ "if": "cycleway=no",
+ "then": {
+ "en": "There is no cycleway",
+ "nl": "Er is geen fietspad aanwezig"
+ },
+ "hideInAnswer": "cycleway=opposite"
+ },
+ {
+ "if": "cycleway=no",
+ "then": {
+ "en": "There is no cycleway",
+ "nl": "Er is geen fietspad aanwezig"
+ },
+ "hideInAnswer": "cycleway!=opposite",
+ "addExtraTags": [
+ "oneway:bicycle=no",
+ "fixme=Changed from cycleway=opposite"
+ ]
}
],
"render": {
"en": "Unknown cycleway situation",
"nl": "Onbekende fietspad situatie"
}
+ },
+ {
+ "question": {
+ "en": "Is this a cyclestreet?",
+ "nl": "Is dit een fietsstraat?"
+ },
+ "condition": {
+ "and": [
+ "highway!=cycleway",
+ "highway!=path"
+ ]
+ },
+ "mappings": [
+ {
+ "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"
+ },
+ "addExtraTags": [
+ "overtaking:motor_vehicle=no",
+ "maxspeed=30"
+ ],
+ "hideInAnswer": "_country!=be"
+ },
+ {
+ "if": "cyclestreet=yes",
+ "then": {
+ "en": "This is a cyclestreet",
+ "nl": "Dit is een fietstraat"
+ },
+ "hideInAnswer": "_country=be"
+ },
+ {
+ "if": "cyclestreet=",
+ "then": {
+ "en": "This is not a cyclestreet.",
+ "nl": "Dit is niet een fietstraat"
+ },
+ "addExtraTags": [
+ "overtaking:motor_vehicle="
+ ]
+ }
+ ]
}
]
},
diff --git a/langs/themes/en.json b/langs/themes/en.json
index 1af2f922d..f79d09b71 100644
--- a/langs/themes/en.json
+++ b/langs/themes/en.json
@@ -737,9 +737,11 @@
},
"4": {
"then": "There is no cycleway"
+ },
+ "5": {
+ "then": "There is no cycleway"
}
- },
- "render": "Unknown cycleway situation"
+ }
},
"1": {
"question": "Is this street lit?",
@@ -762,7 +764,13 @@
"question": "Is this a cyclestreet?",
"mappings": {
"0": {
- "then": "This is a cyclestreet."
+ "then": "This is a cyclestreet, and a 30km/h zone."
+ },
+ "1": {
+ "then": "This is a cyclestreet"
+ },
+ "2": {
+ "then": "This is not a cyclestreet."
}
}
},
@@ -898,10 +906,68 @@
"then": "Compulsory cycleway "
},
"1": {
- "then": "Compulsory cycleway '"
+ "then": "Segregated foot/cycleway "
},
"2": {
- "then": "Compulsory cycleway '"
+ "then": "Unsegregated foot/cycleway "
+ },
+ "3": {
+ "then": "No traffic sign present"
+ }
+ }
+ },
+ "10": {
+ "question": "What traffic sign does this cycleway have?",
+ "mappings": {
+ "0": {
+ "then": "Compulsory cycleway "
+ },
+ "1": {
+ "then": "Segregated foot/cycleway "
+ },
+ "2": {
+ "then": "Unsegregated foot/cycleway "
+ },
+ "3": {
+ "then": "No traffic sign present"
+ }
+ }
+ },
+ "11": {
+ "render": "The buffer besides this cycleway is {cycleway:buffer} m",
+ "question": "How wide is the gap between the cycleway and the road?"
+ },
+ "12": {
+ "question": "How is this cycleway seperated from the road?",
+ "mappings": {
+ "0": {
+ "then": "This cycleway is seperated by a dashed line"
+ },
+ "1": {
+ "then": "This cycleway is seperated by a solid line"
+ },
+ "2": {
+ "then": "This cycleway is seperated by a parking lane"
+ },
+ "3": {
+ "then": "This cycleway is seperated by a kerb"
+ }
+ }
+ },
+ "13": {
+ "question": "How is this cycleway seperated from the road?",
+ "mappings": {
+ "0": {
+ "then": "This cycleway is seperated by a dashed line"
+ },
+ "1": {
+ "then": "This cycleway is seperated by a solid line"
+ },
+ "2": {
+ "then": "This cycleway is seperated by a parking lane"
+ },
+ "3": {
+ "then": "This cycleway is seperated by a kerb"
}
}
},
@@ -934,13 +1000,30 @@
"then": "There is a seperately drawn cycleway"
},
"4": {
- "then": "This is a cyclestreet."
+ "then": "There is no cycleway known here"
},
"5": {
"then": "There is no cycleway"
+ },
+ "6": {
+ "then": "There is no cycleway"
}
},
"render": "Unknown cycleway situation"
+ },
+ "1": {
+ "question": "Is this a cyclestreet?",
+ "mappings": {
+ "0": {
+ "then": "This is a cyclestreet, and a 30km/h zone."
+ },
+ "1": {
+ "then": "This is a cyclestreet"
+ },
+ "2": {
+ "then": "This is not a cyclestreet."
+ }
+ }
}
}
},
diff --git a/langs/themes/nl.json b/langs/themes/nl.json
index 8b7da8e58..4c1bd879b 100644
--- a/langs/themes/nl.json
+++ b/langs/themes/nl.json
@@ -592,10 +592,12 @@
"then": "Er is een apart getekend fietspad."
},
"4": {
- "then": "Er is geen fietspad"
+ "then": "Er is geen fietspad aanwezig"
+ },
+ "5": {
+ "then": "Er is geen fietspad aanwezig"
}
- },
- "render": "Onbekende fietspad situatie"
+ }
},
"1": {
"question": "Is deze weg verlicht?",
@@ -618,7 +620,13 @@
"question": "Is dit een fietsstraat?",
"mappings": {
"0": {
+ "then": "Dit is een fietstraat, en dus een 30km/h zone"
+ },
+ "1": {
"then": "Dit is een fietstraat"
+ },
+ "2": {
+ "then": "Dit is niet een fietstraat"
}
}
},
@@ -702,10 +710,68 @@
"then": "Verplicht fietspad "
},
"1": {
- "then": "Verplicht fietspad '"
+ "then": "Afgescheiden voet-/fietspad "
},
"2": {
- "then": "Verplicht fietspad '"
+ "then": "Gedeeld voet-/fietspad "
+ },
+ "3": {
+ "then": "Geen verkeersbord aanwezig"
+ }
+ }
+ },
+ "10": {
+ "question": "Welk verkeersbord heeft dit fietspad?",
+ "mappings": {
+ "0": {
+ "then": "Verplicht fietspad "
+ },
+ "1": {
+ "then": "Afgescheiden voet-/fietspad "
+ },
+ "2": {
+ "then": "Gedeeld voet-/fietspad "
+ },
+ "3": {
+ "then": "Geen verkeersbord aanwezig"
+ }
+ }
+ },
+ "11": {
+ "render": "De schrikafstand van dit fietspad is {cycleway:buffer} m",
+ "question": "Hoe breed is de ruimte tussen het fietspad en de weg?"
+ },
+ "12": {
+ "question": "Hoe is dit fietspad gescheiden van de weg?",
+ "mappings": {
+ "0": {
+ "then": "Dit fietspad is gescheiden van de weg met een onderbroken streep"
+ },
+ "1": {
+ "then": "Dit fietspad is gescheiden van de weg met een doorgetrokken streep"
+ },
+ "2": {
+ "then": "Dit fietspad is gescheiden van de weg met parkeervakken"
+ },
+ "3": {
+ "then": "Dit fietspad is gescheiden van de weg met een stoeprand"
+ }
+ }
+ },
+ "13": {
+ "question": "Hoe is dit fietspad gescheiden van de weg?",
+ "mappings": {
+ "0": {
+ "then": "Dit fietspad is gescheiden van de weg met een onderbroken streep"
+ },
+ "1": {
+ "then": "Dit fietspad is gescheiden van de weg met een doorgetrokken streep"
+ },
+ "2": {
+ "then": "Dit fietspad is gescheiden van de weg met parkeervakken"
+ },
+ "3": {
+ "then": "Dit fietspad is gescheiden van de weg met een stoeprand"
}
}
},
@@ -738,13 +804,30 @@
"then": "Er is een apart getekend fietspad."
},
"4": {
- "then": "Dit is een fietsstraat."
+ "then": "Er is geen fietspad bekend hier"
},
"5": {
- "then": "Er is geen fietspad"
+ "then": "Er is geen fietspad aanwezig"
+ },
+ "6": {
+ "then": "Er is geen fietspad aanwezig"
}
},
"render": "Onbekende fietspad situatie"
+ },
+ "1": {
+ "question": "Is dit een fietsstraat?",
+ "mappings": {
+ "0": {
+ "then": "Dit is een fietstraat, en dus een 30km/h zone"
+ },
+ "1": {
+ "then": "Dit is een fietstraat"
+ },
+ "2": {
+ "then": "Dit is niet een fietstraat"
+ }
+ }
}
}
},