From 1953d9c417e0aac511c9ad25e66c9710267487f0 Mon Sep 17 00:00:00 2001 From: pgm-chardelv1 Date: Tue, 27 Jul 2021 15:16:51 +0200 Subject: [PATCH 1/4] Add some untested changes to options for cycleway:surface --- assets/themes/artwork/artwork.json | 2 +- assets/themes/cycle_infra/cycle_infra.json | 55 ++++++++++++++++++-- assets/themes/cyclestreets/cyclestreets.json | 2 +- assets/themes/fruit_trees/fruit_trees.json | 2 +- langs/themes/en.json | 21 ++++++++ langs/themes/nl.json | 21 ++++++++ 6 files changed, 97 insertions(+), 6 deletions(-) diff --git a/assets/themes/artwork/artwork.json b/assets/themes/artwork/artwork.json index 454ff9eac1..feb957abc9 100644 --- a/assets/themes/artwork/artwork.json +++ b/assets/themes/artwork/artwork.json @@ -429,4 +429,4 @@ ] } ] -} +} \ No newline at end of file diff --git a/assets/themes/cycle_infra/cycle_infra.json b/assets/themes/cycle_infra/cycle_infra.json index 6f1222ccf8..9efe7442d9 100644 --- a/assets/themes/cycle_infra/cycle_infra.json +++ b/assets/themes/cycle_infra/cycle_infra.json @@ -340,18 +340,67 @@ } }, { - "if": "cycleway:surface=asphalt", + "if": "cycleway:surface=unhewn_cobblestone", "then": { "en": "This cycleway is made of asphalt", "nl": "Dit fietspad is gemaakt van asfalt" } }, { - "if": "cycleway:surface=paved", + "if": "cycleway:surface=sett", "then": { "en": "This cycleway is paved", "nl": "Dit fietspad is geplaveid" } + }, + { + "if": "cycleway:surface=asphalt", + "then": { + "en": "This cycleway is paved with stones with a flat top", + "nl": "Dit fietspad is geplaveid met stenen" + } + }, + { + "if": "cycleway:surface=paved", + "then": { + "en": "This cycleway is made of gravel", + "nl": "Dit fietspad is gemaakt van grind" + } + }, + { + "if": "cycleway:surface=paving_stones", + "then": { + "en": "This cycleway is unhardened", + "nl": "Dit fietspad is onverhard" + } + }, + { + "if": "cycleway:surface=gravel", + "then": { + "en": "This cycleway is made of gravel", + "nl": "Dit fietspad is gemaakt van grind" + } + }, + { + "if": "cycleway:surface=fine_gravel", + "then": { + "en": "This cycleway is made of fine gravel", + "nl": "Dit fietspad is gemaakt van fijn grind" + } + }, + { + "if": "cycleway:surface=pebblestone", + "then": { + "en": "This cycleway is made of pebblestone", + "nl": "Dit fietspad is gemaakt van kiezelsteentjes" + } + }, + { + "if": "cycleway:surface=ground", + "then": { + "en": "This cycleway is made from raw ground", + "nl": "Dit fietspad is gemaakt van aarde" + } } ], "question": { @@ -447,7 +496,7 @@ } }, { - "if": "surface=cobblestone", + "if": "surface=sett", "then": { "en": "This street is made of cobblestone", "nl": "Deze straat is gemaakt van kasseien" diff --git a/assets/themes/cyclestreets/cyclestreets.json b/assets/themes/cyclestreets/cyclestreets.json index a09314b9d3..a5a56c7cce 100644 --- a/assets/themes/cyclestreets/cyclestreets.json +++ b/assets/themes/cyclestreets/cyclestreets.json @@ -279,4 +279,4 @@ ] } ] -} +} \ No newline at end of file diff --git a/assets/themes/fruit_trees/fruit_trees.json b/assets/themes/fruit_trees/fruit_trees.json index bf12bbeca2..60d6e8a234 100644 --- a/assets/themes/fruit_trees/fruit_trees.json +++ b/assets/themes/fruit_trees/fruit_trees.json @@ -170,4 +170,4 @@ } ], "roamingRenderings": [] -} +} \ No newline at end of file diff --git a/langs/themes/en.json b/langs/themes/en.json index 04300ef69f..9f17306cd0 100644 --- a/langs/themes/en.json +++ b/langs/themes/en.json @@ -812,6 +812,27 @@ }, "4": { "then": "This cycleway is paved" + }, + "5": { + "then": "This cycleway is paved with stones with a flat top" + }, + "6": { + "then": "This cycleway is made of gravel" + }, + "7": { + "then": "This cycleway is unhardened" + }, + "8": { + "then": "This cycleway is made of gravel" + }, + "9": { + "then": "This cycleway is made of fine gravel" + }, + "10": { + "then": "This cycleway is made of pebblestone" + }, + "11": { + "then": "This cycleway is made from raw ground" } }, "question": "What is the surface of the cycleway made from?" diff --git a/langs/themes/nl.json b/langs/themes/nl.json index 0a42fb2cb5..888016ee4b 100644 --- a/langs/themes/nl.json +++ b/langs/themes/nl.json @@ -700,6 +700,27 @@ }, "4": { "then": "Dit fietspad is geplaveid" + }, + "5": { + "then": "Dit fietspad is geplaveid met stenen" + }, + "6": { + "then": "Dit fietspad is gemaakt van grind" + }, + "7": { + "then": "Dit fietspad is onverhard" + }, + "8": { + "then": "Dit fietspad is gemaakt van grind" + }, + "9": { + "then": "Dit fietspad is gemaakt van fijn grind" + }, + "10": { + "then": "Dit fietspad is gemaakt van kiezelsteentjes" + }, + "11": { + "then": "Dit fietspad is gemaakt van aarde" } }, "question": "Waaruit is het oppervlak van het fietspad van gemaakt?" From c101bdeceb19ee7d5cf102a10e9aad07a74d09c8 Mon Sep 17 00:00:00 2001 From: pgm-chardelv1 Date: Tue, 27 Jul 2021 15:47:53 +0200 Subject: [PATCH 2/4] Fix certain tags having no translations in the theme --- assets/themes/cycle_infra/cycle_infra.json | 26 +++++++++++++++++++++- langs/themes/en.json | 9 ++++++++ langs/themes/nl.json | 9 ++++++++ 3 files changed, 43 insertions(+), 1 deletion(-) diff --git a/assets/themes/cycle_infra/cycle_infra.json b/assets/themes/cycle_infra/cycle_infra.json index 7651fe5705..7131b6f9dc 100644 --- a/assets/themes/cycle_infra/cycle_infra.json +++ b/assets/themes/cycle_infra/cycle_infra.json @@ -518,6 +518,30 @@ "en": "This street is paved", "nl": "Deze straat is geplaveid" } + }, + { + "if": "surface=fine_gravel", + "then": { + "en": "This street is made from fine gravel", + "nl": "Deze straat is gemaakt van fijn grind" + }, + "hideInAnswer": true + }, + { + "if": "surface=cobblestone", + "then": { + "en": "This street is made from cobblestone", + "nl": "Deze straat is gemaakt van kasseien" + }, + "hideInAnswer": true + }, + { + "if": "surface=paving_stones", + "then": { + "en": "This street is made from paving stones", + "nl": "Deze straat is gemaakt van geplaveide stenen" + }, + "hideInAnswer": true } ], "question": { @@ -1144,7 +1168,7 @@ "icon": "./assets/themes/cycle_infra/street.svg", "width": "5", "color": { - "render": "#aaaaaa", + "render": "rgba(170, 170, 170, 0.7)", "mappings": [] }, "tagRenderings": [ diff --git a/langs/themes/en.json b/langs/themes/en.json index 9f17306cd0..c2c5e512a5 100644 --- a/langs/themes/en.json +++ b/langs/themes/en.json @@ -883,6 +883,15 @@ }, "4": { "then": "This street is paved" + }, + "5": { + "then": "This street is made from fine gravel" + }, + "6": { + "then": "This street is made from cobblestone" + }, + "7": { + "then": "This street is made from paving stones" } }, "question": "What is the surface of the street made from?" diff --git a/langs/themes/nl.json b/langs/themes/nl.json index 888016ee4b..77d44fc34f 100644 --- a/langs/themes/nl.json +++ b/langs/themes/nl.json @@ -745,6 +745,15 @@ }, "4": { "then": "Deze straat is geplaveid" + }, + "5": { + "then": "Deze straat is gemaakt van fijn grind" + }, + "6": { + "then": "Deze straat is gemaakt van kasseien" + }, + "7": { + "then": "Deze straat is gemaakt van geplaveide stenen" } }, "question": "Waaruit is het oppervlak van de straat gemaakt?" From 2f82afc5e567f12de132d6b29b9ddbc2e14d483b Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Tue, 27 Jul 2021 15:54:49 +0200 Subject: [PATCH 3/4] Zebra crossing --- assets/layers/crossings/crossings.json | 23 +++++++++++++++++++++++ langs/layers/en.json | 21 ++++++++++++++++----- langs/layers/nl.json | 21 ++++++++++++++++----- 3 files changed, 55 insertions(+), 10 deletions(-) diff --git a/assets/layers/crossings/crossings.json b/assets/layers/crossings/crossings.json index ebbc910143..0dcfc9aa19 100644 --- a/assets/layers/crossings/crossings.json +++ b/assets/layers/crossings/crossings.json @@ -114,6 +114,29 @@ } ] }, + { + "question": { + "en": "Is this is a zebra crossing?", + "nl": "Is dit een zebrapad?" + }, + "condition": "crossing=uncontrolled", + "mappings": [ + { + "if": "crossing_ref=zebra", + "then": { + "en": "This is a zebra crossing", + "nl": "Dit is een zebrapad" + } + }, + { + "if": "crossing_ref=", + "then": { + "en": "This is not a zebra crossing", + "nl": "Dit is niet een zebrapad" + } + } + ] + }, { "question": { "en": "Is this crossing also for bicycles?", diff --git a/langs/layers/en.json b/langs/layers/en.json index 85057448c6..cff86acc95 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -730,6 +730,17 @@ } }, "1": { + "question": "Is this is a zebra crossing?", + "mappings": { + "0": { + "then": "This is a zebra crossing" + }, + "1": { + "then": "This is not a zebra crossing" + } + } + }, + "2": { "question": "Is this crossing also for bicycles?", "mappings": { "0": { @@ -740,7 +751,7 @@ } } }, - "2": { + "3": { "question": "Does this crossing have an island in the middle?", "mappings": { "0": { @@ -751,7 +762,7 @@ } } }, - "3": { + "4": { "question": "Does this crossing have tactile paving?", "mappings": { "0": { @@ -765,7 +776,7 @@ } } }, - "4": { + "5": { "question": "Does this traffic light have a button to request green light?", "mappings": { "0": { @@ -776,7 +787,7 @@ } } }, - "5": { + "6": { "question": "Can a cyclist turn right when the light is red?", "mappings": { "0": { @@ -790,7 +801,7 @@ } } }, - "6": { + "7": { "question": "Can a cyclist go straight on when the light is red?", "mappings": { "0": { diff --git a/langs/layers/nl.json b/langs/layers/nl.json index 00d687866d..4610041306 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -812,6 +812,17 @@ } }, "1": { + "question": "Is dit een zebrapad?", + "mappings": { + "0": { + "then": "Dit is een zebrapad" + }, + "1": { + "then": "Dit is niet een zebrapad" + } + } + }, + "2": { "question": "Is deze oversteekplaats ook voor fietsers", "mappings": { "0": { @@ -822,7 +833,7 @@ } } }, - "2": { + "3": { "question": "Heeft deze oversteekplaats een verkeerseiland in het midden?", "mappings": { "0": { @@ -833,7 +844,7 @@ } } }, - "3": { + "4": { "question": "Heeft deze oversteekplaats een geleidelijn?", "mappings": { "0": { @@ -847,7 +858,7 @@ } } }, - "4": { + "5": { "question": "Heeft dit verkeerslicht een knop voor groen licht?", "mappings": { "0": { @@ -858,7 +869,7 @@ } } }, - "5": { + "6": { "question": "Mag een fietser rechtsaf slaan als het licht rood is?", "mappings": { "0": { @@ -872,7 +883,7 @@ } } }, - "6": { + "7": { "question": "Mag een fietser rechtdoor gaan als het licht rood is?", "mappings": { "0": { From bbd51fb1e91733f370fdf119b7a9dbc9b1e318f8 Mon Sep 17 00:00:00 2001 From: pgm-chardelv1 Date: Tue, 27 Jul 2021 16:17:16 +0200 Subject: [PATCH 4/4] Adds some minor spelling fixes --- assets/themes/cycle_infra/cycle_infra.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/assets/themes/cycle_infra/cycle_infra.json b/assets/themes/cycle_infra/cycle_infra.json index 7131b6f9dc..8d4183a7c7 100644 --- a/assets/themes/cycle_infra/cycle_infra.json +++ b/assets/themes/cycle_infra/cycle_infra.json @@ -69,7 +69,7 @@ }, "then": { "nl": "Fietsweg", - "en": "Bike road" + "en": "Cycleway" } }, { @@ -89,7 +89,7 @@ { "if": "cycleway=track", "then": { - "en": "Bike road next to the road", + "en": "Cycleway next to the road", "nl": "Fietsweg naast de weg" } }, @@ -219,7 +219,7 @@ "if": "cyclestreet=yes", "then": { "en": "This is a cyclestreet, and a 30km/h zone.", - "nl": "Dit is een fietstraat, en dus een 30km/h zone" + "nl": "Dit is een fietsstraat, en dus een 30km/h zone" }, "addExtraTags": [ "overtaking:motor_vehicle=no", @@ -231,7 +231,7 @@ "if": "cyclestreet=yes", "then": { "en": "This is a cyclestreet", - "nl": "Dit is een fietstraat" + "nl": "Dit is een fietsstraat" }, "hideInAnswer": "_country=be" }, @@ -239,7 +239,7 @@ "if": "cyclestreet=", "then": { "en": "This is not a cyclestreet.", - "nl": "Dit is niet een fietstraat" + "nl": "Dit is niet een fietsstraat" }, "addExtraTags": [ "overtaking:motor_vehicle=" @@ -1266,7 +1266,7 @@ "if": "cyclestreet=yes", "then": { "en": "This is a cyclestreet, and a 30km/h zone.", - "nl": "Dit is een fietstraat, en dus een 30km/h zone" + "nl": "Dit is een fietsstraat, en dus een 30km/h zone" }, "addExtraTags": [ "overtaking:motor_vehicle=no", @@ -1278,7 +1278,7 @@ "if": "cyclestreet=yes", "then": { "en": "This is a cyclestreet", - "nl": "Dit is een fietstraat" + "nl": "Dit is een fietsstraat" }, "hideInAnswer": "_country=be" }, @@ -1286,7 +1286,7 @@ "if": "cyclestreet=", "then": { "en": "This is not a cyclestreet.", - "nl": "Dit is niet een fietstraat" + "nl": "Dit is niet een fietsstraat" }, "addExtraTags": [ "overtaking:motor_vehicle="