From 4ab3d5645252397cd53ce41bba57b988a506457b Mon Sep 17 00:00:00 2001 From: pietervdvn Date: Fri, 18 Feb 2022 04:29:41 +0100 Subject: [PATCH] Remove duplicate question, fix english translations --- .../cycleways_and_roads.json | 122 ++---------------- langs/layers/de.json | 8 -- langs/layers/en.json | 26 ++-- langs/layers/nl.json | 32 +---- 4 files changed, 30 insertions(+), 158 deletions(-) diff --git a/assets/layers/cycleways_and_roads/cycleways_and_roads.json b/assets/layers/cycleways_and_roads/cycleways_and_roads.json index 66c16eb2ff..a0b7327c11 100644 --- a/assets/layers/cycleways_and_roads/cycleways_and_roads.json +++ b/assets/layers/cycleways_and_roads/cycleways_and_roads.json @@ -993,7 +993,8 @@ { "if": "cycleway:traffic_sign=BE:D7;BE:M6", "then": { - "nl": "Bromfiets Klass B verplicht" + "en": "Mopeds must use the cycleway", + "nl": "Bromfiets Klass B verplicht op het fietspad" }, "hideInAnswer": "_country!=be", "addExtraTags": [ @@ -1007,7 +1008,8 @@ { "if": "cycleway:traffic_sign=BE:D7;BE:M13", "then": { - "nl": "Speedpedelec (Bromfiets klasse P) verplicht" + "en": "Speedpedelecs must use the cycleway", + "nl": "Speedpedelec (Bromfiets klasse P) verplicht op het fietspad" }, "hideInAnswer": "_country!=be", "addExtraTags": [ @@ -1021,7 +1023,8 @@ { "if": "cycleway:traffic_sign=BE:D7;BE:M14", "then": { - "nl": "Bromfiets klasse B en speedpedelec (Klasse P) verplicht" + "en": "Mopeds and speedpedelecs must use the cycleway", + "nl": "Bromfiets klasse B en speedpedelec (Klasse P) verplicht op het fietspad" }, "hideInAnswer": "_country!=be", "addExtraTags": [ @@ -1036,6 +1039,7 @@ { "if": "cycleway:traffic_sign=BE:D7;BE:M7", "then": { + "en": "Mopeds are not allowed", "nl": "Bromfiets klasse B verboden" }, "hideInAnswer": "_country!=be", @@ -1050,6 +1054,7 @@ { "if": "cycleway:traffic_sign=BE:D7;BE:M15", "then": { + "en": "Speedpedelecs are not allowed", "nl": "Speedpedelec (bromfiets klasse P) verboden" }, "hideInAnswer": "_country!=be", @@ -1064,6 +1069,7 @@ { "if": "cycleway:traffic_sign=BE:D7;BE:M16", "then": { + "en": "Mopeds and speedpedelecs are not allowed", "nl": "Bromfiets klasse B en speedpedelec (klasse P) verboden" }, "hideInAnswer": "_country!=be", @@ -1086,116 +1092,6 @@ } ] }, - { - "id": "cycleway-traffic-signs-D7-supplementary", - "question": { - "en": "Does the traffic sign D7 () have a supplementary sign?", - "nl": "Heeft het verkeersbord D7 () een onderbord?", - "de": "Hat das Verkehrszeichen D7 () ein Zusatzzeichen?" - }, - "condition": { - "or": [ - "traffic_sign=BE:D7", - "traffic_sign~BE:D7;.*" - ] - }, - "mappings": [ - { - "if": "traffic_sign=BE:D7;BE:M6", - "then": { - "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": { - "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": { - "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": { - "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": "cycleway:traffic_sign=BE:D7;BE:M15", - "then": { - "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": { - "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": "traffic_sign:supplementary=none", - "then": { - "en": "No supplementary traffic sign present", - "nl": "Geen onderbord aanwezig", - "de": "Kein zusätzliches Verkehrszeichen vorhanden" - } - } - ] - }, { "render": { "en": "The buffer besides this cycleway is {cycleway:buffer} m", diff --git a/langs/layers/de.json b/langs/layers/de.json index 701e086e3d..3a27f2dd97 100644 --- a/langs/layers/de.json +++ b/langs/layers/de.json @@ -1613,14 +1613,6 @@ }, "question": "Welches Verkehrszeichen hat dieser Radweg?" }, - "cycleway-traffic-signs-D7-supplementary": { - "mappings": { - "6": { - "then": "Kein zusätzliches Verkehrszeichen vorhanden" - } - }, - "question": "Hat das Verkehrszeichen D7 () ein Zusatzzeichen?" - }, "cycleway-traffic-signs-supplementary": { "mappings": { "6": { diff --git a/langs/layers/en.json b/langs/layers/en.json index 40d20b5e36..b4d6b78b5f 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -2680,16 +2680,26 @@ }, "question": "What traffic sign does this cycleway have?" }, - "cycleway-traffic-signs-D7-supplementary": { - "mappings": { - "6": { - "then": "No supplementary traffic sign present" - } - }, - "question": "Does the traffic sign D7 () have a supplementary sign?" - }, "cycleway-traffic-signs-supplementary": { "mappings": { + "0": { + "then": "Mopeds must use the cycleway" + }, + "1": { + "then": "Speedpedelecs must use the cycleway" + }, + "2": { + "then": "Mopeds and speedpedelecs must use the cycleway" + }, + "3": { + "then": "Mopeds are not allowed" + }, + "4": { + "then": "Speedpedelecs are not allowed" + }, + "5": { + "then": "Mopeds and speedpedelecs are not allowed" + }, "6": { "then": "No supplementary traffic sign present" } diff --git a/langs/layers/nl.json b/langs/layers/nl.json index 3204cd289f..4ec425d435 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -2696,42 +2696,16 @@ }, "question": "Welk verkeersbord heeft dit fietspad?" }, - "cycleway-traffic-signs-D7-supplementary": { - "mappings": { - "0": { - "then": "Bromfiets klasse B verplicht" - }, - "1": { - "then": "Speedpedelc (klasse P) verplicht" - }, - "2": { - "then": "Bromfiets klasse B en speedpedelec (klasse P) verplicht" - }, - "3": { - "then": "Bromfiets klasse B verboden" - }, - "4": { - "then": "Speedpedelec (bromfiets klasse P) verboden" - }, - "5": { - "then": "Bromfiets klasse B en speedpedelec (klasse P) verboden" - }, - "6": { - "then": "Geen onderbord aanwezig" - } - }, - "question": "Heeft het verkeersbord D7 () een onderbord?" - }, "cycleway-traffic-signs-supplementary": { "mappings": { "0": { - "then": "Bromfiets Klass B verplicht" + "then": "Bromfiets Klass B verplicht op het fietspad" }, "1": { - "then": "Speedpedelec (Bromfiets klasse P) verplicht" + "then": "Speedpedelec (Bromfiets klasse P) verplicht op het fietspad" }, "2": { - "then": "Bromfiets klasse B en speedpedelec (Klasse P) verplicht" + "then": "Bromfiets klasse B en speedpedelec (Klasse P) verplicht op het fietspad" }, "3": { "then": "Bromfiets klasse B verboden"