From 63708ea568f7ee80d81e96c237167468dccf38ef Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Thu, 22 Jul 2021 10:31:44 +0200 Subject: [PATCH] Seperation and traffic sign --- assets/themes/cycle_infra/cycle_infra.json | 154 ++++++++++++++++++++- langs/themes/en.json | 58 +++++++- langs/themes/nl.json | 58 +++++++- 3 files changed, 259 insertions(+), 11 deletions(-) diff --git a/assets/themes/cycle_infra/cycle_infra.json b/assets/themes/cycle_infra/cycle_infra.json index 69b0e059d..56b39046a 100644 --- a/assets/themes/cycle_infra/cycle_infra.json +++ b/assets/themes/cycle_infra/cycle_infra.json @@ -579,8 +579,8 @@ { "if": "cycleway:traffic_sign=BE:D9", "then": { - "en": "Compulsory cycleway ", - "nl": "Verplicht fietspad " + "en": "Segregated foot/cycleway ", + "nl": "Afgescheiden voet-/fietspad " }, "hideInAnswer": "_country!=be", "addExtraTags": [ @@ -590,13 +590,71 @@ { "if": "cycleway:traffic_sign=BE:D10", "then": { - "en": "Compulsory cycleway ", - "nl": "Verplicht fietspad " + "en": "Unsegregated foot/cycleway ", + "nl": "Gedeeld voet-/fietspad " }, "hideInAnswer": "_country!=be", "addExtraTags": [ "segregated=no" ] + }, + { + "if": "cycleway:traffic_sign=none", + "then": { + "en": "No traffic sign present", + "nl": "Geen verkeersbord aanwezig" + } + } + ] + }, + { + "question": { + "en": "What traffic sign does this cycleway have?", + "nl": "Welk verkeersbord heeft dit fietspad?" + }, + "condition": { + "or": [ + "highway=cycleway", + "highway=path" + ] + }, + "mappings": [ + { + "if": "traffic_sign=BE:D7", + "then": { + "en": "Compulsory cycleway ", + "nl": "Verplicht fietspad " + }, + "hideInAnswer": "_country!=be" + }, + { + "if": "traffic_sign=BE:D9", + "then": { + "en": "Segregated foot/cycleway ", + "nl": "Afgescheiden voet-/fietspad " + }, + "hideInAnswer": "_country!=be", + "addExtraTags": [ + "segregated=yes" + ] + }, + { + "if": "traffic_sign=BE:D10", + "then": { + "en": "Unsegregated foot/cycleway ", + "nl": "Gedeeld voet-/fietspad " + }, + "hideInAnswer": "_country!=be", + "addExtraTags": [ + "segregated=no" + ] + }, + { + "if": "cycleway:traffic_sign=none", + "then": { + "en": "No traffic sign present", + "nl": "Geen verkeersbord aanwezig" + } } ] }, @@ -612,15 +670,97 @@ "condition": { "or": [ "cycleway=track", - "cycleway=lane", - "highway=cycleway", - "highway=path" + "cycleway=lane" ] }, "freeform": { "key": "cycleway:buffer", "type": "pfloat" } + }, + { + "question": { + "en": "How is this cycleway seperated from the road?", + "nl": "Hoe is dit fietspad gescheiden van de weg?" + }, + "condition": { + "or": [ + "cycleway=track", + "cycleway=lane" + ] + }, + "mappings": [ + { + "if": "cycleway:seperation=dashed_line", + "then": { + "en": "This cycleway is seperated by a dashed line", + "nl": "Dit fietspad is gescheiden van de weg met een onderbroken streep" + } + }, + { + "if": "cycleway:seperation=solid_line", + "then": { + "en": "This cycleway is seperated by a solid line", + "nl": "Dit fietspad is gescheiden van de weg met een doorgetrokken streep" + } + }, + { + "if": "cycleway:seperation=parking_lane", + "then": { + "en": "This cycleway is seperated by a parking lane", + "nl": "Dit fietspad is gescheiden van de weg met parkeervakken" + } + }, + { + "if": "cycleway:seperation=kerb", + "then": { + "en": "This cycleway is seperated by a kerb", + "nl": "Dit fietspad is gescheiden van de weg met een stoeprand" + } + } + ] + }, + { + "question": { + "en": "How is this cycleway seperated from the road?", + "nl": "Hoe is dit fietspad gescheiden van de weg?" + }, + "condition": { + "or": [ + "highway=cycleway", + "highway=path" + ] + }, + "mappings": [ + { + "if": "seperation=dashed_line", + "then": { + "en": "This cycleway is seperated by a dashed line", + "nl": "Dit fietspad is gescheiden van de weg met een onderbroken streep" + } + }, + { + "if": "seperation=solid_line", + "then": { + "en": "This cycleway is seperated by a solid line", + "nl": "Dit fietspad is gescheiden van de weg met een doorgetrokken streep" + } + }, + { + "if": "seperation=parking_lane", + "then": { + "en": "This cycleway is seperated by a parking lane", + "nl": "Dit fietspad is gescheiden van de weg met parkeervakken" + } + }, + { + "if": "seperation=kerb", + "then": { + "en": "This cycleway is seperated by a kerb", + "nl": "Dit fietspad is gescheiden van de weg met een stoeprand" + } + } + ] } ], "hideUnderlayingFeaturesMinPercentage": 0, diff --git a/langs/themes/en.json b/langs/themes/en.json index 367128e6c..f02d48c6e 100644 --- a/langs/themes/en.json +++ b/langs/themes/en.json @@ -906,16 +906,70 @@ "then": "Compulsory cycleway " }, "1": { - "then": "Compulsory cycleway " + "then": "Segregated foot/cycleway " }, "2": { - "then": "Compulsory cycleway " + "then": "Unsegregated foot/cycleway " + }, + "3": { + "then": "No traffic sign present" } } }, "10": { + "question": "What traffic sign does this cycleway have?", + "mappings": { + "0": { + "then": "Compulsory cycleway " + }, + "1": { + "then": "Segregated foot/cycleway " + }, + "2": { + "then": "Unsegregated foot/cycleway " + }, + "3": { + "then": "No traffic sign present" + } + } + }, + "11": { "render": "The buffer besides this cycleway is {cycleway:buffer} m", "question": "How wide is the gap between the cycleway and the road?" + }, + "12": { + "question": "How is this cycleway seperated from the road?", + "mappings": { + "0": { + "then": "This cycleway is seperated by a dashed line" + }, + "1": { + "then": "This cycleway is seperated by a solid line" + }, + "2": { + "then": "This cycleway is seperated by a parking lane" + }, + "3": { + "then": "This cycleway is seperated by a kerb" + } + } + }, + "13": { + "question": "How is this cycleway seperated from the road?", + "mappings": { + "0": { + "then": "This cycleway is seperated by a dashed line" + }, + "1": { + "then": "This cycleway is seperated by a solid line" + }, + "2": { + "then": "This cycleway is seperated by a parking lane" + }, + "3": { + "then": "This cycleway is seperated by a kerb" + } + } } } }, diff --git a/langs/themes/nl.json b/langs/themes/nl.json index 8f41e1de1..891cbe8ae 100644 --- a/langs/themes/nl.json +++ b/langs/themes/nl.json @@ -710,16 +710,70 @@ "then": "Verplicht fietspad " }, "1": { - "then": "Verplicht fietspad " + "then": "Afgescheiden voet-/fietspad " }, "2": { - "then": "Verplicht fietspad " + "then": "Gedeeld voet-/fietspad " + }, + "3": { + "then": "Geen verkeersbord aanwezig" } } }, "10": { + "question": "Welk verkeersbord heeft dit fietspad?", + "mappings": { + "0": { + "then": "Verplicht fietspad " + }, + "1": { + "then": "Afgescheiden voet-/fietspad " + }, + "2": { + "then": "Gedeeld voet-/fietspad " + }, + "3": { + "then": "Geen verkeersbord aanwezig" + } + } + }, + "11": { "render": "De schrikafstand van dit fietspad is {cycleway:buffer} m", "question": "Hoe breed is de ruimte tussen het fietspad en de weg?" + }, + "12": { + "question": "Hoe is dit fietspad gescheiden van de weg?", + "mappings": { + "0": { + "then": "Dit fietspad is gescheiden van de weg met een onderbroken streep" + }, + "1": { + "then": "Dit fietspad is gescheiden van de weg met een doorgetrokken streep" + }, + "2": { + "then": "Dit fietspad is gescheiden van de weg met parkeervakken" + }, + "3": { + "then": "Dit fietspad is gescheiden van de weg met een stoeprand" + } + } + }, + "13": { + "question": "Hoe is dit fietspad gescheiden van de weg?", + "mappings": { + "0": { + "then": "Dit fietspad is gescheiden van de weg met een onderbroken streep" + }, + "1": { + "then": "Dit fietspad is gescheiden van de weg met een doorgetrokken streep" + }, + "2": { + "then": "Dit fietspad is gescheiden van de weg met parkeervakken" + }, + "3": { + "then": "Dit fietspad is gescheiden van de weg met een stoeprand" + } + } } } },