From 78c60ad549a17883e1bbaadb9f3c2b664de7cf5f Mon Sep 17 00:00:00 2001 From: pietervdvn Date: Fri, 18 Feb 2022 04:22:09 +0100 Subject: [PATCH] Fix images in cycleways_and_roads.json --- .../cycleways_and_roads.json | 225 ++++++++++++------ langs/layers/de.json | 19 +- langs/layers/en.json | 52 +--- langs/layers/id.json | 10 +- langs/layers/nl.json | 40 ++-- 5 files changed, 187 insertions(+), 159 deletions(-) diff --git a/assets/layers/cycleways_and_roads/cycleways_and_roads.json b/assets/layers/cycleways_and_roads/cycleways_and_roads.json index 61093a5a4..66c16eb2f 100644 --- a/assets/layers/cycleways_and_roads/cycleways_and_roads.json +++ b/assets/layers/cycleways_and_roads/cycleways_and_roads.json @@ -805,50 +805,66 @@ { "if": "cycleway:traffic_sign=BE:D7", "then": { - "en": "Compulsory cycleway ", - "nl": "Verplicht fietspad ", - "de": "Vorgeschriebener Radweg ", - "id": "Jalur sepeda wajib " + "en": "Compulsory cycleway", + "nl": "Verplicht fietspad", + "de": "Vorgeschriebener Radweg", + "id": "Jalur sepeda wajib" }, - "hideInAnswer": "_country!=be" + "hideInAnswer": "_country!=be", + "icon": { + "path": "./assets/themes/cycle_infra/Belgian_road_sign_D07.svg", + "class": "medium" + } }, { "if": "cycleway:traffic_sign~BE:D7;.*", "then": { - "en": "Compulsory cycleway (with supplementary sign)
", - "nl": "Verplicht fietspad (met onderbord)
", - "de": "Vorgeschriebener Radweg (mit Zusatzschild)
", - "id": "Jalur sepeda wajib (dengan tanda tambahan)
" + "en": "Compulsory cycleway (with supplementary sign)
", + "nl": "Verplicht fietspad (met onderbord)
", + "de": "Vorgeschriebener Radweg (mit Zusatzschild)
", + "id": "Jalur sepeda wajib (dengan tanda tambahan)
" }, - "hideInAnswer": true + "hideInAnswer": true, + "icon": { + "path": "./assets/themes/cycle_infra/Belgian_road_sign_D07.svg", + "class": "medium" + } }, { "if": "cycleway:traffic_sign=BE:D9", "then": { - "en": "Segregated foot/cycleway ", - "nl": "Afgescheiden voet-/fietspad ", - "de": "Getrennter Fuß-/Radweg ", - "id": "Jalur pejalan kaki/sepeda terpisah " + "en": "Segregated foot/cycleway", + "nl": "Afgescheiden voet-/fietspad", + "de": "Getrennter Fuß-/Radweg", + "id": "Jalur pejalan kaki/sepeda terpisah" }, "hideInAnswer": "_country!=be", "addExtraTags": [ "cycleway:foot=designated", "cycleway:segregated=yes" - ] + ], + "icon": { + "path": "./assets/themes/cycle_infra/Belgian_road_sign_D09.svg", + "class": "medium" + } }, { "if": "cycleway:traffic_sign=BE:D10", "then": { - "en": "Unsegregated foot/cycleway ", - "nl": "Gedeeld voet-/fietspad ", - "de": "Gemeinsamer Fuß-/Radweg ", - "id": "Jalur pejalan kaki/sepeda tidak terpisah " + "en": "Unsegregated foot/cycleway", + "nl": "Gedeeld voet-/fietspad", + "de": "Gemeinsamer Fuß-/Radweg", + "id": "Jalur pejalan kaki/sepeda tidak terpisah" }, "hideInAnswer": "_country!=be", "addExtraTags": [ "cycleway:foot=designated", "cycleway:segregated=no" - ] + ], + "icon": { + "path": "./assets/themes/cycle_infra/Belgian_road_sign_D10.svg", + "class": "medium" + } }, { "if": "cycleway:traffic_sign=none", @@ -878,10 +894,10 @@ { "if": "traffic_sign=BE:D7", "then": { - "en": "Compulsory cycleway ", - "nl": "Verplicht fietspad ", - "de": "Vorgeschriebener Radweg ", - "id": "Jalur sepeda wajib " + "en": "Compulsory cycleway", + "nl": "Verplicht fietspad", + "de": "Vorgeschriebener Radweg", + "id": "Jalur sepeda wajib" }, "hideInAnswer": "_country!=be", "addExtraTags": [ @@ -889,23 +905,31 @@ "mofa=designated", "moped=yes", "speed_pedelec=yes" - ] + ], + "icon": { + "path": "./assets/themes/cycle_infra/Belgian_road_sign_D07.svg", + "class": "medium" + } }, { "if": "traffic_sign~BE:D7;.*", "then": { - "en": "Compulsory cycleway (with supplementary sign)
", - "nl": "Verplicht fietspad (met onderbord)
", - "de": "Vorgeschriebener Radweg (mit Zusatzschild)
" + "en": "Compulsory cycleway (with supplementary sign)
", + "nl": "Verplicht fietspad (met onderbord)
", + "de": "Vorgeschriebener Radweg (mit Zusatzschild)
" }, - "hideInAnswer": true + "hideInAnswer": true, + "icon": { + "path": "./assets/themes/cycle_infra/Belgian_road_sign_D07.svg", + "class": "medium" + } }, { "if": "traffic_sign=BE:D9", "then": { - "en": "Segregated foot/cycleway ", - "nl": "Afgescheiden voet-/fietspad ", - "de": "Getrennter Fuß-/Radweg " + "en": "Segregated foot/cycleway", + "nl": "Afgescheiden voet-/fietspad", + "de": "Getrennter Fuß-/Radweg" }, "hideInAnswer": "_country!=be", "addExtraTags": [ @@ -915,14 +939,18 @@ "moped=no", "speed_pedelec=no", "segregated=yes" - ] + ], + "icon": { + "path": "./assets/themes/cycle_infra/Belgian_road_sign_D09.svg", + "class": "medium" + } }, { "if": "traffic_sign=BE:D10", "then": { - "en": "Unsegregated foot/cycleway ", - "nl": "Gedeeld voet-/fietspad ", - "de": "Gemeinsamer Fuß-/Radweg " + "en": "Unsegregated foot/cycleway", + "nl": "Gedeeld voet-/fietspad", + "de": "Gemeinsamer Fuß-/Radweg" }, "hideInAnswer": "_country!=be", "addExtraTags": [ @@ -932,7 +960,11 @@ "moped=no", "speed_pedelec=no", "segregated=no" - ] + ], + "icon": { + "path": "./assets/themes/cycle_infra/Belgian_road_sign_D10.svg", + "class": "medium" + } }, { "if": "traffic_sign=none", @@ -961,70 +993,88 @@ { "if": "cycleway:traffic_sign=BE:D7;BE:M6", "then": { - "en": "", - "nl": "" + "nl": "Bromfiets Klass B verplicht" }, "hideInAnswer": "_country!=be", "addExtraTags": [ "cycleway:moped=designated" - ] + ], + "icon": { + "path": "./assets/themes/cycle_infra/Belgian_traffic_sign_M6.svg", + "class": "medium" + } }, { "if": "cycleway:traffic_sign=BE:D7;BE:M13", "then": { - "en": "", - "nl": "" + "nl": "Speedpedelec (Bromfiets klasse P) verplicht" }, "hideInAnswer": "_country!=be", "addExtraTags": [ "cycleway:speed_pedelec=designated" - ] + ], + "icon": { + "path": "./assets/themes/cycle_infra/Belgian_traffic_sign_M13.svg", + "class": "medium" + } }, { "if": "cycleway:traffic_sign=BE:D7;BE:M14", "then": { - "en": "", - "nl": "" + "nl": "Bromfiets klasse B en speedpedelec (Klasse P) verplicht" }, "hideInAnswer": "_country!=be", "addExtraTags": [ "cycleway:moped=designated", "cycleway:speed_pedelec=designated" - ] + ], + "icon": { + "path": "./assets/themes/cycle_infra/Belgian_traffic_sign_M14.svg", + "class": "medium" + } }, { "if": "cycleway:traffic_sign=BE:D7;BE:M7", "then": { - "en": "", - "nl": "" + "nl": "Bromfiets klasse B verboden" }, "hideInAnswer": "_country!=be", "addExtraTags": [ "cycleway:moped=no" - ] + ], + "icon": { + "path": "./assets/themes/cycle_infra/Belgian_traffic_sign_M7.svg", + "class": "medium" + } }, { "if": "cycleway:traffic_sign=BE:D7;BE:M15", "then": { - "en": "", - "nl": "" + "nl": "Speedpedelec (bromfiets klasse P) verboden" }, "hideInAnswer": "_country!=be", "addExtraTags": [ "cycleway:speed_pedelec=no" - ] + ], + "icon": { + "path": "./assets/themes/cycle_infra/Belgian_traffic_sign_M15.svg", + "class": "medium" + } }, { "if": "cycleway:traffic_sign=BE:D7;BE:M16", "then": { - "en": "", - "nl": "" + "nl": "Bromfiets klasse B en speedpedelec (klasse P) verboden" }, "hideInAnswer": "_country!=be", "addExtraTags": [ "cycleway:moped=designated", "cycleway:speed_pedelec=no" - ] + ], + "icon": { + "path": "./assets/themes/cycle_infra/Belgian_traffic_sign_M16.svg", + "class": "medium" + } }, { "if": "cycleway:traffic_sign:supplementary=none", @@ -1053,71 +1103,88 @@ { "if": "traffic_sign=BE:D7;BE:M6", "then": { - "en": "", - "nl": "" + "nl": "Bromfiets klasse B verplicht" }, "hideInAnswer": "_country!=be", "addExtraTags": [ "moped=designated" - ] + ], + "icon": { + "path": "./assets/themes/cycle_infra/Belgian_traffic_sign_M6.svg", + "class": "medium" + } }, { "if": "traffic_sign=BE:D7;BE:M13", "then": { - "en": "", - "nl": "", - "de": "" + "nl": "Speedpedelc (klasse P) verplicht" }, "hideInAnswer": "_country!=be", "addExtraTags": [ "speed_pedelec=designated" - ] + ], + "icon": { + "path": "./assets/themes/cycle_infra/Belgian_traffic_sign_M13.svg", + "class": "medium" + } }, { "if": "traffic_sign=BE:D7;BE:M14", "then": { - "en": "", - "nl": "" + "nl": "Bromfiets klasse B en speedpedelec (klasse P) verplicht" }, "hideInAnswer": "_country!=be", "addExtraTags": [ "moped=designated", "speed_pedelec=designated" - ] + ], + "icon": { + "path": "./assets/themes/cycle_infra/Belgian_traffic_sign_M14.svg", + "class": "medium" + } }, { "if": "traffic_sign=BE:D7;BE:M7", "then": { - "en": "", - "nl": "" + "nl": "Bromfiets klasse B verboden" }, "hideInAnswer": "_country!=be", "addExtraTags": [ "moped=no" - ] + ], + "icon": { + "path": "./assets/themes/cycle_infra/Belgian_traffic_sign_M7.svg", + "class": "medium" + } }, { - "if": ":traffic_sign=BE:D7;BE:M15", + "if": "cycleway:traffic_sign=BE:D7;BE:M15", "then": { - "en": "", - "nl": "" + "nl": "Speedpedelec (bromfiets klasse P) verboden" }, "hideInAnswer": "_country!=be", "addExtraTags": [ - "speed_pedelec=no" - ] + "cycleway:speed_pedelec=no" + ], + "icon": { + "path": "./assets/themes/cycle_infra/Belgian_traffic_sign_M15.svg", + "class": "medium" + } }, { - "if": "traffic_sign=BE:D7;BE:M16", + "if": "cycleway:traffic_sign=BE:D7;BE:M16", "then": { - "en": "", - "nl": "" + "nl": "Bromfiets klasse B en speedpedelec (klasse P) verboden" }, "hideInAnswer": "_country!=be", "addExtraTags": [ - "moped=designated", - "speed_pedelec=no" - ] + "cycleway:moped=designated", + "cycleway:speed_pedelec=no" + ], + "icon": { + "path": "./assets/themes/cycle_infra/Belgian_traffic_sign_M16.svg", + "class": "medium" + } }, { "if": "traffic_sign:supplementary=none", diff --git a/langs/layers/de.json b/langs/layers/de.json index 82174c489..701e086e3 100644 --- a/langs/layers/de.json +++ b/langs/layers/de.json @@ -1559,16 +1559,16 @@ "cycleway-lane-track-traffic-signs": { "mappings": { "0": { - "then": "Vorgeschriebener Radweg " + "then": "Vorgeschriebener Radweg" }, "1": { - "then": "Vorgeschriebener Radweg (mit Zusatzschild)
" + "then": "Vorgeschriebener Radweg (mit Zusatzschild)
" }, "2": { - "then": "Getrennter Fuß-/Radweg " + "then": "Getrennter Fuß-/Radweg" }, "3": { - "then": "Gemeinsamer Fuß-/Radweg " + "then": "Gemeinsamer Fuß-/Radweg" }, "4": { "then": "Kein Verkehrsschild vorhanden" @@ -1596,16 +1596,16 @@ "cycleway-traffic-signs": { "mappings": { "0": { - "then": "Vorgeschriebener Radweg " + "then": "Vorgeschriebener Radweg" }, "1": { - "then": "Vorgeschriebener Radweg (mit Zusatzschild)
" + "then": "Vorgeschriebener Radweg (mit Zusatzschild)
" }, "2": { - "then": "Getrennter Fuß-/Radweg " + "then": "Getrennter Fuß-/Radweg" }, "3": { - "then": "Gemeinsamer Fuß-/Radweg " + "then": "Gemeinsamer Fuß-/Radweg" }, "4": { "then": "Kein Verkehrsschild vorhanden" @@ -1615,9 +1615,6 @@ }, "cycleway-traffic-signs-D7-supplementary": { "mappings": { - "1": { - "then": "" - }, "6": { "then": "Kein zusätzliches Verkehrszeichen vorhanden" } diff --git a/langs/layers/en.json b/langs/layers/en.json index cabaf4b8c..40d20b5e3 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -2626,16 +2626,16 @@ "cycleway-lane-track-traffic-signs": { "mappings": { "0": { - "then": "Compulsory cycleway " + "then": "Compulsory cycleway" }, "1": { - "then": "Compulsory cycleway (with supplementary sign)
" + "then": "Compulsory cycleway (with supplementary sign)
" }, "2": { - "then": "Segregated foot/cycleway " + "then": "Segregated foot/cycleway" }, "3": { - "then": "Unsegregated foot/cycleway " + "then": "Unsegregated foot/cycleway" }, "4": { "then": "No traffic sign present" @@ -2663,16 +2663,16 @@ "cycleway-traffic-signs": { "mappings": { "0": { - "then": "Compulsory cycleway " + "then": "Compulsory cycleway" }, "1": { - "then": "Compulsory cycleway (with supplementary sign)
" + "then": "Compulsory cycleway (with supplementary sign)
" }, "2": { - "then": "Segregated foot/cycleway " + "then": "Segregated foot/cycleway" }, "3": { - "then": "Unsegregated foot/cycleway " + "then": "Unsegregated foot/cycleway" }, "4": { "then": "No traffic sign present" @@ -2682,24 +2682,6 @@ }, "cycleway-traffic-signs-D7-supplementary": { "mappings": { - "0": { - "then": "" - }, - "1": { - "then": "" - }, - "2": { - "then": "" - }, - "3": { - "then": "" - }, - "4": { - "then": "" - }, - "5": { - "then": "" - }, "6": { "then": "No supplementary traffic sign present" } @@ -2708,24 +2690,6 @@ }, "cycleway-traffic-signs-supplementary": { "mappings": { - "0": { - "then": "" - }, - "1": { - "then": "" - }, - "2": { - "then": "" - }, - "3": { - "then": "" - }, - "4": { - "then": "" - }, - "5": { - "then": "" - }, "6": { "then": "No supplementary traffic sign present" } diff --git a/langs/layers/id.json b/langs/layers/id.json index d697ec9b1..408033c98 100644 --- a/langs/layers/id.json +++ b/langs/layers/id.json @@ -228,16 +228,16 @@ "cycleway-lane-track-traffic-signs": { "mappings": { "0": { - "then": "Jalur sepeda wajib " + "then": "Jalur sepeda wajib" }, "1": { - "then": "Jalur sepeda wajib (dengan tanda tambahan)
" + "then": "Jalur sepeda wajib (dengan tanda tambahan)
" }, "2": { - "then": "Jalur pejalan kaki/sepeda terpisah " + "then": "Jalur pejalan kaki/sepeda terpisah" }, "3": { - "then": "Jalur pejalan kaki/sepeda tidak terpisah " + "then": "Jalur pejalan kaki/sepeda tidak terpisah" }, "4": { "then": "Tidak ada rambu lalu lintas" @@ -265,7 +265,7 @@ "cycleway-traffic-signs": { "mappings": { "0": { - "then": "Jalur sepeda wajib " + "then": "Jalur sepeda wajib" } } } diff --git a/langs/layers/nl.json b/langs/layers/nl.json index 2e501ef8a..3204cd289 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -2642,16 +2642,16 @@ "cycleway-lane-track-traffic-signs": { "mappings": { "0": { - "then": "Verplicht fietspad " + "then": "Verplicht fietspad" }, "1": { - "then": "Verplicht fietspad (met onderbord)
" + "then": "Verplicht fietspad (met onderbord)
" }, "2": { - "then": "Afgescheiden voet-/fietspad " + "then": "Afgescheiden voet-/fietspad" }, "3": { - "then": "Gedeeld voet-/fietspad " + "then": "Gedeeld voet-/fietspad" }, "4": { "then": "Geen verkeersbord aanwezig" @@ -2679,16 +2679,16 @@ "cycleway-traffic-signs": { "mappings": { "0": { - "then": "Verplicht fietspad " + "then": "Verplicht fietspad" }, "1": { - "then": "Verplicht fietspad (met onderbord)
" + "then": "Verplicht fietspad (met onderbord)
" }, "2": { - "then": "Afgescheiden voet-/fietspad " + "then": "Afgescheiden voet-/fietspad" }, "3": { - "then": "Gedeeld voet-/fietspad " + "then": "Gedeeld voet-/fietspad" }, "4": { "then": "Geen verkeersbord aanwezig" @@ -2699,22 +2699,22 @@ "cycleway-traffic-signs-D7-supplementary": { "mappings": { "0": { - "then": "" + "then": "Bromfiets klasse B verplicht" }, "1": { - "then": "" + "then": "Speedpedelc (klasse P) verplicht" }, "2": { - "then": "" + "then": "Bromfiets klasse B en speedpedelec (klasse P) verplicht" }, "3": { - "then": "" + "then": "Bromfiets klasse B verboden" }, "4": { - "then": "" + "then": "Speedpedelec (bromfiets klasse P) verboden" }, "5": { - "then": "" + "then": "Bromfiets klasse B en speedpedelec (klasse P) verboden" }, "6": { "then": "Geen onderbord aanwezig" @@ -2725,22 +2725,22 @@ "cycleway-traffic-signs-supplementary": { "mappings": { "0": { - "then": "" + "then": "Bromfiets Klass B verplicht" }, "1": { - "then": "" + "then": "Speedpedelec (Bromfiets klasse P) verplicht" }, "2": { - "then": "" + "then": "Bromfiets klasse B en speedpedelec (Klasse P) verplicht" }, "3": { - "then": "" + "then": "Bromfiets klasse B verboden" }, "4": { - "then": "" + "then": "Speedpedelec (bromfiets klasse P) verboden" }, "5": { - "then": "" + "then": "Bromfiets klasse B en speedpedelec (klasse P) verboden" }, "6": { "then": "Geen onderbord aanwezig"