From 1f53a5f70e219d61934f606d345b3bea8f56773b Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Thu, 29 Jul 2021 20:54:24 +0200 Subject: [PATCH 1/2] Rework surface options (#447) --- assets/themes/cycle_infra/cycle_infra.json | 153 +++++++++++++-------- langs/themes/en.json | 84 ++++++----- langs/themes/nl.json | 84 ++++++----- 3 files changed, 201 insertions(+), 120 deletions(-) diff --git a/assets/themes/cycle_infra/cycle_infra.json b/assets/themes/cycle_infra/cycle_infra.json index 37d9c9723..907505cd8 100644 --- a/assets/themes/cycle_infra/cycle_infra.json +++ b/assets/themes/cycle_infra/cycle_infra.json @@ -322,10 +322,33 @@ }, "mappings": [ { - "if": "cycleway:surface=wood", + "if": "cycleway:surface=unpaved", "then": { - "en": "This cycleway is made of wood", - "nl": "Dit fietspad is gemaakt van hout" + "en": "This cycleway is unhardened", + "nl": "Dit fietspad is onverhard" + }, + "hideInAnswer": true + }, + { + "if": "cycleway:surface=paved", + "then": { + "en": "This cycleway is paved", + "nl": "Dit fietspad is geplaveid" + }, + "hideInAnswer": true + }, + { + "if": "cycleway:surface=asphalt", + "then": { + "en": "This cycleway is made of asphalt", + "nl": "Dit fietspad is gemaakt van asfalt" + } + }, + { + "if": "cycleway:surface=paving_stones", + "then": { + "en": "This cycleway is made of smooth paving stones", + "nl": "Dit fietspad is gemaakt van straatstenen" } }, { @@ -338,43 +361,30 @@ { "if": "cycleway:surface=cobblestone", "then": { - "en": "This cycleway is made of cobblestone", - "nl": "Dit fietspad is gemaakt van kasseien" - } + "en": "This cycleway is made of cobblestone (unhewn or sett)", + "nl": "Dit fietspad is gemaakt van kasseien (natuurlijk of verwerkt)" + }, + "hideInAnswer": true }, { "if": "cycleway:surface=unhewn_cobblestone", "then": { - "en": "This cycleway is made of asphalt", - "nl": "Dit fietspad is gemaakt van asfalt" + "en": "This cycleway is made of raw, natural cobblestone", + "nl": "Dit fietspad is gemaakt van ruwe, natuurlijke kasseien" } }, { "if": "cycleway:surface=sett", "then": { - "en": "This cycleway is paved", - "nl": "Dit fietspad is geplaveid" + "en": "This cycleway is made of flat, square cobblestone", + "nl": "Dit fietspad is gemaakt van vlakke, rechthoekige kasseien" } }, { - "if": "cycleway:surface=asphalt", + "if": "cycleway:surface=wood", "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" + "en": "This cycleway is made of wood", + "nl": "Dit fietspad is gemaakt van hout" } }, { @@ -493,63 +503,98 @@ }, "mappings": [ { - "if": "surface=wood", + "if": "surface=unpaved", "then": { - "en": "This street is made of wood", - "nl": "Deze straat is gemaakt van hout" + "en": "This cycleway is unhardened", + "nl": "Dit fietspad is onverhard" + }, + "hideInAnswer": true + }, + { + "if": "surface=paved", + "then": { + "en": "This cycleway is paved", + "nl": "Dit fietspad is geplaveid" + }, + "hideInAnswer": true + }, + { + "if": "surface=asphalt", + "then": { + "en": "This cycleway is made of asphalt", + "nl": "Dit fietspad is gemaakt van asfalt" + } + }, + { + "if": "surface=paving_stones", + "then": { + "en": "This cycleway is made of smooth paving stones", + "nl": "Dit fietspad is gemaakt van straatstenen" } }, { "if": "surface=concrete", "then": { - "en": "This street is made of concrete", - "nl": "Deze straat is gemaakt van beton" + "en": "This cycleway is made of concrete", + "nl": "Dit fietspad is gemaakt van beton" + } + }, + { + "if": "surface=cobblestone", + "then": { + "en": "This cycleway is made of cobblestone (unhewn or sett)", + "nl": "Dit fietspad is gemaakt van kasseien (natuurlijk of verwerkt)" + }, + "hideInAnswer": true + }, + { + "if": "surface=unhewn_cobblestone", + "then": { + "en": "This cycleway is made of raw, natural cobblestone", + "nl": "Dit fietspad is gemaakt van ruwe, natuurlijke kasseien" } }, { "if": "surface=sett", "then": { - "en": "This street is made of cobblestone", - "nl": "Deze straat is gemaakt van kasseien" + "en": "This cycleway is made of flat, square cobblestone", + "nl": "Dit fietspad is gemaakt van vlakke, rechthoekige kasseien" } }, { - "if": "surface=asphalt", + "if": "surface=wood", "then": { - "en": "This street is made of asphalt", - "nl": "Deze straat is gemaakt van asfalt" + "en": "This cycleway is made of wood", + "nl": "Dit fietspad is gemaakt van hout" } }, { - "if": "surface=paved", + "if": "surface=gravel", "then": { - "en": "This street is paved", - "nl": "Deze straat is geplaveid" + "en": "This cycleway is made of gravel", + "nl": "Dit fietspad is gemaakt van grind" } }, { "if": "surface=fine_gravel", "then": { - "en": "This street is made from fine gravel", - "nl": "Deze straat is gemaakt van fijn grind" - }, - "hideInAnswer": true + "en": "This cycleway is made of fine gravel", + "nl": "Dit fietspad is gemaakt van fijn grind" + } }, { - "if": "surface=cobblestone", + "if": "surface=pebblestone", "then": { - "en": "This street is made from cobblestone", - "nl": "Deze straat is gemaakt van kasseien" - }, - "hideInAnswer": true + "en": "This cycleway is made of pebblestone", + "nl": "Dit fietspad is gemaakt van kiezelsteentjes" + } }, { - "if": "surface=paving_stones", + "if": "surface=ground", "then": { - "en": "This street is made from paving stones", - "nl": "Deze straat is gemaakt van geplaveide stenen" - }, - "hideInAnswer": true + "en": "This cycleway is made from raw ground", + "nl": "Dit fietspad is gemaakt van aarde" + } } ], "question": { diff --git a/langs/themes/en.json b/langs/themes/en.json index 6fb0be015..7f450beca 100644 --- a/langs/themes/en.json +++ b/langs/themes/en.json @@ -799,39 +799,42 @@ "render": "This cyleway is made of {cycleway:surface}", "mappings": { "0": { - "then": "This cycleway is made of wood" - }, - "1": { - "then": "This cycleway is made of concrete" - }, - "2": { - "then": "This cycleway is made of cobblestone" - }, - "3": { - "then": "This cycleway is made of asphalt" - }, - "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" }, + "1": { + "then": "This cycleway is paved" + }, + "2": { + "then": "This cycleway is made of asphalt" + }, + "3": { + "then": "This cycleway is made of smooth paving stones" + }, + "4": { + "then": "This cycleway is made of concrete" + }, + "5": { + "then": "This cycleway is made of cobblestone (unhewn or sett)" + }, + "6": { + "then": "This cycleway is made of raw, natural cobblestone" + }, + "7": { + "then": "This cycleway is made of flat, square cobblestone" + }, "8": { - "then": "This cycleway is made of gravel" + "then": "This cycleway is made of wood" }, "9": { - "then": "This cycleway is made of fine gravel" + "then": "This cycleway is made of gravel" }, "10": { - "then": "This cycleway is made of pebblestone" + "then": "This cycleway is made of fine gravel" }, "11": { + "then": "This cycleway is made of pebblestone" + }, + "12": { "then": "This cycleway is made from raw ground" } }, @@ -870,28 +873,43 @@ "render": "This road is made of {surface}", "mappings": { "0": { - "then": "This street is made of wood" + "then": "This cycleway is unhardened" }, "1": { - "then": "This street is made of concrete" + "then": "This cycleway is paved" }, "2": { - "then": "This street is made of cobblestone" + "then": "This cycleway is made of asphalt" }, "3": { - "then": "This street is made of asphalt" + "then": "This cycleway is made of smooth paving stones" }, "4": { - "then": "This street is paved" + "then": "This cycleway is made of concrete" }, "5": { - "then": "This street is made from fine gravel" + "then": "This cycleway is made of cobblestone (unhewn or sett)" }, "6": { - "then": "This street is made from cobblestone" + "then": "This cycleway is made of raw, natural cobblestone" }, "7": { - "then": "This street is made from paving stones" + "then": "This cycleway is made of flat, square cobblestone" + }, + "8": { + "then": "This cycleway is made of wood" + }, + "9": { + "then": "This cycleway is made of gravel" + }, + "10": { + "then": "This cycleway is made of fine gravel" + }, + "11": { + "then": "This cycleway is made of pebblestone" + }, + "12": { + "then": "This cycleway is made from raw ground" } }, "question": "What is the surface of the street made from?" @@ -936,7 +954,7 @@ "then": "Compulsory cycleway " }, "1": { - "then": "Compulsory cycleway (with supplementary sign)
" + "then": "Compulsory cycleway (with supplementary sign) " }, "2": { "then": "Segregated foot/cycleway " diff --git a/langs/themes/nl.json b/langs/themes/nl.json index 17d236cdd..169271f00 100644 --- a/langs/themes/nl.json +++ b/langs/themes/nl.json @@ -687,39 +687,42 @@ "render": "Dit fietspad is gemaakt van {cycleway:surface}", "mappings": { "0": { - "then": "Dit fietspad is gemaakt van hout" - }, - "1": { - "then": "Dit fietspad is gemaakt van beton" - }, - "2": { - "then": "Dit fietspad is gemaakt van kasseien" - }, - "3": { - "then": "Dit fietspad is gemaakt van asfalt" - }, - "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" }, + "1": { + "then": "Dit fietspad is geplaveid" + }, + "2": { + "then": "Dit fietspad is gemaakt van asfalt" + }, + "3": { + "then": "Dit fietspad is gemaakt van straatstenen" + }, + "4": { + "then": "Dit fietspad is gemaakt van beton" + }, + "5": { + "then": "Dit fietspad is gemaakt van kasseien (natuurlijk of verwerkt)" + }, + "6": { + "then": "Dit fietspad is gemaakt van ruwe, natuurlijke kasseien" + }, + "7": { + "then": "Dit fietspad is gemaakt van vlakke, rechthoekige kasseien" + }, "8": { - "then": "Dit fietspad is gemaakt van grind" + "then": "Dit fietspad is gemaakt van hout" }, "9": { - "then": "Dit fietspad is gemaakt van fijn grind" + "then": "Dit fietspad is gemaakt van grind" }, "10": { - "then": "Dit fietspad is gemaakt van kiezelsteentjes" + "then": "Dit fietspad is gemaakt van fijn grind" }, "11": { + "then": "Dit fietspad is gemaakt van kiezelsteentjes" + }, + "12": { "then": "Dit fietspad is gemaakt van aarde" } }, @@ -758,28 +761,43 @@ "render": "Deze weg is gemaakt van {surface}", "mappings": { "0": { - "then": "Deze straat is gemaakt van hout" + "then": "Dit fietspad is onverhard" }, "1": { - "then": "Deze straat is gemaakt van beton" + "then": "Dit fietspad is geplaveid" }, "2": { - "then": "Deze straat is gemaakt van kasseien" + "then": "Dit fietspad is gemaakt van asfalt" }, "3": { - "then": "Deze straat is gemaakt van asfalt" + "then": "Dit fietspad is gemaakt van straatstenen" }, "4": { - "then": "Deze straat is geplaveid" + "then": "Dit fietspad is gemaakt van beton" }, "5": { - "then": "Deze straat is gemaakt van fijn grind" + "then": "Dit fietspad is gemaakt van kasseien (natuurlijk of verwerkt)" }, "6": { - "then": "Deze straat is gemaakt van kasseien" + "then": "Dit fietspad is gemaakt van ruwe, natuurlijke kasseien" }, "7": { - "then": "Deze straat is gemaakt van geplaveide stenen" + "then": "Dit fietspad is gemaakt van vlakke, rechthoekige kasseien" + }, + "8": { + "then": "Dit fietspad is gemaakt van hout" + }, + "9": { + "then": "Dit fietspad is gemaakt van grind" + }, + "10": { + "then": "Dit fietspad is gemaakt van fijn grind" + }, + "11": { + "then": "Dit fietspad is gemaakt van kiezelsteentjes" + }, + "12": { + "then": "Dit fietspad is gemaakt van aarde" } }, "question": "Waaruit is het oppervlak van de straat gemaakt?" @@ -798,7 +816,7 @@ "then": "Verplicht fietspad " }, "1": { - "then": "Verplicht fietspad (met onderbord)
" + "then": "Verplicht fietspad (met onderbord)" }, "2": { "then": "Afgescheiden voet-/fietspad " From cd10f98c73b658f6b73ec039946794867212ddc6 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Thu, 29 Jul 2021 21:00:11 +0200 Subject: [PATCH 2/2] Missing line break --- assets/themes/cycle_infra/cycle_infra.json | 8 ++++---- langs/themes/en.json | 4 ++-- langs/themes/nl.json | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/assets/themes/cycle_infra/cycle_infra.json b/assets/themes/cycle_infra/cycle_infra.json index 907505cd8..3bf26aded 100644 --- a/assets/themes/cycle_infra/cycle_infra.json +++ b/assets/themes/cycle_infra/cycle_infra.json @@ -709,8 +709,8 @@ { "if": "cycleway:traffic_sign~BE:D7;.*", "then": { - "en": "Compulsory cycleway (with supplementary sign) ", - "nl": "Verplicht fietspad (met onderbord)" + "en": "Compulsory cycleway (with supplementary sign)
", + "nl": "Verplicht fietspad (met onderbord)
" }, "hideInAnswer": true }, @@ -776,8 +776,8 @@ { "if": "traffic_sign~BE:D7;.*", "then": { - "en": "Compulsory cycleway (with supplementary sign) ", - "nl": "Verplicht fietspad (met onderbord)" + "en": "Compulsory cycleway (with supplementary sign)
", + "nl": "Verplicht fietspad (met onderbord)
" }, "hideInAnswer": true }, diff --git a/langs/themes/en.json b/langs/themes/en.json index 7f450beca..ba44aa848 100644 --- a/langs/themes/en.json +++ b/langs/themes/en.json @@ -954,7 +954,7 @@ "then": "Compulsory cycleway " }, "1": { - "then": "Compulsory cycleway (with supplementary sign) " + "then": "Compulsory cycleway (with supplementary sign)
" }, "2": { "then": "Segregated foot/cycleway " @@ -974,7 +974,7 @@ "then": "Compulsory cycleway " }, "1": { - "then": "Compulsory cycleway (with supplementary sign) " + "then": "Compulsory cycleway (with supplementary sign)
" }, "2": { "then": "Segregated foot/cycleway " diff --git a/langs/themes/nl.json b/langs/themes/nl.json index 169271f00..6f46464d7 100644 --- a/langs/themes/nl.json +++ b/langs/themes/nl.json @@ -816,7 +816,7 @@ "then": "Verplicht fietspad " }, "1": { - "then": "Verplicht fietspad (met onderbord)" + "then": "Verplicht fietspad (met onderbord)
" }, "2": { "then": "Afgescheiden voet-/fietspad " @@ -836,7 +836,7 @@ "then": "Verplicht fietspad " }, "1": { - "then": "Verplicht fietspad (met onderbord)" + "then": "Verplicht fietspad (met onderbord)
" }, "2": { "then": "Afgescheiden voet-/fietspad "