From 95d3e973f02740b2b6da26aab7d07d4afa87e1d3 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Mon, 26 Jul 2021 16:51:58 +0200 Subject: [PATCH] Added B22 and B23 --- .../crossings/Belgian_road_sign_B22.svg | 123 +++++++++++++++++ .../crossings/Belgian_road_sign_B23.svg | 124 ++++++++++++++++++ assets/layers/crossings/crossings.json | 43 +++++- assets/layers/crossings/license_info.json | 20 +++ langs/layers/en.json | 19 ++- langs/layers/nl.json | 19 ++- 6 files changed, 345 insertions(+), 3 deletions(-) create mode 100644 assets/layers/crossings/Belgian_road_sign_B22.svg create mode 100644 assets/layers/crossings/Belgian_road_sign_B23.svg diff --git a/assets/layers/crossings/Belgian_road_sign_B22.svg b/assets/layers/crossings/Belgian_road_sign_B22.svg new file mode 100644 index 0000000000..7d195a6262 --- /dev/null +++ b/assets/layers/crossings/Belgian_road_sign_B22.svg @@ -0,0 +1,123 @@ + + + +image/svg+xml + + + + + + + + + + + + + + \ No newline at end of file diff --git a/assets/layers/crossings/Belgian_road_sign_B23.svg b/assets/layers/crossings/Belgian_road_sign_B23.svg new file mode 100644 index 0000000000..c6b2de88ab --- /dev/null +++ b/assets/layers/crossings/Belgian_road_sign_B23.svg @@ -0,0 +1,124 @@ + + + +image/svg+xml + + + + + + + + + + + + + + \ No newline at end of file diff --git a/assets/layers/crossings/crossings.json b/assets/layers/crossings/crossings.json index 4525575069..ebbc910143 100644 --- a/assets/layers/crossings/crossings.json +++ b/assets/layers/crossings/crossings.json @@ -226,12 +226,21 @@ }, "condition": "highway=traffic_signals", "mappings": [ + { + "if": "red_turn:right:bicycle=yes", + "then": { + "en": "A cyclist can turn right if the light is red ", + "nl": "Een fietser mag wel rechtsaf slaan als het licht rood is " + }, + "hideInAnswer": "_country!=be" + }, { "if": "red_turn:right:bicycle=yes", "then": { "en": "A cyclist can turn right if the light is red", "nl": "Een fietser mag wel rechtsaf slaan als het licht rood is" - } + }, + "hideInAnswer": "_country=be" }, { "if": "red_turn:right:bicycle=no", @@ -241,6 +250,38 @@ } } ] + }, + { + "question": { + "en": "Can a cyclist go straight on when the light is red?", + "nl": "Mag een fietser rechtdoor gaan als het licht rood is?" + }, + "condition": "highway=traffic_signals", + "mappings": [ + { + "if": "red_turn:straight:bicycle=yes", + "then": { + "en": "A cyclist can go straight on if the light is red ", + "nl": "Een fietser mag wel rechtdoor gaan als het licht rood is " + }, + "hideInAnswer": "_country!=be" + }, + { + "if": "red_turn:straight:bicycle=yes", + "then": { + "en": "A cyclist can go straight on if the light is red", + "nl": "Een fietser mag wel rechtdoor gaan als het licht rood is" + }, + "hideInAnswer": "_country=be" + }, + { + "if": "red_turn:straight:bicycle=no", + "then": { + "en": "A cyclist can not go straight on if the light is red", + "nl": "Een fietser mag niet rechtdoor gaan als het licht rood is" + } + } + ] } ] } \ No newline at end of file diff --git a/assets/layers/crossings/license_info.json b/assets/layers/crossings/license_info.json index b5a0b67e1e..2d1d83740f 100644 --- a/assets/layers/crossings/license_info.json +++ b/assets/layers/crossings/license_info.json @@ -1,4 +1,24 @@ [ + { + "authors": [ + "Belgische Wetgever" + ], + "path": "Belgian_road_sign_B22.svg", + "license": "CC0", + "sources": [ + "https://commons.wikimedia.org/wiki/File:Belgian_road_sign_B22.svg" + ] + }, + { + "authors": [ + "Belgische Wetgever" + ], + "path": "Belgian_road_sign_B23.svg", + "license": "CC0", + "sources": [ + "https://commons.wikimedia.org/wiki/File:Belgian_road_sign_B23.svg" + ] + }, { "authors": [ "Tobias Zwick" diff --git a/langs/layers/en.json b/langs/layers/en.json index afae48ada7..85057448c6 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -780,12 +780,29 @@ "question": "Can a cyclist turn right when the light is red?", "mappings": { "0": { - "then": "A cyclist can turn right if the light is red" + "then": "A cyclist can turn right if the light is red " }, "1": { + "then": "A cyclist can turn right if the light is red" + }, + "2": { "then": "A cyclist can not turn right if the light is red" } } + }, + "6": { + "question": "Can a cyclist go straight on when the light is red?", + "mappings": { + "0": { + "then": "A cyclist can go straight on if the light is red " + }, + "1": { + "then": "A cyclist can go straight on if the light is red" + }, + "2": { + "then": "A cyclist can not go straight on if the light is red" + } + } } } }, diff --git a/langs/layers/nl.json b/langs/layers/nl.json index 4e8ff9af65..00d687866d 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -862,12 +862,29 @@ "question": "Mag een fietser rechtsaf slaan als het licht rood is?", "mappings": { "0": { - "then": "Een fietser mag wel rechtsaf slaan als het licht rood is" + "then": "Een fietser mag wel rechtsaf slaan als het licht rood is " }, "1": { + "then": "Een fietser mag wel rechtsaf slaan als het licht rood is" + }, + "2": { "then": "Een fietser mag niet rechtsaf slaan als het licht rood is" } } + }, + "6": { + "question": "Mag een fietser rechtdoor gaan als het licht rood is?", + "mappings": { + "0": { + "then": "Een fietser mag wel rechtdoor gaan als het licht rood is " + }, + "1": { + "then": "Een fietser mag wel rechtdoor gaan als het licht rood is" + }, + "2": { + "then": "Een fietser mag niet rechtdoor gaan als het licht rood is" + } + } } } },