diff --git a/assets/themes/cyclestreets/Finland_road_sign_E29.svg b/assets/themes/cyclestreets/Finland_road_sign_E29.svg
new file mode 100644
index 000000000..4e238cf0d
--- /dev/null
+++ b/assets/themes/cyclestreets/Finland_road_sign_E29.svg
@@ -0,0 +1,145 @@
+
+
+
+
diff --git a/assets/themes/cyclestreets/Zeichen_244_1020-30.svg b/assets/themes/cyclestreets/Zeichen_244_1020-30.svg
new file mode 100644
index 000000000..57ec525f0
--- /dev/null
+++ b/assets/themes/cyclestreets/Zeichen_244_1020-30.svg
@@ -0,0 +1,114 @@
+
+
diff --git a/assets/themes/cyclestreets/Zeichen_244_1022-12.svg b/assets/themes/cyclestreets/Zeichen_244_1022-12.svg
new file mode 100644
index 000000000..bbefc6aff
--- /dev/null
+++ b/assets/themes/cyclestreets/Zeichen_244_1022-12.svg
@@ -0,0 +1,126 @@
+
+
diff --git a/assets/themes/cyclestreets/Zeichen_244_1024-10.svg b/assets/themes/cyclestreets/Zeichen_244_1024-10.svg
new file mode 100644
index 000000000..28ca69044
--- /dev/null
+++ b/assets/themes/cyclestreets/Zeichen_244_1024-10.svg
@@ -0,0 +1,118 @@
+
+
diff --git a/assets/themes/cyclestreets/Zeichen_244_KFZ_frei.svg b/assets/themes/cyclestreets/Zeichen_244_KFZ_frei.svg
new file mode 100644
index 000000000..3da76302b
--- /dev/null
+++ b/assets/themes/cyclestreets/Zeichen_244_KFZ_frei.svg
@@ -0,0 +1,162 @@
+
+
diff --git a/assets/themes/cyclestreets/Zeichen_244a.svg b/assets/themes/cyclestreets/Zeichen_244a.svg
new file mode 100644
index 000000000..fb9c9c4a8
--- /dev/null
+++ b/assets/themes/cyclestreets/Zeichen_244a.svg
@@ -0,0 +1,38 @@
+
+
\ No newline at end of file
diff --git a/assets/themes/cyclestreets/Zusatzzeichen_1020-30.svg b/assets/themes/cyclestreets/Zusatzzeichen_1020-30.svg
deleted file mode 100644
index 92f66ed3b..000000000
--- a/assets/themes/cyclestreets/Zusatzzeichen_1020-30.svg
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
\ No newline at end of file
diff --git a/assets/themes/cyclestreets/Zusatzzeichen_1022-12.svg b/assets/themes/cyclestreets/Zusatzzeichen_1022-12.svg
deleted file mode 100644
index 7d5f985fa..000000000
--- a/assets/themes/cyclestreets/Zusatzzeichen_1022-12.svg
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
\ No newline at end of file
diff --git a/assets/themes/cyclestreets/Zusatzzeichen_1024-10.svg b/assets/themes/cyclestreets/Zusatzzeichen_1024-10.svg
deleted file mode 100644
index 9d12fb149..000000000
--- a/assets/themes/cyclestreets/Zusatzzeichen_1024-10.svg
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
\ No newline at end of file
diff --git a/assets/themes/cyclestreets/Zusatzzeichen_KFZ_frei.svg b/assets/themes/cyclestreets/Zusatzzeichen_KFZ_frei.svg
deleted file mode 100644
index 01c4a9f6c..000000000
--- a/assets/themes/cyclestreets/Zusatzzeichen_KFZ_frei.svg
+++ /dev/null
@@ -1,133 +0,0 @@
-
-
-
-
diff --git a/assets/themes/cyclestreets/cyclestreets.json b/assets/themes/cyclestreets/cyclestreets.json
index f085add13..ee962b2fb 100644
--- a/assets/themes/cyclestreets/cyclestreets.json
+++ b/assets/themes/cyclestreets/cyclestreets.json
@@ -94,6 +94,22 @@
"icon": {
"render": "./assets/themes/cyclestreets/F111.svg",
"mappings": [
+ {
+ "if": "traffic_sign=DE:244.1,1020-30",
+ "then": "./assets/themes/cyclestreets/Zeichen_244_1020-30.svg"
+ },
+ {
+ "if": "traffic_sign=DE:244.1,1022-12,1024-10",
+ "then": "./assets/themes/cyclestreets/Zeichen_244_KFZ_frei.svg"
+ },
+ {
+ "if": "traffic_sign=DE:244.1,1022-12",
+ "then": "./assets/themes/cyclestreets/Zeichen_244_1022-12.svg"
+ },
+ {
+ "if": "traffic_sign=DE:244.1,1024-10",
+ "then": "./assets/themes/cyclestreets/Zeichen_244_1024-10.svg"
+ },
{
"if": "_country=de",
"then": "./assets/themes/cyclestreets/Zeichen_244.svg"
@@ -104,6 +120,29 @@
}
]
},
+ "iconSize": {
+ "render": "40,40,center",
+ "mappings": [
+ {
+ "if": {
+ "or": [
+ "traffic_sign=DE:244.1,1020-30",
+ "traffic_sign=DE:244.1,1022-12,1024-10"
+ ]
+ },
+ "then": "40,62,center"
+ },
+ {
+ "if": {
+ "or": [
+ "traffic_sign=DE:244.1,1022-12",
+ "traffic_sign=DE:244.1,1024-10"
+ ]
+ },
+ "then": "40,70,center"
+ }
+ ]
+ },
"location": [
"projected_centerpoint"
]
@@ -184,7 +223,19 @@
],
"mapRendering": [
{
- "icon": "./assets/themes/cyclestreets/F113.svg",
+ "icon": {
+ "render": "./assets/themes/cyclestreets/F113.svg",
+ "mappings": [
+ {
+ "if": "_country=de",
+ "then": "./assets/themes/cyclestreets/Zeichen_244a.svg"
+ },
+ {
+ "if": "_country=fi",
+ "then": "./assets/themes/cyclestreets/Finland_road_sign_E29.svg"
+ }
+ ]
+ },
"location": [
"projected_centerpoint"
]
@@ -346,12 +397,11 @@
"maxspeed=30",
"source:maxspeed=DE:bicycle_road",
"vehicle=no",
- "bicycle=designated",
- "traffic_sign=DE:244.1"
+ "bicycle=designated"
]
},
"then": {
- "en": "This street is a bicycle road (has a speed limit of 30 km/h and vehicles are not allowed) (supplementary signs will be asked later)"
+ "en": "This street is a bicycle road (has a speed limit of 30 km/h and vehicles are not allowed) (sign will be asked later)"
},
"hideInAnswer": "_country!=de"
},
@@ -447,7 +497,7 @@
]
},
"question": {
- "en": "What supplementary signs does this bicycle road have?"
+ "en": "What sign does this bicycle road have?"
},
"mappings": [
{
@@ -457,25 +507,31 @@
"de": "Anlieger frei"
},
"icon": {
- "path": "./assets/themes/cyclestreets/Zusatzzeichen_1020-30.svg",
- "class": "medium"
+ "path": "./assets/themes/cyclestreets/Zeichen_244_1020-30.svg",
+ "class": "large"
},
"addExtraTags": [
- "vehicle=destination"
+ "vehicle=destination",
+ "motorcar=",
+ "motorcycle=",
+ "motor_vehicle="
]
},
{
- "if": "traffic_sign=DE:244.1,1020-30,1024-10;1022-12",
+ "if": "traffic_sign=DE:244.1,1022-12,1024-10",
"then": {
"en": "Motor vehicles allowed",
"de": "KFZ frei"
},
"icon": {
- "path": "./assets/themes/cyclestreets/Zusatzzeichen_KFZ_frei.svg",
- "class": "medium"
+ "path": "./assets/themes/cyclestreets/Zeichen_244_KFZ_frei.svg",
+ "class": "large"
},
"addExtraTags": [
- "motor_vehicle=yes"
+ "motor_vehicle=yes",
+ "motorcar=",
+ "motorcycle=",
+ "vehicle="
]
},
{
@@ -485,11 +541,14 @@
"de": "Motorräder frei"
},
"icon": {
- "path": "./assets/themes/cyclestreets/Zusatzzeichen_1022-12.svg",
- "class": "medium"
+ "path": "./assets/themes/cyclestreets/Zeichen_244_1022-12.svg",
+ "class": "large"
},
"addExtraTags": [
- "motorcycle=yes"
+ "motorcycle=yes",
+ "motorcar=",
+ "motor_vehicle=",
+ "vehicle=no"
]
},
{
@@ -498,11 +557,30 @@
"en": "Cars allowed"
},
"icon": {
- "path": "./assets/themes/cyclestreets/Zusatzzeichen_1024-10.svg",
- "class": "medium"
+ "path": "./assets/themes/cyclestreets/Zeichen_244_1024-10.svg",
+ "class": "large"
},
"addExtraTags": [
- "motorcar=yes"
+ "motorcar=yes",
+ "motorcycle=",
+ "motor_vehicle=",
+ "vehicle=no"
+ ]
+ },
+ {
+ "if": "traffic_sign=DE:244.1",
+ "then": {
+ "en": "There are no supplementary signs at this bicycle road."
+ },
+ "icon": {
+ "path": "./assets/themes/cyclestreets/Zeichen_244.svg",
+ "class": "large"
+ },
+ "addExtraTags": [
+ "vehicle=no",
+ "motorcycle=",
+ "motorcar=",
+ "motor_vehicle="
]
}
]
diff --git a/assets/themes/cyclestreets/license_info.json b/assets/themes/cyclestreets/license_info.json
index 2a74b036a..a4e2abcd7 100644
--- a/assets/themes/cyclestreets/license_info.json
+++ b/assets/themes/cyclestreets/license_info.json
@@ -29,6 +29,16 @@
"https://commons.wikimedia.org/wiki/File:Finland_road_sign_E28.svg"
]
},
+ {
+ "path": "Finland_road_sign_E29.svg",
+ "license": "CC0",
+ "authors": [
+ "Suomen tasavalta"
+ ],
+ "sources": [
+ "https://commons.wikimedia.org/wiki/File:Finland_road_sign_E29.svg"
+ ]
+ },
{
"path": "Zeichen_244.svg",
"license": "CC0",
@@ -40,43 +50,57 @@
]
},
{
- "path": "Zusatzzeichen_1020-30.svg",
+ "path": "Zeichen_244_1020-30.svg",
"license": "CC0",
"authors": [
"Bundesministerium für Verkehr, Bau- und Wohnungswesen"
],
"sources": [
- "https://commons.wikimedia.org/wiki/File:Zusatzzeichen_1020-30_-_Anlieger_frei_(600x330),_StVO_1992.svg"
+ "https://commons.wikimedia.org/wiki/File:Zusatzzeichen_1020-30_-_Anlieger_frei_(600x330),_StVO_1992.svg",
+ "https://commons.wikimedia.org/wiki/File:Zeichen_244_-_Beginn_der_Fahrradstraße,_StVO_1997.svg"
]
},
{
- "path": "Zusatzzeichen_1022-12.svg",
+ "path": "Zeichen_244_1022-12.svg",
"license": "CC0",
"authors": [
"Bundesministerium für Verkehr, Bau- und Wohnungswesen"
],
"sources": [
- "https://commons.wikimedia.org/wiki/File:Zusatzzeichen_1022-12_-_Krafträder_auch_mit_Beiwagen,_Kleinkrafträder_und_Mofas_frei_(600x450),_StVO_1992.svg"
+ "https://commons.wikimedia.org/wiki/File:Zusatzzeichen_1022-12_-_Krafträder_auch_mit_Beiwagen,_Kleinkrafträder_und_Mofas_frei_(600x450),_StVO_1992.svg",
+ "https://commons.wikimedia.org/wiki/File:Zeichen_244_-_Beginn_der_Fahrradstraße,_StVO_1997.svg"
]
},
{
- "path": "Zusatzzeichen_1024-10.svg",
+ "path": "Zeichen_244_1024-10.svg",
"license": "CC0",
"authors": [
"Bundesministerium für Verkehr, Bau- und Wohnungswesen"
],
"sources": [
- "https://commons.wikimedia.org/wiki/File:Zusatzzeichen_1024-10_-_Personenkraftwagen_frei,_StVO_1992.svg"
+ "https://commons.wikimedia.org/wiki/File:Zusatzzeichen_1024-10_-_Personenkraftwagen_frei,_StVO_1992.svg",
+ "https://commons.wikimedia.org/wiki/File:Zeichen_244_-_Beginn_der_Fahrradstraße,_StVO_1997.svg"
]
},
{
- "path": "Zusatzzeichen_KFZ_frei.svg",
+ "path": "Zeichen_244_KFZ_frei.svg",
"license": "CC0",
"authors": [
"Bundesministerium für Verkehr, Bau- und Wohnungswesen"
],
"sources": [
- "https://wiki.openstreetmap.org/wiki/File:Zusatzzeichen_KFZ_frei.svg"
+ "https://wiki.openstreetmap.org/wiki/File:Zusatzzeichen_KFZ_frei.svg",
+ "https://commons.wikimedia.org/wiki/File:Zeichen_244_-_Beginn_der_Fahrradstraße,_StVO_1997.svg"
+ ]
+ },
+ {
+ "path": "Zeichen_244a.svg",
+ "license": "CC0",
+ "authors": [
+ "Bundesministerium für Verkehr, Bau- und Wohnungswesen"
+ ],
+ "sources": [
+ "https://commons.wikimedia.org/wiki/File:Zeichen_244a_-_Ende_der_Fahrradstraße,_StVO_1997.svg"
]
},
{
diff --git a/langs/themes/en.json b/langs/themes/en.json
index 2ce045362..5dd8288d0 100644
--- a/langs/themes/en.json
+++ b/langs/themes/en.json
@@ -418,7 +418,7 @@
"then": "This street is a bicycle road"
},
"2": {
- "then": "This street is a bicycle road (has a speed limit of 30 km/h and vehicles are not allowed) (supplementary signs will be asked later)"
+ "then": "This street is a bicycle road (has a speed limit of 30 km/h and vehicles are not allowed) (sign will be asked later)"
},
"3": {
"then": "This street is a cyclestreet"
@@ -448,9 +448,12 @@
},
"3": {
"then": "Cars allowed"
+ },
+ "4": {
+ "then": "There are no supplementary signs at this bicycle road."
}
},
- "question": "What supplementary signs does this bicycle road have?"
+ "question": "What sign does this bicycle road have?"
},
"2": {
"question": "When will this street become a cyclestreet?",