From 8eab5bfdd2880508442a8c4af291af1e84703f93 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Wed, 29 Jun 2022 22:37:06 +0200 Subject: [PATCH] Added icons to mappings --- .../cycleways_and_roads.json | 4 ++-- assets/layers/kerbs/KerbIcon.svg | 18 +++++++++--------- assets/layers/kerbs/kerbs.json | 18 +++++++++++++++++- assets/layers/school/school.json | 19 +++++++++++-------- langs/layers/de.json | 3 +++ langs/layers/en.json | 15 +++++++++++++++ langs/layers/es.json | 17 ++++++++--------- langs/layers/fr.json | 3 +++ langs/layers/nl.json | 15 +++++++++++++++ 9 files changed, 83 insertions(+), 29 deletions(-) diff --git a/assets/layers/cycleways_and_roads/cycleways_and_roads.json b/assets/layers/cycleways_and_roads/cycleways_and_roads.json index 5aa30603f..1b86a6009 100644 --- a/assets/layers/cycleways_and_roads/cycleways_and_roads.json +++ b/assets/layers/cycleways_and_roads/cycleways_and_roads.json @@ -70,7 +70,7 @@ "fr": "Piste cyclable", "ca": "Via ciclista", "da": "Cykelsti", - "es": "Carril bici" + "es": "Carril compartido" } }, { @@ -93,7 +93,7 @@ "de": "Gemeinsame Fahrspur", "fr": "Voie partagée", "ca": "Carril compartit", - "es": "Carril compartido" + "es": "Vía ciclista al lado de la carretera" } }, { diff --git a/assets/layers/kerbs/KerbIcon.svg b/assets/layers/kerbs/KerbIcon.svg index d19fa5ad2..2e4172e4d 100644 --- a/assets/layers/kerbs/KerbIcon.svg +++ b/assets/layers/kerbs/KerbIcon.svg @@ -7,8 +7,8 @@ xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="16" - height="16" + width="500" + height="500" id="svg2" version="1.1" inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)" @@ -22,9 +22,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="32" - inkscape:cx="4.775012" - inkscape:cy="8.2391685" + inkscape:zoom="2" + inkscape:cx="304.38287" + inkscape:cy="103.37718" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -32,9 +32,9 @@ fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" - inkscape:window-width="2160" - inkscape:window-height="1346" - inkscape:window-x="-11" + inkscape:window-width="3840" + inkscape:window-height="2066" + inkscape:window-x="2149" inkscape:window-y="-11" inkscape:window-maximized="1" inkscape:document-rotation="0"> @@ -69,7 +69,7 @@ transform="translate(-334.84375,-558.61859)"> + transform="matrix(32.352738,0,0,32.352738,-10498.292,-17490.849)"> 3 cm)", "nl": "Deze stoeprand is hoog (>3 cm)" + }, + "icon": { + "path": "./assets/layers/kerbs/raised.svg", + "class": "small" } }, { @@ -71,6 +75,10 @@ "then": { "en": "This kerb is lowered (~3 cm)", "nl": "Deze stoeprand is verlaagd (~3 cm)" + }, + "icon": { + "path": "./assets/layers/kerbs/lowered.svg", + "class": "small" } }, { @@ -78,6 +86,10 @@ "then": { "en": "This kerb is flush (~0cm)", "nl": "Deze stoeprand is vlak (~0cm)" + }, + "icon": { + "path": "./assets/layers/kerbs/flush.svg", + "class": "small" } }, { @@ -86,7 +98,11 @@ "en": "There is no kerb here", "nl": "Er is hier geen stoeprand" }, - "hideInAnswer": true + "hideInAnswer": true, + "icon": { + "path": "./assets/layers/kerbs/no.svg", + "class": "small" + } }, { "if": "kerb=yes", diff --git a/assets/layers/school/school.json b/assets/layers/school/school.json index 6fafa0f8a..0d79aac11 100644 --- a/assets/layers/school/school.json +++ b/assets/layers/school/school.json @@ -298,16 +298,17 @@ "fr": "Quelle est la langue principale de cette école ?
Quelle langue est parlée avec les élèves des cours non linguistiques et avec l'administration ?
" }, "render": { - "en": "{school:language} is the main language of {name}", - "nl": "{school:language} is de voertaal van {name}", - "de": "{school:language} ist die Hauptsprache von {name}" + "en": "{school:language} is the main language of {title()}", + "nl": "{school:language} is de voertaal van {title()}", + "de": "{school:language} ist die Hauptsprache von {title()}" }, "freeform": { "key": "school:language", "inline": true, "placeholder": { - "en":"Language in lowercase English", - "nl":"Taal in lowercase Engel"}, + "en": "Language in lowercase English", + "nl": "Taal in lowercase Engel" + }, "addExtraTags": [ "fixme=Freeform tag `school:language` used, to be doublechecked" ] @@ -316,8 +317,10 @@ { "if": "school:language=english", "then": { - "en": "English is the main language of {name}", - "nl": "Engels is de voertaal van {name}" + "en": "The main language of this school is unknown", + "nl": "De voertaal van deze school is niet gekend", + "de": "Die Hauptsprache dieser Schule ist unbekannt", + "fr": "La langue principale de cette école est inconnue" } }, { @@ -395,4 +398,4 @@ "width": 1 } ] -} +} \ No newline at end of file diff --git a/langs/layers/de.json b/langs/layers/de.json index 78b05ee3a..b609f0f21 100644 --- a/langs/layers/de.json +++ b/langs/layers/de.json @@ -5046,6 +5046,9 @@ "mappings": { "0": { "then": "Die Hauptsprache dieser Schule ist unbekannt" + }, + "4": { + "then": "Die Hauptsprache dieser Schule ist unbekannt" } }, "question": "Was ist die Hauptsprache dieser Schule?
Welche Sprache wird mit den Schülern in den nicht sprachbezogenen Kursen und mit der Verwaltung gesprochen?
", diff --git a/langs/layers/en.json b/langs/layers/en.json index 6c0fa5b12..5c1bc31c2 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -5106,9 +5106,24 @@ "question": "Which genders can enroll at this school?" }, "language": { + "freeform": { + "placeholder": "Language in lowercase English" + }, "mappings": { "0": { "then": "The main language of this school is unknown" + }, + "1": { + "then": "French is the main language of {name}" + }, + "2": { + "then": "Dutch is the main language of {name}" + }, + "3": { + "then": "German is the main language of {name}" + }, + "4": { + "then": "The main language of this school is unknown" } }, "question": "What is the main language of this school?
What language is spoken with the students in non-language related courses and with the administration?
", diff --git a/langs/layers/es.json b/langs/layers/es.json index fad9c7495..8910cbdce 100644 --- a/langs/layers/es.json +++ b/langs/layers/es.json @@ -1952,23 +1952,22 @@ }, "title": { "mappings": { - "0": { - "then": "Carril bici" - }, "1": { "then": "Carril compartido" }, - "2": { - "then": "Carril bici" - }, "3": { "then": "Vía ciclista al lado de la carretera" }, - "4": { + "5": { + "then": "Carril bici" + }, + "7": { + "then": "Vía ciclista al lado de la carretera" + }, + "9": { "then": "Ciclocalle" } - }, - "render": "Ciclovías" + } } }, "defibrillator": { diff --git a/langs/layers/fr.json b/langs/layers/fr.json index 3fd6aa4fa..e04ac8e1f 100644 --- a/langs/layers/fr.json +++ b/langs/layers/fr.json @@ -2470,6 +2470,9 @@ "mappings": { "0": { "then": "La langue principale de cette école est inconnue" + }, + "4": { + "then": "La langue principale de cette école est inconnue" } }, "question": "Quelle est la langue principale de cette école ?
Quelle langue est parlée avec les élèves des cours non linguistiques et avec l'administration ?
" diff --git a/langs/layers/nl.json b/langs/layers/nl.json index cfbba9c9d..9224f00e7 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -5026,9 +5026,24 @@ "question": "Mogen jongens en meisjes les volgen op deze school?" }, "language": { + "freeform": { + "placeholder": "Taal in lowercase Engel" + }, "mappings": { "0": { "then": "De voertaal van deze school is niet gekend" + }, + "1": { + "then": "Frans is de voertaal van {name}" + }, + "2": { + "then": "Nederlands is de voertaal van {name}" + }, + "3": { + "then": "Duits is de voertaal van {name}" + }, + "4": { + "then": "De voertaal van deze school is niet gekend" } }, "question": "Wat is de voertaal van deze school?
Welke taal wordt met de studenten gesproken in niet-taal-gerelateerde vakken en met de administratie?
",