diff --git a/assets/themes/cycle_infra/Belgian_road_sign_D07.svg b/assets/themes/cycle_infra/Belgian_road_sign_D07.svg
new file mode 100644
index 000000000..5a831ed93
--- /dev/null
+++ b/assets/themes/cycle_infra/Belgian_road_sign_D07.svg
@@ -0,0 +1,84 @@
+
+
+
+
diff --git a/assets/themes/cycle_infra/Belgian_road_sign_D09.svg b/assets/themes/cycle_infra/Belgian_road_sign_D09.svg
new file mode 100644
index 000000000..154a21600
--- /dev/null
+++ b/assets/themes/cycle_infra/Belgian_road_sign_D09.svg
@@ -0,0 +1,81 @@
+
+
+
+
diff --git a/assets/themes/cycle_infra/Belgian_road_sign_D10.svg b/assets/themes/cycle_infra/Belgian_road_sign_D10.svg
new file mode 100644
index 000000000..03549e286
--- /dev/null
+++ b/assets/themes/cycle_infra/Belgian_road_sign_D10.svg
@@ -0,0 +1,77 @@
+
+
+
+
diff --git a/assets/themes/cycle_infra/cycle_infra.json b/assets/themes/cycle_infra/cycle_infra.json
index 47982f44d..7ab682559 100644
--- a/assets/themes/cycle_infra/cycle_infra.json
+++ b/assets/themes/cycle_infra/cycle_infra.json
@@ -37,7 +37,9 @@
"osmTags": {
"or": [
"highway=cycleway",
- "cycleway=^(?!no).*",
+ "cycleway=lane",
+ "cycleway=shared_lane",
+ "cycleway=track",
"cyclestreet=yes",
{
"and": [
@@ -142,13 +144,6 @@
"nl": "Er is een apart getekend fietspad."
}
},
- {
- "if": "cyclestreet=yes",
- "then": {
- "nl": "Dit is een fietsstraat.",
- "en": "This is a cyclestreet."
- }
- },
{
"if": "cycleway=",
"then": {
@@ -200,6 +195,27 @@
}
]
},
+ {
+ "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.",
+ "nl": "Dit is een fietstraat"
+ }
+ }
+ ]
+ },
{
"render": {
"en": "The maximum speed on this road is {maxspeed} km/h",
@@ -277,42 +293,42 @@
{
"if": "cycleway:surface=wood",
"then": {
- "en": "This street is made of wood",
- "nl": "Deze weg is gemaakt van hout"
+ "en": "This cycleway is made of wood",
+ "nl": "Dit fietspad is gemaakt van hout"
}
},
{
"if": "cycleway:surface=concrete",
"then": {
- "en": "This street is made of concrete",
- "nl": "Deze straat is gemaakt van beton"
+ "en": "This cycleway is made of concrete",
+ "nl": "Dit fietspad is gemaakt van beton"
}
},
{
"if": "cycleway:surface=cobblestone",
"then": {
- "en": "This street is made of cobblestone",
- "nl": "Deze straat is gemaakt van kasseien"
+ "en": "This cycleway is made of cobblestone",
+ "nl": "Dit fietspad is gemaakt van kasseien"
}
},
{
"if": "cycleway:surface=asphalt",
"then": {
- "en": "This street is made of asphalt",
- "nl": "Deze straat is gemaakt van asfalt"
+ "en": "This cycleway is made of asphalt",
+ "nl": "Dit fietspad is gemaakt van asfalt"
}
},
{
"if": "cycleway:surface=paved",
"then": {
- "en": "This street is paved",
- "nl": "Deze straat is geplaveid"
+ "en": "This cycleway is paved",
+ "nl": "Dit fietspad is geplaveid"
}
}
],
"question": {
- "en": "What is the cycleway:surface of the street made from?",
- "nl": "Waaruit is het oppervlak van de straat gemaakt?"
+ "en": "What is the surface of the cycleway made from?",
+ "nl": "Waaruit is het oppervlak van het fietspad van gemaakt?"
}
},
{
@@ -392,7 +408,7 @@
"if": "surface=wood",
"then": {
"en": "This street is made of wood",
- "nl": "Deze weg is gemaakt van hout"
+ "nl": "Deze straat is gemaakt van hout"
}
},
{
@@ -512,6 +528,46 @@
"en": "What is the carriage width of this road (in meters)?",
"nl": "Hoe breed is de rijbaan in deze straat (in meters)?"
}
+ },
+ {
+ "question": {
+ "en": "What traffic sign does this cycleway have?",
+ "nl": "Welk verkeersbord heeft dit fietspad?"
+ },
+ "condition": {
+ "or": [
+ "cycleway=lane",
+ "cycleway=track"
+ ]
+ },
+ "mappings": [
+ {
+ "if": "cycleway:traffic_sign=BE:D7",
+ "then": {
+ "en": "Compulsory cycleway 
",
+ "nl": "Verplicht fietspad "
+ },
+ "hideInAnswer": "_country!=be"
+ },
+ {
+ "if": "cycleway:traffic_sign=BE:D9",
+ "then": {
+ "en": "Compulsory cycleway 
'",
+ "nl": "Verplicht fietspad '"
+ },
+ "hideInAnswer": "_country!=be",
+ "addExtraTags": ["segregated=yes"]
+ },
+ {
+ "if": "cycleway:traffic_sign=BE:D10",
+ "then": {
+ "en": "Compulsory cycleway 
'",
+ "nl": "Verplicht fietspad '"
+ },
+ "hideInAnswer": "_country!=be",
+ "addExtraTags": ["segregated=no"]
+ }
+ ]
}
],
"hideUnderlayingFeaturesMinPercentage": 0,
diff --git a/assets/themes/cycle_infra/license_info.json b/assets/themes/cycle_infra/license_info.json
index 9efa07456..9f7263bf5 100644
--- a/assets/themes/cycle_infra/license_info.json
+++ b/assets/themes/cycle_infra/license_info.json
@@ -1,4 +1,34 @@
[
+ {
+ "authors": [
+ "Belgische Wetgever"
+ ],
+ "path": "Belgian_road_sign_D07.svg",
+ "license": "CC0",
+ "sources": [
+ "https://commons.wikimedia.org/wiki/File:Belgian_road_sign_D07.svg"
+ ]
+ },
+ {
+ "authors": [
+ "Belgische Wetgever"
+ ],
+ "path": "Belgian_road_sign_D09.svg",
+ "license": "CC0",
+ "sources": [
+ "https://commons.wikimedia.org/wiki/File:Belgian_road_sign_D09.svg"
+ ]
+ },
+ {
+ "authors": [
+ "Belgische Wetgever"
+ ],
+ "path": "Belgian_road_sign_D10.svg",
+ "license": "CC0",
+ "sources": [
+ "https://commons.wikimedia.org/wiki/File:Belgian_road_sign_D10.svg"
+ ]
+ },
{
"authors": [
"Supaplex030"