diff --git a/assets/themes/cyclestreets/Finland_road_sign_E28.svg b/assets/themes/cyclestreets/Finland_road_sign_E28.svg new file mode 100644 index 0000000000..91f5fac5aa --- /dev/null +++ b/assets/themes/cyclestreets/Finland_road_sign_E28.svg @@ -0,0 +1,146 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + 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 0000000000..4e238cf0d2 --- /dev/null +++ b/assets/themes/cyclestreets/Finland_road_sign_E29.svg @@ -0,0 +1,145 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/themes/cyclestreets/Zeichen_244.svg b/assets/themes/cyclestreets/Zeichen_244.svg new file mode 100644 index 0000000000..8105b97956 --- /dev/null +++ b/assets/themes/cyclestreets/Zeichen_244.svg @@ -0,0 +1,38 @@ + +image/svg+xml \ No newline at end of file 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 0000000000..57ec525f06 --- /dev/null +++ b/assets/themes/cyclestreets/Zeichen_244_1020-30.svg @@ -0,0 +1,114 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 0000000000..bbefc6aff7 --- /dev/null +++ b/assets/themes/cyclestreets/Zeichen_244_1022-12.svg @@ -0,0 +1,126 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 0000000000..28ca690443 --- /dev/null +++ b/assets/themes/cyclestreets/Zeichen_244_1024-10.svg @@ -0,0 +1,118 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 0000000000..3da76302b1 --- /dev/null +++ b/assets/themes/cyclestreets/Zeichen_244_KFZ_frei.svg @@ -0,0 +1,162 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/themes/cyclestreets/Zeichen_244a.svg b/assets/themes/cyclestreets/Zeichen_244a.svg new file mode 100644 index 0000000000..fb9c9c4a89 --- /dev/null +++ b/assets/themes/cyclestreets/Zeichen_244a.svg @@ -0,0 +1,38 @@ + +image/svg+xml \ No newline at end of file diff --git a/assets/themes/cyclestreets/cyclestreets.json b/assets/themes/cyclestreets/cyclestreets.json index 1f0dedca8a..cadf363c3c 100644 --- a/assets/themes/cyclestreets/cyclestreets.json +++ b/assets/themes/cyclestreets/cyclestreets.json @@ -70,8 +70,9 @@ "minzoom": 7, "source": { "osmTags": { - "and": [ - "cyclestreet=yes" + "or": [ + "cyclestreet=yes", + "bicycle_road=yes" ] } }, @@ -93,9 +94,60 @@ ], "mapRendering": [ { - "icon": "./assets/themes/cyclestreets/F111.svg", + "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" + }, + { + "if": "_country=fi", + "then": "./assets/themes/cyclestreets/Finland_road_sign_E28.svg" + } + ] + }, + "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": [ - "point" + "projected_centerpoint" ] }, { @@ -134,7 +186,12 @@ }, "minzoom": 9, "source": { - "osmTags": "proposed:cyclestreet=yes" + "osmTags": { + "or": [ + "proposed:cyclestreet=yes", + "proposed:bicycle_road=yes" + ] + } }, "title": { "render": { @@ -173,9 +230,21 @@ ], "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": [ - "point" + "projected_centerpoint" ] }, { @@ -253,7 +322,7 @@ { "icon": "./assets/svg/pencil.svg", "location": [ - "point" + "projected_centerpoint" ] }, { @@ -262,11 +331,21 @@ "mappings": [ { "then": "#0000ff", - "if": "cyclestreet=yes" + "if": { + "or": [ + "cyclestreet=yes", + "bicycle_road=yes" + ] + } }, { "then": "#09f9dd", - "if": "proposed:cyclestreet=yes" + "if": { + "or": [ + "proposed:cyclestreet=yes", + "proposed:bicycle_road=yes" + ] + } } ] }, @@ -315,6 +394,29 @@ }, "hideInAnswer": "_country!=be" }, + { + "if": "bicycle_road=yes", + "then": { + "en": "This street is a bicycle road" + }, + "hideInAnswer": true + }, + { + "if": { + "and": [ + "bicycle_road=yes", + "proposed:bicycle_road=", + "maxspeed=30", + "source:maxspeed=DE:bicycle_road", + "vehicle=no", + "bicycle=designated" + ] + }, + "then": { + "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" + }, { "if": { "and": [ @@ -335,7 +437,12 @@ "ca": "Aquest carrer és una ciclocarrer", "da": "Denne gade er en cykelgade" }, - "hideInAnswer": "_country=be" + "hideInAnswer": { + "or": [ + "_country=be", + "_country=de" + ] + } }, { "if": { @@ -356,13 +463,28 @@ "fr": "Cette rue sera bientôt une rue cyclable", "ca": "Aquest carrer es convertirà en un ciclocarrer pròximament", "da": "Denne gade bliver snart en cykelgade" - } + }, + "hideInAnswer": "_country=de" + }, + { + "if": { + "and": [ + "bicycle_road=", + "proposed:bicycle_road=yes" + ] + }, + "then": { + "en": "This street will become a bicycle road soon" + }, + "hideInAnswer": "_country!=de" }, { "if": { "and": [ "cyclestreet=", "proposed:cyclestreet=", + "bicycle_road=", + "proposed:bicycle_road=", "overtaking:motor_vehicle=" ] }, @@ -381,6 +503,103 @@ } ] }, + { + "id": "supplementary_sign", + "condition": { + "and": [ + "bicycle_road=yes", + "_country=de" + ] + }, + "question": { + "en": "What sign does this bicycle road have?" + }, + "mappings": [ + { + "if": "traffic_sign=DE:244.1,1020-30", + "then": { + "en": "Residents allowed", + "de": "Anlieger frei" + }, + "icon": { + "path": "./assets/themes/cyclestreets/Zeichen_244_1020-30.svg", + "class": "large" + }, + "addExtraTags": [ + "vehicle=destination", + "motorcar=", + "motorcycle=", + "motor_vehicle=" + ] + }, + { + "if": "traffic_sign=DE:244.1,1022-12,1024-10", + "then": { + "en": "Motor vehicles allowed", + "de": "KFZ frei" + }, + "icon": { + "path": "./assets/themes/cyclestreets/Zeichen_244_KFZ_frei.svg", + "class": "large" + }, + "addExtraTags": [ + "motor_vehicle=yes", + "motorcar=", + "motorcycle=", + "vehicle=no" + ] + }, + { + "if": "traffic_sign=DE:244.1,1022-12", + "then": { + "en": "Motorcycles allowed", + "de": "Motorräder frei" + }, + "icon": { + "path": "./assets/themes/cyclestreets/Zeichen_244_1022-12.svg", + "class": "large" + }, + "addExtraTags": [ + "motorcycle=yes", + "motorcar=", + "motor_vehicle=", + "vehicle=no" + ] + }, + { + "if": "traffic_sign=DE:244.1,1024-10", + "then": { + "en": "Cars allowed" + }, + "icon": { + "path": "./assets/themes/cyclestreets/Zeichen_244_1024-10.svg", + "class": "large" + }, + "addExtraTags": [ + "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=" + ] + } + ] + }, { "id": "future_cyclestreet", "question": { @@ -415,4 +634,4 @@ } ] } -} \ No newline at end of file +} diff --git a/assets/themes/cyclestreets/license_info.json b/assets/themes/cyclestreets/license_info.json index 31e3198f5d..a4e2abcd7b 100644 --- a/assets/themes/cyclestreets/license_info.json +++ b/assets/themes/cyclestreets/license_info.json @@ -19,6 +19,90 @@ "https://commons.wikimedia.org/wiki/File:Belgian_road_sign_F113_nl.svg" ] }, + { + "path": "Finland_road_sign_E28.svg", + "license": "CC0", + "authors": [ + "Suomen tasavalta" + ], + "sources": [ + "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", + "authors": [ + "Bundesministerium für Verkehr, Bau- und Wohnungswesen" + ], + "sources": [ + "https://commons.wikimedia.org/wiki/File:Zeichen_244_-_Beginn_der_Fahrradstraße,_StVO_1997.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:Zeichen_244_-_Beginn_der_Fahrradstraße,_StVO_1997.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:Zeichen_244_-_Beginn_der_Fahrradstraße,_StVO_1997.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:Zeichen_244_-_Beginn_der_Fahrradstraße,_StVO_1997.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://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" + ] + }, { "path": "logo.svg", "license": "CC0", diff --git a/langs/themes/ca.json b/langs/themes/ca.json index 7a5ea1800d..496a74248c 100644 --- a/langs/themes/ca.json +++ b/langs/themes/ca.json @@ -276,10 +276,10 @@ "tagRenderings+": { "0": { "mappings": { - "1": { + "3": { "then": "Aquest carrer és una ciclocarrer" }, - "2": { + "4": { "then": "Aquest carrer es convertirà en un ciclocarrer pròximament" } } diff --git a/langs/themes/da.json b/langs/themes/da.json index 02464063b1..5e5764c1cb 100644 --- a/langs/themes/da.json +++ b/langs/themes/da.json @@ -368,19 +368,19 @@ "0": { "then": "Denne gade er en cykelgade (og har en hastighedsgrænse på 30 km/t)" }, - "1": { + "3": { "then": "Denne gade er en cykelgade" }, - "2": { + "4": { "then": "Denne gade bliver snart en cykelgade" }, - "3": { + "6": { "then": "Denne gade er ikke en cykelgade" } }, "question": "Er gaden {name} en cykelgade?" }, - "1": { + "2": { "question": "Hvornår bliver denne gade en cykelgade?", "render": "Denne gade bliver en cykelgade ved {cyclestreet:start_date}" } diff --git a/langs/themes/de.json b/langs/themes/de.json index 78fd732479..e04993f13a 100644 --- a/langs/themes/de.json +++ b/langs/themes/de.json @@ -414,19 +414,32 @@ "0": { "then": "Diese Straße ist eine Fahrradstraße (mit einer Geschwindigkeitsbegrenzung von 30 km/h)" }, - "1": { + "3": { "then": "Diese Straße ist eine Fahrradstraße" }, - "2": { + "4": { "then": "Diese Straße wird bald eine Fahrradstraße sein" }, - "3": { + "6": { "then": "Diese Straße ist keine Fahrradstraße" } }, "question": "Ist die Straße {name} eine Fahrradstraße?" }, "1": { + "mappings": { + "0": { + "then": "Anlieger frei" + }, + "1": { + "then": "KFZ frei" + }, + "2": { + "then": "Motorräder frei" + } + } + }, + "2": { "question": "Wann wird diese Straße eine Fahrradstraße?", "render": "Diese Straße wird am {cyclestreet:start_date} zu einer Fahrradstraße" } diff --git a/langs/themes/en.json b/langs/themes/en.json index 1c04fdaf30..6a122cb9f6 100644 --- a/langs/themes/en.json +++ b/langs/themes/en.json @@ -415,18 +415,47 @@ "then": "This street is a cyclestreet (and has a speed limit of 30 km/h)" }, "1": { - "then": "This street is a cyclestreet" + "then": "This street is a bicycle road" }, "2": { - "then": "This street will become a cyclstreet soon" + "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" + }, + "4": { + "then": "This street will become a cyclstreet soon" + }, + "5": { + "then": "This street will become a bicycle road soon" + }, + "6": { "then": "This street is not a cyclestreet" } }, "question": "Is the street {name} a cyclestreet?" }, "1": { + "mappings": { + "0": { + "then": "Residents allowed" + }, + "1": { + "then": "Motor vehicles allowed" + }, + "2": { + "then": "Motorcycles allowed" + }, + "3": { + "then": "Cars allowed" + }, + "4": { + "then": "There are no supplementary signs at this bicycle road." + } + }, + "question": "What sign does this bicycle road have?" + }, + "2": { "question": "When will this street become a cyclestreet?", "render": "This street will become a cyclestreet at {cyclestreet:start_date}" } diff --git a/langs/themes/es.json b/langs/themes/es.json index 9287b373e5..02423c3c57 100644 --- a/langs/themes/es.json +++ b/langs/themes/es.json @@ -316,19 +316,19 @@ "0": { "then": "Esta calle es una ciclocalle (y tiene un límite de velocidad de 30km/h)" }, - "1": { + "3": { "then": "Esta calle es una ciclocalle" }, - "2": { + "4": { "then": "Esta calle se convertirá en una ciclocalle próximamente" }, - "3": { + "6": { "then": "Esta calle no es una ciclocalle" } }, "question": "¿La calle {name} es una ciclocalle?" }, - "1": { + "2": { "question": "¿Cuándo se convertirá esta calle en una ciclocalle?", "render": "Esta calle se convetirá en una ciclocalle el {cyclestreet:start_date}" } diff --git a/langs/themes/fr.json b/langs/themes/fr.json index 2ef8f301e3..21cf94d371 100644 --- a/langs/themes/fr.json +++ b/langs/themes/fr.json @@ -414,19 +414,19 @@ "0": { "then": "Cette rue est une rue cyclable (et est limitée à 30 km/h)" }, - "1": { + "3": { "then": "Cette rue est une rue cyclable" }, - "2": { + "4": { "then": "Cette rue sera bientôt une rue cyclable" }, - "3": { + "6": { "then": "Cette rue n’est pas une rue cyclable" } }, "question": "La rue {name} est-elle une rue cyclable ?" }, - "1": { + "2": { "question": "Quand cette rue deviendra-t-elle cyclable ?", "render": "Cette rue deviendra une rue cyclable le {cyclestreet:start_date}" } diff --git a/langs/themes/hu.json b/langs/themes/hu.json index a4f0c96533..9b421ebd91 100644 --- a/langs/themes/hu.json +++ b/langs/themes/hu.json @@ -134,19 +134,19 @@ "0": { "then": "Ez az utca kerékpárosutca (és 30 km/h a sebességkorlátozás)" }, - "1": { + "3": { "then": "Ez az utca kerékpárosutca" }, - "2": { + "4": { "then": "Ez az utca hamarosan kerékpárosutcává válik" }, - "3": { + "6": { "then": "Ez az utca nem kerékpárosutca" } }, "question": "Kerékpárosutca-e {name}?" }, - "1": { + "2": { "question": "Mikor lesz ez az utca kerékpárosutca?", "render": "Ez az utca ekkor lesz kerékpárosutca: {cyclestreet:start_date}" } diff --git a/langs/themes/it.json b/langs/themes/it.json index 0e54f8aa4b..5d82c4028f 100644 --- a/langs/themes/it.json +++ b/langs/themes/it.json @@ -361,19 +361,19 @@ "0": { "then": "Questa è una strada ciclabile (e ha un limite di velocità massima di 30 km/h)" }, - "1": { + "3": { "then": "Questa è una strada ciclabile" }, - "2": { + "4": { "then": "Diverrà tra poco una strada ciclabile" }, - "3": { + "6": { "then": "Questa strada non è una strada ciclabile" } }, "question": "È {name} una strada ciclabile?" }, - "1": { + "2": { "question": "Questa strada diventerà una strada ciclabile quando?", "render": "Questa strada diventerà una strada ciclabile dal {cyclestreet:start_date}" } diff --git a/langs/themes/ja.json b/langs/themes/ja.json index fc80489e40..bfc3688cd2 100644 --- a/langs/themes/ja.json +++ b/langs/themes/ja.json @@ -291,18 +291,18 @@ "0": { "then": "cyclestreet(最高速度は30km/h)" }, - "1": { + "3": { "then": "この通りはcyclestreetだ" }, - "2": { + "4": { "then": "この通りはまもなくcyclstreetになるだろう" }, - "3": { + "6": { "then": "この通りはcyclestreetではない" } } }, - "1": { + "2": { "question": "この通りはいつcyclestreetになるんですか?", "render": "この通りは{cyclestreet:start_date}に、cyclestreetになります" } diff --git a/langs/themes/nb_NO.json b/langs/themes/nb_NO.json index df1fb71871..a3f3402a66 100644 --- a/langs/themes/nb_NO.json +++ b/langs/themes/nb_NO.json @@ -265,19 +265,19 @@ "0": { "then": "Denne gaten er en sykkelvei (og har en fartsgrense på 30 km/t)" }, - "1": { + "3": { "then": "Denne gaten er en sykkelvei" }, - "2": { + "4": { "then": "Denne gaten vil bli sykkelvei ganske snart" }, - "3": { + "6": { "then": "Denne gaten er ikke en sykkelvei" } }, "question": "Er {name}-gaten en sykkelgate?" }, - "1": { + "2": { "question": "Når vil denne gaten bli en sykkelgate?", "render": "Denne gaten vil bli en sykkelgate {cyclestreet:start_date}" } diff --git a/langs/themes/nl.json b/langs/themes/nl.json index 6b438f5a35..58c8374348 100644 --- a/langs/themes/nl.json +++ b/langs/themes/nl.json @@ -423,19 +423,19 @@ "0": { "then": "Deze straat is een fietsstraat (en dus zone 30)" }, - "1": { + "3": { "then": "Deze straat is een fietsstraat" }, - "2": { + "4": { "then": "Deze straat wordt binnenkort een fietsstraat" }, - "3": { + "6": { "then": "Deze straat is geen fietsstraat" } }, "question": "Is de straat {name} een fietsstraat?" }, - "1": { + "2": { "question": "Wanneer wordt deze straat een fietsstraat?", "render": "Deze straat wordt fietsstraat op {cyclestreet:start_date}" }