From 6d68ca7988bc6db0982ebae35efd90b5c829f435 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Sun, 26 Jan 2025 03:32:51 +0100 Subject: [PATCH] Themes(education): move 'kindergarten' into 'school', add 'school:orientation' (only in Belgium), add more differentiated icons --- assets/layers/childcare/childcare.json | 157 +++++++++++ .../childcare.svg | 0 .../childcare.svg.license | 0 .../kindergarten.svg.license | 0 assets/layers/childcare/license_info.json | 12 + .../kindergarten_childcare.json | 243 ------------------ .../kindergarten_childcare/license_info.json | 25 -- .../kindergarten.svg | 0 assets/layers/school/kindergarten.svg.license | 2 + assets/layers/school/license_info.json | 37 +++ assets/layers/school/school.json | 242 +++++++++++++---- assets/layers/school/school_academic.svg | 74 ++++++ .../layers/school/school_academic.svg.license | 2 + assets/layers/school/school_primary.svg | 153 +++++++++++ .../layers/school/school_primary.svg.license | 2 + assets/themes/education/education.json | 9 +- langs/layers/ca.json | 69 ++--- langs/layers/cs.json | 98 +++---- langs/layers/de.json | 99 +++---- langs/layers/en.json | 146 ++++++----- langs/layers/es.json | 98 +++---- langs/layers/fr.json | 22 +- langs/layers/nl.json | 182 ++++++++----- langs/layers/pl.json | 85 +++--- langs/layers/ru.json | 14 +- langs/themes/nl.json | 114 +++++++- 26 files changed, 1147 insertions(+), 738 deletions(-) create mode 100644 assets/layers/childcare/childcare.json rename assets/layers/{kindergarten_childcare => childcare}/childcare.svg (100%) rename assets/layers/{kindergarten_childcare => childcare}/childcare.svg.license (100%) rename assets/layers/{kindergarten_childcare => childcare}/kindergarten.svg.license (100%) create mode 100644 assets/layers/childcare/license_info.json delete mode 100644 assets/layers/kindergarten_childcare/kindergarten_childcare.json delete mode 100644 assets/layers/kindergarten_childcare/license_info.json rename assets/layers/{kindergarten_childcare => school}/kindergarten.svg (100%) create mode 100644 assets/layers/school/kindergarten.svg.license create mode 100644 assets/layers/school/school_academic.svg create mode 100644 assets/layers/school/school_academic.svg.license create mode 100644 assets/layers/school/school_primary.svg create mode 100644 assets/layers/school/school_primary.svg.license diff --git a/assets/layers/childcare/childcare.json b/assets/layers/childcare/childcare.json new file mode 100644 index 0000000000..4502ec88df --- /dev/null +++ b/assets/layers/childcare/childcare.json @@ -0,0 +1,157 @@ +{ + "id": "childcare", + "name": { + "en": "Childcare", + "nl": "Kinderopvang", + "de": "Kinderkrippen", + "ca": "Guarderies d'infants" + }, + "description": "Shows kindergartens and preschools. Both are grouped in one layer, as they are regularly confused with each other", + "source": { + "osmTags": "amenity=childcare" + }, + "minzoom": 12, + "title": { + "mappings": [ + { + "if": "amenity=childcare", + "then": { + "en": "Childcare {name}", + "nl": "Kinderopvang {name}", + "de": "Kinderkrippe {name}", + "pl": "Żłobek {name}", + "cs": "Péče o děti {name}", + "es": "Guardería {name}" + } + } + ] + }, + "pointRendering": [ + { + "location": [ + "point", + "centroid" + ], + "label": { + "mappings": [ + { + "if": "name~*", + "then": "
{name}
" + } + ] + }, + "marker": [ + { + "icon": "circle", + "color": "white" + }, + { + "icon": { + "mappings": [ + { + "if": "amenity=childcare", + "then": "./assets/layers/childcare/childcare.svg" + } + ] + } + } + ] + } + ], + "lineRendering": [ + { + "color": "#62fc6c", + "width": 1 + } + ], + "presets": [ + { + "title": { + "en": "a childcare", + "nl": "een kinderopvang", + "de": "eine Kinderkrippe", + "ca": "una guarderia", + "pl": "żłobek", + "cs": "péče o děti", + "es": "una guardería" + }, + "description": "A childcare (also known as a nursery or daycare) is a facility which looks after small kids, but does not offer them an education program.", + "tags": [ + "amenity=childcare" + ] + } + ], + "tagRenderings": [ + { + "id": "name", + "question": { + "en": "What is the name of this facility?", + "de": "Wie lautet der Name dieser Einrichtung?", + "nl": "Wat is de naam van deze faciliteit?", + "ca": "Com s'anomena aquesta instal·lació?", + "pl": "Jaka jest nazwa tej placówki?", + "cs": "Jak se toto zařízení jmenuje?", + "es": "¿Cuál es el nombre de este centro?" + }, + "render": { + "en": "This facility is named {name}", + "de": "Diese Einrichtung hat den Namen {name}", + "ca": "Aquesta instal·lació s'anomena {name}", + "nl": "Deze faciliteit heet {name}", + "pl": "Ta placówka nazywa się {name}", + "cs": "Toto zařízení se jmenuje {name}", + "es": "Este centro se llama {name}" + }, + "freeform": { + "key": "name" + } + }, + "website", + "email", + "phone", + { + "builtin": "opening_hours", + "override": { + "question": { + "en": "When is this childcare opened?", + "nl": "Wanneer is deze kinderopvang geopend?", + "de": "Wann ist diese Kinderbetreuung geöffnet?", + "pl": "W jakich godzinach ten żłobek jest otwarty?", + "cs": "Kdy je tato péče o děti otevřena?", + "es": "¿Cuándo abre esta guardería?" + }, + "condition": "amenity=childcare" + } + }, + { + "id": "capacity", + "question": { + "en": "How much kids (at most) can be enrolled here?", + "nl": "Hoeveel kinderen kunnen hier terecht?", + "de": "Wie viele Kinder können hier maximal angemeldet werden?", + "ca": "Quants nens (com a màxim) es poden inscriure aquí?", + "pl": "Jak wiele dzieci (maksymalnie) może być tutaj zapisanych?", + "cs": "Kolik dětí (maximálně) zde může být zapsáno?", + "es": "¿Cuántos niños (como máximo) pueden inscribirse aquí?" + }, + "render": { + "en": "This facility has room for {capacity} kids", + "nl": "Hier kunnen {capacity} kinderen terecht", + "de": "Diese Einrichtung bietet Platz für {capacity} Kinder", + "ca": "Aquesta instal·lació té espai per a {capacity} nens", + "pl": "Ta placówka ma miejsce na {capacity} dzieci", + "cs": "Toto zařízení má prostor pro {capacity} dětí", + "es": "Este centro tiene capacidad para {capacity} niños" + }, + "freeform": { + "key": "capacity", + "type": "pnat" + } + } + ], + "deletion": true, + "allowMove": { + "enableRelocation": true, + "enableImproveAccuracy": true + } +} diff --git a/assets/layers/kindergarten_childcare/childcare.svg b/assets/layers/childcare/childcare.svg similarity index 100% rename from assets/layers/kindergarten_childcare/childcare.svg rename to assets/layers/childcare/childcare.svg diff --git a/assets/layers/kindergarten_childcare/childcare.svg.license b/assets/layers/childcare/childcare.svg.license similarity index 100% rename from assets/layers/kindergarten_childcare/childcare.svg.license rename to assets/layers/childcare/childcare.svg.license diff --git a/assets/layers/kindergarten_childcare/kindergarten.svg.license b/assets/layers/childcare/kindergarten.svg.license similarity index 100% rename from assets/layers/kindergarten_childcare/kindergarten.svg.license rename to assets/layers/childcare/kindergarten.svg.license diff --git a/assets/layers/childcare/license_info.json b/assets/layers/childcare/license_info.json new file mode 100644 index 0000000000..a60a3105ac --- /dev/null +++ b/assets/layers/childcare/license_info.json @@ -0,0 +1,12 @@ +[ + { + "path": "childcare.svg", + "license": "CC-BY-4.0", + "authors": [ + "Diego Naive" + ], + "sources": [ + "https://thenounproject.com/icon/child-care-332981/" + ] + } +] \ No newline at end of file diff --git a/assets/layers/kindergarten_childcare/kindergarten_childcare.json b/assets/layers/kindergarten_childcare/kindergarten_childcare.json deleted file mode 100644 index 45d8c7baa5..0000000000 --- a/assets/layers/kindergarten_childcare/kindergarten_childcare.json +++ /dev/null @@ -1,243 +0,0 @@ -{ - "id": "kindergarten_childcare", - "name": { - "en": "Kindergartens and childcare", - "nl": "Kleuterscholen en kinderopvang", - "de": "Kindergärten und Kinderkrippen", - "ca": "Llars d'infants i guarderies", - "pl": "Przedszkola i żłobki", - "cs": "Mateřské školky a péče o děti", - "es": "Jardines de infancia y guarderías" - }, - "description": "Shows kindergartens and preschools. Both are grouped in one layer, as they are regularly confused with each other", - "source": { - "osmTags": { - "or": [ - "amenity=childcare", - "amenity=kindergarten", - "isced:level:2011=early_childhood" - ] - } - }, - "minzoom": 12, - "title": { - "mappings": [ - { - "if": "amenity=kindergarten", - "then": { - "en": "Kindergarten {name}", - "nl": "Kleuterschool {name}", - "de": "Kindergarten {name}", - "pl": "Przedszkole {name}", - "cs": "Mateřská škola {name}", - "es": "Jardín de infancia {name}" - } - }, - { - "if": "amenity=childcare", - "then": { - "en": "Childcare {name}", - "nl": "Kinderopvang {name}", - "de": "Kinderkrippe {name}", - "pl": "Żłobek {name}", - "cs": "Péče o děti {name}", - "es": "Guardería {name}" - } - } - ] - }, - "pointRendering": [ - { - "location": [ - "point", - "centroid" - ], - "label": { - "mappings": [ - { - "if": "name~*", - "then": "
{name}
" - } - ] - }, - "marker": [ - { - "icon": "circle", - "color": "white" - }, - { - "icon": { - "mappings": [ - { - "if": "amenity=kindergarten", - "then": "./assets/layers/kindergarten_childcare/kindergarten.svg" - }, - { - "if": "amenity=childcare", - "then": "./assets/layers/kindergarten_childcare/childcare.svg" - } - ] - } - } - ] - } - ], - "lineRendering": [ - { - "color": "#62fc6c", - "width": 1 - } - ], - "presets": [ - { - "title": { - "en": "a kindergarten", - "nl": "een kleuterschool", - "de": "einen Kindergarten", - "ru": "детский сад", - "ca": "una llar d'infants", - "pl": "przedszkole", - "cs": "mateřská školka", - "es": "un jardín de infancia" - }, - "description": "A kindergarten (also known as preschool) is a school where small kids receive early education.", - "tags": [ - "amenity=kindergarten", - "isced:level=0", - "isced:2011:level=early_childhood" - ] - }, - { - "title": { - "en": "a childcare", - "nl": "een kinderopvang", - "de": "eine Kinderkrippe", - "ca": "una guarderia", - "pl": "żłobek", - "cs": "péče o děti", - "es": "una guardería" - }, - "description": "A childcare (also known as a nursery or daycare) is a facility which looks after small kids, but does not offer them an education program.", - "tags": [ - "amenity=kindergarten" - ] - } - ], - "tagRenderings": [ - { - "id": "childcare-type", - "question": { - "en": "What type of facility is this?", - "nl": "Wat voor faciliteit is dit?", - "de": "Um welche Art von Einrichtung handelt es sich?", - "pl": "Jaki to rodzaj placówki?", - "ca": "Quin tipus d'instal·lació és aquesta?", - "cs": "O jaký typ zařízení se jedná?", - "es": "¿Qué tipo de centro es este?" - }, - "mappings": [ - { - "if": "amenity=kindergarten", - "then": { - "en": "This is a kindergarten (also known as preschool) where small kids receive early education.", - "nl": "Dit is een kleuterschool waar kindjes (voorbereidend) onderwijs krijgen.", - "de": "Dies ist ein Kindergarten (auch bekannt als Vorschule), in dem kleine Kinder eine Früherziehung erhalten.", - "ca": "Aquesta és una llar d'infants (també coneguda com a preescolar) on els nens petits reben educació primerenca.", - "pl": "To jest przedszkole, gdzie małe dzieci otrzymują wczesną edukację.", - "cs": "Jedná se o mateřskou školu (známou také jako předškolní zařízení), kde se malým dětem dostává raného vzdělání.", - "es": "Se trata de un jardín de infancia (también conocido como preescolar) donde los niños pequeños reciben educación temprana." - }, - "addExtraTags": [ - "isced:level=0", - "isced:2011:level=early_childhood" - ] - }, - { - "if": "amenity=childcare", - "then": { - "en": "This is a childcare facility, such as a nursery or daycare where small kids are looked after. They do not offer an education and are ofter run as private businesses", - "nl": "Dit is een kinderopvang (ook een creche of onthaalmoeder genoemd) waar er voor kleine kinderen gezorgd wordt. Onderwijs is niet de hoofdfocus.", - "de": "Dies ist eine Kinderbetreuungseinrichtung, z. B. ein Kinderkrippe oder eine Tagesmutter, in der Kleinkinder betreut werden. Sie bieten keine Ausbildung an und werden oft als Privatunternehmen geführt", - "cs": "Jedná se o zařízení péče o děti, jako jsou jesle nebo školka, kde se starají o malé děti. Neposkytují vzdělání a jsou často provozovány jako soukromé podniky", - "es": "Se trata de un centro de cuidado infantil, como una guardería o una sala de juegos donde se cuida a los niños pequeños. No ofrecen educación y suelen ser empresas privadas" - }, - "addExtraTags": [ - "isced:level=", - "isced:2011:level=" - ] - } - ] - }, - { - "id": "name", - "question": { - "en": "What is the name of this facility?", - "de": "Wie lautet der Name dieser Einrichtung?", - "nl": "Wat is de naam van deze faciliteit?", - "ca": "Com s'anomena aquesta instal·lació?", - "pl": "Jaka jest nazwa tej placówki?", - "cs": "Jak se toto zařízení jmenuje?", - "es": "¿Cuál es el nombre de este centro?" - }, - "render": { - "en": "This facility is named {name}", - "de": "Diese Einrichtung hat den Namen {name}", - "ca": "Aquesta instal·lació s'anomena {name}", - "nl": "Deze faciliteit heet {name}", - "pl": "Ta placówka nazywa się {name}", - "cs": "Toto zařízení se jmenuje {name}", - "es": "Este centro se llama {name}" - }, - "freeform": { - "key": "name" - } - }, - "website", - "email", - "phone", - { - "builtin": "opening_hours", - "override": { - "question": { - "en": "When is this childcare opened?", - "nl": "Wanneer is deze kinderopvang geopend?", - "de": "Wann ist diese Kinderbetreuung geöffnet?", - "pl": "W jakich godzinach ten żłobek jest otwarty?", - "cs": "Kdy je tato péče o děti otevřena?", - "es": "¿Cuándo abre esta guardería?" - }, - "condition": "amenity=childcare" - } - }, - { - "id": "capacity", - "question": { - "en": "How much kids (at most) can be enrolled here?", - "nl": "Hoeveel kinderen kunnen hier terecht?", - "de": "Wie viele Kinder können hier maximal angemeldet werden?", - "ca": "Quants nens (com a màxim) es poden inscriure aquí?", - "pl": "Jak wiele dzieci (maksymalnie) może być tutaj zapisanych?", - "cs": "Kolik dětí (maximálně) zde může být zapsáno?", - "es": "¿Cuántos niños (como máximo) pueden inscribirse aquí?" - }, - "render": { - "en": "This facility has room for {capacity} kids", - "nl": "Hier kunnen {capacity} kinderen terecht", - "de": "Diese Einrichtung bietet Platz für {capacity} Kinder", - "ca": "Aquesta instal·lació té espai per a {capacity} nens", - "pl": "Ta placówka ma miejsce na {capacity} dzieci", - "cs": "Toto zařízení má prostor pro {capacity} dětí", - "es": "Este centro tiene capacidad para {capacity} niños" - }, - "freeform": { - "key": "capacity", - "type": "pnat" - } - } - ], - "deletion": true, - "allowMove": { - "enableRelocation": true, - "enableImproveAccuracy": true - } -} diff --git a/assets/layers/kindergarten_childcare/license_info.json b/assets/layers/kindergarten_childcare/license_info.json deleted file mode 100644 index 9da793cbef..0000000000 --- a/assets/layers/kindergarten_childcare/license_info.json +++ /dev/null @@ -1,25 +0,0 @@ -[ - { - "path": "childcare.svg", - "license": "CC-BY-4.0", - "authors": [ - "Diego Naive" - ], - "sources": [ - "https://thenounproject.com/icon/child-care-332981/" - ] - }, - { - "path": "kindergarten.svg", - "license": "CC-BY-4.0", - "authors": [ - "Diego Naive", - "VideoPlasty", - "Pietervdvn" - ], - "sources": [ - "https://thenounproject.com/icon/child-care-332981/", - "https://commons.wikimedia.org/wiki/File:Blackboard_Flat_Icon_Vector.svg" - ] - } -] \ No newline at end of file diff --git a/assets/layers/kindergarten_childcare/kindergarten.svg b/assets/layers/school/kindergarten.svg similarity index 100% rename from assets/layers/kindergarten_childcare/kindergarten.svg rename to assets/layers/school/kindergarten.svg diff --git a/assets/layers/school/kindergarten.svg.license b/assets/layers/school/kindergarten.svg.license new file mode 100644 index 0000000000..5f03c70c71 --- /dev/null +++ b/assets/layers/school/kindergarten.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Diego Naive; VideoPlasty; Pietervdvn +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/layers/school/license_info.json b/assets/layers/school/license_info.json index 595580ece0..32e1284963 100644 --- a/assets/layers/school/license_info.json +++ b/assets/layers/school/license_info.json @@ -9,6 +9,19 @@ "https://labs.mapbox.com/maki-icons/" ] }, + { + "path": "kindergarten.svg", + "license": "CC-BY-4.0", + "authors": [ + "Diego Naive", + "VideoPlasty", + "Pietervdvn" + ], + "sources": [ + "https://thenounproject.com/icon/child-care-332981/", + "https://commons.wikimedia.org/wiki/File:Blackboard_Flat_Icon_Vector.svg" + ] + }, { "path": "school.svg", "license": "CC0-1.0", @@ -19,5 +32,29 @@ "https://github.com/ideditor/temaki", "https://ideditor.github.io/temaki/docs/" ] + }, + { + "path": "school_academic.svg", + "license": "CC0-1.0", + "authors": [ + "Temaki", + "Pietervdvn" + ], + "sources": [ + "https://github.com/ideditor/temaki", + "https://ideditor.github.io/temaki/docs/" + ] + }, + { + "path": "school_primary.svg", + "license": "CC0-1.0", + "authors": [ + "Temaki", + "Pietervdvn" + ], + "sources": [ + "https://github.com/ideditor/temaki", + "https://ideditor.github.io/temaki/docs/" + ] } ] \ No newline at end of file diff --git a/assets/layers/school/school.json b/assets/layers/school/school.json index 7b83fb6a77..c461de29e7 100644 --- a/assets/layers/school/school.json +++ b/assets/layers/school/school.json @@ -11,7 +11,12 @@ }, "description": "Schools giving primary and secondary education and post-secondary, non-tertiary education. Note that this level of education does not imply an age of the pupiles", "source": { - "osmTags": "amenity=school" + "osmTags": { + "or": [ + "amenity=school", + "amenity=kindergarten" + ] + } }, "calculatedTags": [ "_enclosing=enclosingFeatures(feat)('school').map(f => f.feat.properties.id)", @@ -58,7 +63,32 @@ "color": "white" }, { - "icon": "./assets/layers/school/school.svg" + "icon": { + "render": "./assets/layers/school/school.svg", + "mappings": [ + { + "if": { + "or": [ + "amenity=kindergarten", + "school=kindergarten" + ] + }, + "then": "./assets/layers/school/kindergarten.svg" + }, + { + "if": "school:orientation=academic", + "then": "./assets/layers/school/school_academic.svg" + }, + { + "if": "school~.*secondary.*", + "then": "./assets/layers/school/school.svg" + }, + { + "if": "school~.*primary.*", + "then": "./assets/layers/school/school_primary.svg" + } + ] + } } ] } @@ -70,6 +100,25 @@ } ], "presets": [ + { + "title": { + "en": "a primary or secondary school", + "nl": "een lagere of middelbare school", + "de": "eine Grundschule oder weiterführende Schule", + "ru": "детский сад", + "ca": "una escola de primària o secundària", + "pl": "przedszkole", + "cs": "základní nebo střední škola", + "es": "una escuela primaria o secundaria", + "fr": "une école primaire ou secondaire" + }, + "description": "A kindergarten (also known as preschool) is a school where small kids receive early education.", + "tags": [ + "amenity=kindergarten", + "school=kindergarten", + "isced:level=0" + ] + }, { "tags": [ "amenity=school", @@ -156,10 +205,10 @@ "cs": "Jaký stupeň vzdělání se na této škole poskytuje?", "es": "¿Qué nivel de educación se imparte en esta escuela?" }, - "filter": true, "mappings": [ { "if": "school=kindergarten", + "alsoShowIf": "amenity=kindergarten", "then": { "en": "This is a school with a kindergarten section where young kids receive some education which prepares reading and writing.", "nl": "Dit is een school die ook een kleuterschool bevat", @@ -172,6 +221,9 @@ }, { "if": "school=primary", + "addExtraTags": [ + "amenity=school" + ], "then": { "en": "This is a school where one learns primary skills such as basic literacy and numerical skills.
Pupils typically enroll from 6 years old till 12 years old
", "nl": "Dit is een lagere school", @@ -184,6 +236,9 @@ }, { "if": "school=secondary", + "addExtraTags": [ + "amenity=school" + ], "then": { "en": "This is a secondary school which offers all grades", "nl": "Dit is een middelbare school die alle schooljaren aanbiedt (dus van het eerste tot en met het zesde middelbaar)", @@ -196,6 +251,9 @@ }, { "if": "school=lower_secondary", + "addExtraTags": [ + "amenity=school" + ], "then": { "en": "This is a secondary school which does not have all grades, but offers first and second grade", "nl": "Dit is een middelbare school die niet alle schooljaren aanbiedt, maar wel het eerste en tweede middelbaar", @@ -208,6 +266,9 @@ }, { "if": "school=middle_secondary", + "addExtraTags": [ + "amenity=school" + ], "then": { "en": "This is a secondary school which does not have all grades, but offers third and fourth grade", "nl": "Dit is een middelbare school die niet alle schooljaren aanbiedt, maar wel het derde en vierde middelbaar", @@ -220,6 +281,9 @@ }, { "if": "school=upper_secondary", + "addExtraTags": [ + "amenity=school" + ], "then": { "en": "This is a secondary school which does not have all grades, but offers fifth and sixth grade", "nl": "Dit is een middelbare school die niet alle schooljaren aanbiedt, maar wel het vijfde en zesde middelbaar", @@ -232,6 +296,9 @@ }, { "if": "school=post_secondary", + "addExtraTags": [ + "amenity=school" + ], "then": { "en": "This school offers post-secondary education (e.g. a seventh or eight specialisation year)", "nl": "Deze school biedt post-secundair onderwijs (bijvoorbeeld specialisatiejaren)", @@ -245,6 +312,43 @@ ], "multiAnswer": true }, + { + "id": "orientation_belgium", + "question": { + "en": "What does this school train pupils for?", + "nl": "Waarop wordt een leerling voorbereid?" + }, + "condition": { + "or": [ + "school~i~(.+;)?upper_secondary(;.+)?", + "school~i~(.+;)?secondary(;.+)?" + ] + }, + "multiAnswer": true, + "mappings": [ + { + "if": "school:orientation=academic", + "then": { + "en": "Prepares for an academic study at university", + "nl": "Doorstroomfinaliteit: een opleiding hier bereidt voor op universitaire studies" + } + }, + { + "if": "school:orientation=professional", + "then": { + "en": "Prepares for a professional study at a college", + "nl": "Dubbele finaliteit: een opleiding hier bereidt voor op verdere studie (bv. aan een hogeschool of secundair-na-secundair) of op de arbeidsmarkt" + } + }, + { + "if": "school:orientation=vocational", + "then": { + "en": "Prepares for a job", + "nl": "Arbeidsfinaliteit: een opleiding hier bereidt voor op de arbeidsmarkt" + } + } + ] + }, { "id": "gender", "question": { @@ -410,7 +514,6 @@ }, { "id": "target-audience", - "condition": "school:for~*", "question": { "en": "Does this school target students with a special need? Which structural facilities does this school have?", "nl": "Richt deze school zich op leerlingen met een speciale zorgbehoefte? Welke structurele faciliteiten heeft deze school voor leerlingen met een extra zorgbehoefte?", @@ -435,21 +538,9 @@ "inline": true }, "mappings": [ - { - "if": "school:for=", - "then": { - "en": "This is a school where students study skills at their age-adequate level.
There are little or no special facilities to cater for students with special needs or facilities are ad-hoc
", - "nl": "Deze school richt zich op studenten zonder extra zorgbehoefte.
Il y a peu ou pas d'adaptations spéciales pour aider les étudiants ayant des besoins particuliers, ou les installations sont ad-hoc
Remark: isn't it contradictory to say there's no special facility + the facilities are ad-hoc?", - "ca": "Aquesta és una escola on els estudiants estudien habilitats al nivell adequat per a la seva edat.
Hi ha poques o cap instal·lació especial per atendre els estudiants amb necessitats especials o les instal·lacions són ad-hoc
", - "cs": "Jedná se o školu, kde studenti studují dovednosti na úrovni odpovídající jejich věku.
Existuje málo nebo žádná speciální zařízení pro studenty se speciálními potřebami nebo zařízení jsou ad hoc
", - "es": "Esta es una escuela donde los alumnos estudian habilidades en su nivel adecuado para su edad.
Hay pocas o ninguna instalación especial para atender a alumnos con necesidades especiales o las instalaciones son improvisadas
" - }, - "hideInAnswer": true - }, { "if": "school:for=mainstream", + "alsoShowIf": "school:for=", "then": { "en": "This is a school for students without special needs
This includes students who can follow the courses with small, ad hoc measurements
", "nl": "Deze school richt zich op studenten zonder extra zorgbehoefte
Esto incluye alumnos que pueden seguir los cursos con pequeñas medidas improvisadas
" } }, - { - "if": "school:for=adults", - "then": { - "en": "This is a school where adults are taught skills on the level as specified.", - "nl": "Deze school richt zich op volwassenen", - "de": "Dies ist eine Schule, in der Erwachsene auf dem angegebenen Niveau unterrichtet werden.", - "fr": "C'est un établissement où des adultes sont formés au niveau mentionné.", - "ca": "Aquesta és una escola on els adults reben competències al nivell especificat.", - "cs": "Jedná se o školu, kde se dospělí učí dovednostem na stanovené úrovni.", - "es": "Esta es una escuela donde se enseñan habilidades a adultos en el nivel especificado." - } - }, - { - "if": "school:for=autism", - "then": { - "en": "This is a school for students with autism", - "nl": "Deze school richt zich op studenten in het autisme-spectrum", - "de": "Dies ist eine Schule für Schüler mit Autismus", - "fr": "C'est un établissement scolaire pour les étudiants ayant un trouble du spectre de l’autisme (TSA)", - "ca": "Aquesta és una escola per a estudiants amb autisme", - "pl": "To jest szkoła dla uczniów z autyzmem", - "cs": "Jedná se o školu pro studenty s autismem", - "es": "Esta es una escuela para alumnos con autismo" - } - }, { "if": "school:for=learning_disabilities", "then": { @@ -606,7 +672,97 @@ } ], "filter": [ - "pedagogy" + "pedagogy", + { + "id": "level", + "options": [ + { + "question": { + "en": "All levels of education" + } + }, + { + "question": { + "en": "Has a kindergarten", + "nl": "Kleuterafdeling" + }, + "osmTags": { + "or": [ + "school~i~(.+;)?kindergarten(;.+)?", + "amenity=kindergarten" + ] + } + }, + { + "question": { + "en": "Primary school", + "nl": "Lagere school" + }, + "osmTags": "school~i~(.+;)?primary(;.+)?" + }, + { + "question": { + "en": "Secondary school with all grades", + "nl": "Secundaire school met alle graden" + }, + "osmTags": "school~i~(.+;)?secondary(;.+)?" + }, + { + "question": { + "en": "Has first grade", + "nl": "Heeft eerste graad" + }, + "osmTags": { + "or": [ + "school~i~(.+;)?lower_secondary(;.+)?", + "school~i~(.+;)?secondary(;.+)?" + ] + } + }, + { + "question": { + "en": "Has second grade", + "nl": "Heeft tweede graad" + }, + "osmTags": { + "or": [ + "school~i~(.+;)?middle_secondary(;.+)?", + "school~i~(.+;)?secondary(;.+)?" + ] + } + }, + { + "question": { + "en": "Has third grade", + "nl": "Heeft derde graad" + }, + "osmTags": { + "or": [ + "school~i~(.+;)?upper_secondary(;.+)?", + "school~i~(.+;)?secondary(;.+)?" + ] + } + }, + { + "question": { + "en": "This school offers post-secondary education (e.g. a seventh or eight specialisation year)", + "nl": "Heeft specialisatiejaar" + }, + "osmTags": "school~i~.+;)?post_secondary(;.+" + }, + { + "question": { + "en": "Unknown school level" + }, + "osmTags": { + "and": [ + "school=", + "amenity!=kindergarten" + ] + } + } + ] + } ], "allowMove": { "enableImproveAccuracy": true, diff --git a/assets/layers/school/school_academic.svg b/assets/layers/school/school_academic.svg new file mode 100644 index 0000000000..83bf866dfd --- /dev/null +++ b/assets/layers/school/school_academic.svg @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + diff --git a/assets/layers/school/school_academic.svg.license b/assets/layers/school/school_academic.svg.license new file mode 100644 index 0000000000..1456fdbd68 --- /dev/null +++ b/assets/layers/school/school_academic.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Temaki; Pietervdvn +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/school/school_primary.svg b/assets/layers/school/school_primary.svg new file mode 100644 index 0000000000..5e712ffdc6 --- /dev/null +++ b/assets/layers/school/school_primary.svg @@ -0,0 +1,153 @@ + + diff --git a/assets/layers/school/school_primary.svg.license b/assets/layers/school/school_primary.svg.license new file mode 100644 index 0000000000..1456fdbd68 --- /dev/null +++ b/assets/layers/school/school_primary.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Temaki; Pietervdvn +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/education/education.json b/assets/themes/education/education.json index 6a03421b9f..5573a045ca 100644 --- a/assets/themes/education/education.json +++ b/assets/themes/education/education.json @@ -36,9 +36,8 @@ }, "icon": "./assets/layers/school/college.svg", "layers": [ - "tertiary_education", + "childcare", "school", - "kindergarten_childcare" - ], - "#layers:note": "kindergarten_childcare must be _below_ school, as it can 'catch' primary schools which do have an integrated preschool" -} \ No newline at end of file + "tertiary_education" + ] +} diff --git a/langs/layers/ca.json b/langs/layers/ca.json index 00e8634299..771d597f2e 100644 --- a/langs/layers/ca.json +++ b/langs/layers/ca.json @@ -2150,6 +2150,24 @@ } } }, + "childcare": { + "name": "Guarderies d'infants", + "presets": { + "0": { + "title": "una guarderia" + } + }, + "tagRenderings": { + "capacity": { + "question": "Quants nens (com a màxim) es poden inscriure aquí?", + "render": "Aquesta instal·lació té espai per a {capacity} nens" + }, + "name": { + "question": "Com s'anomena aquesta instal·lació?", + "render": "Aquesta instal·lació s'anomena {name}" + } + } + }, "climbing": { "description": "Una capa fictícia que conté renderització d'etiquetes compartides entre les capes d'escalada", "tagRenderings": { @@ -4865,35 +4883,6 @@ "render": "Vorada" } }, - "kindergarten_childcare": { - "name": "Llars d'infants i guarderies", - "presets": { - "0": { - "title": "una llar d'infants" - }, - "1": { - "title": "una guarderia" - } - }, - "tagRenderings": { - "capacity": { - "question": "Quants nens (com a màxim) es poden inscriure aquí?", - "render": "Aquesta instal·lació té espai per a {capacity} nens" - }, - "childcare-type": { - "mappings": { - "0": { - "then": "Aquesta és una llar d'infants (també coneguda com a preescolar) on els nens petits reben educació primerenca." - } - }, - "question": "Quin tipus d'instal·lació és aquesta?" - }, - "name": { - "question": "Com s'anomena aquesta instal·lació?", - "render": "Aquesta instal·lació s'anomena {name}" - } - } - }, "last_click": { "pointRendering": { "0": { @@ -6976,6 +6965,9 @@ "presets": { "0": { "title": "una escola de primària o secundària" + }, + "1": { + "title": "una escola de primària o secundària" } }, "tagRenderings": { @@ -7043,30 +7035,21 @@ "target-audience": { "mappings": { "0": { - "then": "Aquesta és una escola on els estudiants estudien habilitats al nivell adequat per a la seva edat.
Hi ha poques o cap instal·lació especial per atendre els estudiants amb necessitats especials o les instal·lacions són ad-hoc
" - }, - "1": { "then": "Aquesta és una escola per a estudiants sense necessitats especials
Açò inclou alumnes que poden seguir les classes amb petites mesures
" }, - "2": { - "then": "Aquesta és una escola on els adults reben competències al nivell especificat." - }, - "3": { - "then": "Aquesta és una escola per a estudiants amb autisme" - }, - "4": { + "1": { "then": "Aquesta és una escola per a estudiants amb dificultats de l'aprenentatge" }, - "5": { + "2": { "then": "Aquesta és una escola per a estudiants cecs o estudiants amb deficiències visuals" }, - "6": { + "3": { "then": "Aquesta és una escola per a estudiants sords o amb dificultats auditives" }, - "7": { + "4": { "then": "Aquesta és una escola per a estudiants amb discapacitats" }, - "8": { + "5": { "then": "Aquesta és una escola per a estudiants amb necessitats especials" } }, diff --git a/langs/layers/cs.json b/langs/layers/cs.json index a08e559d7b..915c4e972e 100644 --- a/langs/layers/cs.json +++ b/langs/layers/cs.json @@ -2588,6 +2588,35 @@ } } }, + "childcare": { + "presets": { + "0": { + "title": "péče o děti" + } + }, + "tagRenderings": { + "capacity": { + "question": "Kolik dětí (maximálně) zde může být zapsáno?", + "render": "Toto zařízení má prostor pro {capacity} dětí" + }, + "name": { + "question": "Jak se toto zařízení jmenuje?", + "render": "Toto zařízení se jmenuje {name}" + }, + "opening_hours": { + "override": { + "question": "Kdy je tato péče o děti otevřena?" + } + } + }, + "title": { + "mappings": { + "0": { + "then": "Péče o děti {name}" + } + } + } + }, "cinema": { "name": "Kino", "tagRenderings": { @@ -5750,53 +5779,6 @@ "render": "Obrubník" } }, - "kindergarten_childcare": { - "name": "Mateřské školky a péče o děti", - "presets": { - "0": { - "title": "mateřská školka" - }, - "1": { - "title": "péče o děti" - } - }, - "tagRenderings": { - "capacity": { - "question": "Kolik dětí (maximálně) zde může být zapsáno?", - "render": "Toto zařízení má prostor pro {capacity} dětí" - }, - "childcare-type": { - "mappings": { - "0": { - "then": "Jedná se o mateřskou školu (známou také jako předškolní zařízení), kde se malým dětem dostává raného vzdělání." - }, - "1": { - "then": "Jedná se o zařízení péče o děti, jako jsou jesle nebo školka, kde se starají o malé děti. Neposkytují vzdělání a jsou často provozovány jako soukromé podniky" - } - }, - "question": "O jaký typ zařízení se jedná?" - }, - "name": { - "question": "Jak se toto zařízení jmenuje?", - "render": "Toto zařízení se jmenuje {name}" - }, - "opening_hours": { - "override": { - "question": "Kdy je tato péče o děti otevřena?" - } - } - }, - "title": { - "mappings": { - "0": { - "then": "Mateřská škola {name}" - }, - "1": { - "then": "Péče o děti {name}" - } - } - } - }, "last_click": { "pointRendering": { "0": { @@ -7965,6 +7947,9 @@ "presets": { "0": { "title": "základní nebo střední škola" + }, + "1": { + "title": "základní nebo střední škola" } }, "tagRenderings": { @@ -8065,30 +8050,21 @@ "target-audience": { "mappings": { "0": { - "then": "Jedná se o školu, kde studenti studují dovednosti na úrovni odpovídající jejich věku.
Existuje málo nebo žádná speciální zařízení pro studenty se speciálními potřebami nebo zařízení jsou ad hoc
" - }, - "1": { "then": "Toto je škola pro studenty bez speciálních potřeb
To zahrnuje studenty, kteří mohou absolvovat kurzy s malými, ad hoc měřeními
" }, - "2": { - "then": "Jedná se o školu, kde se dospělí učí dovednostem na stanovené úrovni." - }, - "3": { - "then": "Jedná se o školu pro studenty s autismem" - }, - "4": { + "1": { "then": "Jedná se o školu pro žáky s poruchami učení" }, - "5": { + "2": { "then": "Jedná se o školu pro nevidomé studenty nebo studenty se zrakovým postižením" }, - "6": { + "3": { "then": "Jedná se o školu pro neslyšící studenty nebo studenty se sluchovým postižením" }, - "7": { + "4": { "then": "Jedná se o školu pro studenty se zdravotním postižením" }, - "8": { + "5": { "then": "Jedná se o školu pro žáky se speciálními potřebami" } }, diff --git a/langs/layers/de.json b/langs/layers/de.json index fc5d6a000f..f829711d44 100644 --- a/langs/layers/de.json +++ b/langs/layers/de.json @@ -2874,6 +2874,36 @@ "render": "Ladestation" } }, + "childcare": { + "name": "Kinderkrippen", + "presets": { + "0": { + "title": "eine Kinderkrippe" + } + }, + "tagRenderings": { + "capacity": { + "question": "Wie viele Kinder können hier maximal angemeldet werden?", + "render": "Diese Einrichtung bietet Platz für {capacity} Kinder" + }, + "name": { + "question": "Wie lautet der Name dieser Einrichtung?", + "render": "Diese Einrichtung hat den Namen {name}" + }, + "opening_hours": { + "override": { + "question": "Wann ist diese Kinderbetreuung geöffnet?" + } + } + }, + "title": { + "mappings": { + "0": { + "then": "Kinderkrippe {name}" + } + } + } + }, "cinema": { "description": "Ein Ort, an dem Filme gezeigt werden, die der Öffentlichkeit gegen Gebühr zugänglich sind.", "name": "Kino", @@ -6573,53 +6603,6 @@ "render": "Bordstein" } }, - "kindergarten_childcare": { - "name": "Kindergärten und Kinderkrippen", - "presets": { - "0": { - "title": "einen Kindergarten" - }, - "1": { - "title": "eine Kinderkrippe" - } - }, - "tagRenderings": { - "capacity": { - "question": "Wie viele Kinder können hier maximal angemeldet werden?", - "render": "Diese Einrichtung bietet Platz für {capacity} Kinder" - }, - "childcare-type": { - "mappings": { - "0": { - "then": "Dies ist ein Kindergarten (auch bekannt als Vorschule), in dem kleine Kinder eine Früherziehung erhalten." - }, - "1": { - "then": "Dies ist eine Kinderbetreuungseinrichtung, z. B. ein Kinderkrippe oder eine Tagesmutter, in der Kleinkinder betreut werden. Sie bieten keine Ausbildung an und werden oft als Privatunternehmen geführt" - } - }, - "question": "Um welche Art von Einrichtung handelt es sich?" - }, - "name": { - "question": "Wie lautet der Name dieser Einrichtung?", - "render": "Diese Einrichtung hat den Namen {name}" - }, - "opening_hours": { - "override": { - "question": "Wann ist diese Kinderbetreuung geöffnet?" - } - } - }, - "title": { - "mappings": { - "0": { - "then": "Kindergarten {name}" - }, - "1": { - "then": "Kinderkrippe {name}" - } - } - } - }, "last_click": { "pointRendering": { "0": { @@ -9456,6 +9439,9 @@ "presets": { "0": { "title": "eine Grundschule oder weiterführende Schule" + }, + "1": { + "title": "eine Grundschule oder weiterführende Schule" } }, "tagRenderings": { @@ -9556,30 +9542,21 @@ "target-audience": { "mappings": { "0": { - "then": "Es handelt sich um eine Schule, in der die Schüler Fähigkeiten auf ihrem altersgemäßen Niveau erlernen.
Es gibt wenig oder keine speziellen Einrichtungen für Schüler mit besonderen Bedürfnissen oder die Einrichtungen sind ad-hoc
" - }, - "1": { "then": "Dies ist eine Schule für Schüler ohne besondere Bedürfnisse
Dazu gehören auch Schüler, die den Kursen mit kleinen Ad-hoc-Maßnahmen folgen können
" }, - "2": { - "then": "Dies ist eine Schule, in der Erwachsene auf dem angegebenen Niveau unterrichtet werden." - }, - "3": { - "then": "Dies ist eine Schule für Schüler mit Autismus" - }, - "4": { + "1": { "then": "Dies ist eine Schule für Schüler mit Lernschwierigkeiten" }, - "5": { + "2": { "then": "Dies ist eine Schule für blinde oder sehbehinderte Schüler" }, - "6": { + "3": { "then": "Dies ist eine Schule für gehörlose oder hörgeschädigte Schüler" }, - "7": { + "4": { "then": "Dies ist eine Schule für Schüler mit Behinderungen" }, - "8": { + "5": { "then": "Dies ist eine Schule für Schüler mit besonderen Bedürfnissen" } }, diff --git a/langs/layers/en.json b/langs/layers/en.json index ac91e90a73..1e7167df1e 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -2874,6 +2874,36 @@ "render": "Charging station" } }, + "childcare": { + "name": "Childcare", + "presets": { + "0": { + "title": "a childcare" + } + }, + "tagRenderings": { + "capacity": { + "question": "How much kids (at most) can be enrolled here?", + "render": "This facility has room for {capacity} kids" + }, + "name": { + "question": "What is the name of this facility?", + "render": "This facility is named {name}" + }, + "opening_hours": { + "override": { + "question": "When is this childcare opened?" + } + } + }, + "title": { + "mappings": { + "0": { + "then": "Childcare {name}" + } + } + } + }, "cinema": { "description": "A place showing movies (films), generally open to the public for a fee. Commonly referred to as a movie theater in the US.", "name": "Cinema", @@ -6604,53 +6634,6 @@ "render": "Kerb" } }, - "kindergarten_childcare": { - "name": "Kindergartens and childcare", - "presets": { - "0": { - "title": "a kindergarten" - }, - "1": { - "title": "a childcare" - } - }, - "tagRenderings": { - "capacity": { - "question": "How much kids (at most) can be enrolled here?", - "render": "This facility has room for {capacity} kids" - }, - "childcare-type": { - "mappings": { - "0": { - "then": "This is a kindergarten (also known as preschool) where small kids receive early education." - }, - "1": { - "then": "This is a childcare facility, such as a nursery or daycare where small kids are looked after. They do not offer an education and are ofter run as private businesses" - } - }, - "question": "What type of facility is this?" - }, - "name": { - "question": "What is the name of this facility?", - "render": "This facility is named {name}" - }, - "opening_hours": { - "override": { - "question": "When is this childcare opened?" - } - } - }, - "title": { - "mappings": { - "0": { - "then": "Kindergarten {name}" - }, - "1": { - "then": "Childcare {name}" - } - } - } - }, "last_click": { "pointRendering": { "0": { @@ -9483,10 +9466,46 @@ } }, "school": { + "filter": { + "1": { + "options": { + "0": { + "question": "All levels of education" + }, + "1": { + "question": "Has a kindergarten" + }, + "2": { + "question": "Primary school" + }, + "3": { + "question": "Secondary school with all grades" + }, + "4": { + "question": "Has first grade" + }, + "5": { + "question": "Has second grade" + }, + "6": { + "question": "Has third grade" + }, + "7": { + "question": "This school offers post-secondary education (e.g. a seventh or eight specialisation year)" + }, + "8": { + "question": "Unknown school level" + } + } + } + }, "name": "Primary and secondary schools", "presets": { "0": { "title": "a primary or secondary school" + }, + "1": { + "title": "a primary or secondary school" } }, "tagRenderings": { @@ -9537,6 +9556,20 @@ }, "question": "Which genders can enroll at this school?" }, + "orientation_belgium": { + "mappings": { + "0": { + "then": "Prepares for an academic study at university" + }, + "1": { + "then": "Prepares for a professional study at a college" + }, + "2": { + "then": "Prepares for a job" + } + }, + "question": "What does this school train pupils for?" + }, "pedagogy": { "mappings": { "0": { @@ -9587,30 +9620,21 @@ "target-audience": { "mappings": { "0": { - "then": "This is a school where students study skills at their age-adequate level.
There are little or no special facilities to cater for students with special needs or facilities are ad-hoc
" - }, - "1": { "then": "This is a school for students without special needs
This includes students who can follow the courses with small, ad hoc measurements
" }, - "2": { - "then": "This is a school where adults are taught skills on the level as specified." - }, - "3": { - "then": "This is a school for students with autism" - }, - "4": { + "1": { "then": "This is a school for students with learning disabilities" }, - "5": { + "2": { "then": "This is a school for blind students or students with sight impairments" }, - "6": { + "3": { "then": "This is a school for deaf students or students with hearing impairments" }, - "7": { + "4": { "then": "This is a school for students with disabilities" }, - "8": { + "5": { "then": "This is a school for students with special needs" } }, diff --git a/langs/layers/es.json b/langs/layers/es.json index db6281c6a8..4e006e807a 100644 --- a/langs/layers/es.json +++ b/langs/layers/es.json @@ -2815,6 +2815,35 @@ "render": "Punto de carga" } }, + "childcare": { + "presets": { + "0": { + "title": "una guardería" + } + }, + "tagRenderings": { + "capacity": { + "question": "¿Cuántos niños (como máximo) pueden inscribirse aquí?", + "render": "Este centro tiene capacidad para {capacity} niños" + }, + "name": { + "question": "¿Cuál es el nombre de este centro?", + "render": "Este centro se llama {name}" + }, + "opening_hours": { + "override": { + "question": "¿Cuándo abre esta guardería?" + } + } + }, + "title": { + "mappings": { + "0": { + "then": "Guardería {name}" + } + } + } + }, "cinema": { "description": "Un lugar donde se proyectan películas (cine), generalmente abierto al público por una tarifa Comúnmente conocido como cine en Estados Unidos.", "name": "Cine", @@ -6416,53 +6445,6 @@ "render": "Bordillo" } }, - "kindergarten_childcare": { - "name": "Jardines de infancia y guarderías", - "presets": { - "0": { - "title": "un jardín de infancia" - }, - "1": { - "title": "una guardería" - } - }, - "tagRenderings": { - "capacity": { - "question": "¿Cuántos niños (como máximo) pueden inscribirse aquí?", - "render": "Este centro tiene capacidad para {capacity} niños" - }, - "childcare-type": { - "mappings": { - "0": { - "then": "Se trata de un jardín de infancia (también conocido como preescolar) donde los niños pequeños reciben educación temprana." - }, - "1": { - "then": "Se trata de un centro de cuidado infantil, como una guardería o una sala de juegos donde se cuida a los niños pequeños. No ofrecen educación y suelen ser empresas privadas" - } - }, - "question": "¿Qué tipo de centro es este?" - }, - "name": { - "question": "¿Cuál es el nombre de este centro?", - "render": "Este centro se llama {name}" - }, - "opening_hours": { - "override": { - "question": "¿Cuándo abre esta guardería?" - } - } - }, - "title": { - "mappings": { - "0": { - "then": "Jardín de infancia {name}" - }, - "1": { - "then": "Guardería {name}" - } - } - } - }, "last_click": { "pointRendering": { "0": { @@ -9269,6 +9251,9 @@ "presets": { "0": { "title": "una escuela primaria o secundaria" + }, + "1": { + "title": "una escuela primaria o secundaria" } }, "tagRenderings": { @@ -9369,30 +9354,21 @@ "target-audience": { "mappings": { "0": { - "then": "Esta es una escuela donde los alumnos estudian habilidades en su nivel adecuado para su edad.
Hay pocas o ninguna instalación especial para atender a alumnos con necesidades especiales o las instalaciones son improvisadas
" - }, - "1": { "then": "Esta es una escuela para alumnos sin necesidades especiales
Esto incluye alumnos que pueden seguir los cursos con pequeñas medidas improvisadas
" }, - "2": { - "then": "Esta es una escuela donde se enseñan habilidades a adultos en el nivel especificado." - }, - "3": { - "then": "Esta es una escuela para alumnos con autismo" - }, - "4": { + "1": { "then": "Esta es una escuela para alumnos con dificultades de aprendizaje" }, - "5": { + "2": { "then": "Esta es una escuela para alumnos ciegos o con discapacidad visual" }, - "6": { + "3": { "then": "Esta es una escuela para alumnos sordos o con discapacidad auditiva" }, - "7": { + "4": { "then": "Esta es una escuela para alumnos con discapacidad" }, - "8": { + "5": { "then": "Esta es una escuela para alumnos con necesidades especiales" } }, diff --git a/langs/layers/fr.json b/langs/layers/fr.json index 863e132847..14599fc6ff 100644 --- a/langs/layers/fr.json +++ b/langs/layers/fr.json @@ -5693,6 +5693,9 @@ "presets": { "0": { "title": "une école primaire ou secondaire" + }, + "1": { + "title": "une école primaire ou secondaire" } }, "tagRenderings": { @@ -5760,30 +5763,21 @@ "target-audience": { "mappings": { "0": { - "then": "C'est un établissement scolaire où les étudiants acquièrent des compétences à un niveau adapté à leur âge.
Il y a peu ou pas d'adaptations spéciales pour aider les étudiants ayant des besoins particuliers, ou les installations sont ad-hoc
Remark: isn't it contradictory to say there's no special facility + the facilities are ad-hoc?" - }, - "1": { "then": "C'est un établissement scolaire pour étudiants sans besoins particuliers.
Sont inclus les étudiants qui peuvent suivre les cours avec de petites adaptations.
" }, - "2": { - "then": "C'est un établissement où des adultes sont formés au niveau mentionné." - }, - "3": { - "then": "C'est un établissement scolaire pour les étudiants ayant un trouble du spectre de l’autisme (TSA)" - }, - "4": { + "1": { "then": "C'est un établissement scolaire pour les étudiants ayant des troubles d’apprentissage" }, - "5": { + "2": { "then": "C'est un établissement scolaire pour les étudiants aveugles ou malvoyants" }, - "6": { + "3": { "then": "C'est un établissement scolaire pour les étudiants sourds ou malentendants" }, - "7": { + "4": { "then": "C'est un établissement scolaire pour les étudiants en situation de handicap" }, - "8": { + "5": { "then": "C'est un établissement scolaire pour les étudiants ayant des besoins particuliers" } }, diff --git a/langs/layers/nl.json b/langs/layers/nl.json index 347a5ca909..95b55731d2 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -2049,6 +2049,9 @@ }, "title": { "mappings": { + "0": { + "then": "{name}" + }, "1": { "then": "Vogelkijkhut {name}" }, @@ -2816,6 +2819,36 @@ "render": "Oplaadpunt" } }, + "childcare": { + "name": "Kinderopvang", + "presets": { + "0": { + "title": "een kinderopvang" + } + }, + "tagRenderings": { + "capacity": { + "question": "Hoeveel kinderen kunnen hier terecht?", + "render": "Hier kunnen {capacity} kinderen terecht" + }, + "name": { + "question": "Wat is de naam van deze faciliteit?", + "render": "Deze faciliteit heet {name}" + }, + "opening_hours": { + "override": { + "question": "Wanneer is deze kinderopvang geopend?" + } + } + }, + "title": { + "mappings": { + "0": { + "then": "Kinderopvang {name}" + } + } + } + }, "cinema": { "description": "Een plaats die films toont, meestal open voor het publiek tegen een vergoeding.", "name": "Bioscoop", @@ -5915,53 +5948,6 @@ "render": "Stoeprand" } }, - "kindergarten_childcare": { - "name": "Kleuterscholen en kinderopvang", - "presets": { - "0": { - "title": "een kleuterschool" - }, - "1": { - "title": "een kinderopvang" - } - }, - "tagRenderings": { - "capacity": { - "question": "Hoeveel kinderen kunnen hier terecht?", - "render": "Hier kunnen {capacity} kinderen terecht" - }, - "childcare-type": { - "mappings": { - "0": { - "then": "Dit is een kleuterschool waar kindjes (voorbereidend) onderwijs krijgen." - }, - "1": { - "then": "Dit is een kinderopvang (ook een creche of onthaalmoeder genoemd) waar er voor kleine kinderen gezorgd wordt. Onderwijs is niet de hoofdfocus." - } - }, - "question": "Wat voor faciliteit is dit?" - }, - "name": { - "question": "Wat is de naam van deze faciliteit?", - "render": "Deze faciliteit heet {name}" - }, - "opening_hours": { - "override": { - "question": "Wanneer is deze kinderopvang geopend?" - } - } - }, - "title": { - "mappings": { - "0": { - "then": "Kleuterschool {name}" - }, - "1": { - "then": "Kinderopvang {name}" - } - } - } - }, "last_click": { "pointRendering": { "0": { @@ -6373,6 +6359,11 @@ } }, "title": { + "mappings": { + "0": { + "then": "{name}" + } + }, "render": "Natuurgebied" } }, @@ -6904,6 +6895,21 @@ "render": "Picknicktafel" } }, + "play_forest": { + "description": "Een speelbos is een vrij toegankelijke zone in een bos", + "name": "Speelbossen", + "title": { + "mappings": { + "0": { + "then": "{name}" + }, + "1": { + "then": "Speelbos {name}" + } + }, + "render": "Speelbos" + } + }, "playground": { "deletion": { "nonDeleteMappings": { @@ -8082,10 +8088,40 @@ } }, "school": { + "filter": { + "1": { + "options": { + "1": { + "question": "Kleuterafdeling" + }, + "2": { + "question": "Lagere school" + }, + "3": { + "question": "Secundaire school met alle graden" + }, + "4": { + "question": "Heeft eerste graad" + }, + "5": { + "question": "Heeft tweede graad" + }, + "6": { + "question": "Heeft derde graad" + }, + "7": { + "question": "Heeft specialisatiejaar" + } + } + } + }, "name": "Lagere en middelbare scholen", "presets": { "0": { "title": "een lagere of middelbare school" + }, + "1": { + "title": "een lagere of middelbare school" } }, "tagRenderings": { @@ -8136,6 +8172,20 @@ }, "question": "Mogen jongens en meisjes les volgen op deze school?" }, + "orientation_belgium": { + "mappings": { + "0": { + "then": "Doorstroomfinaliteit: een opleiding hier bereidt voor op universitaire studies" + }, + "1": { + "then": "Dubbele finaliteit: een opleiding hier bereidt voor op verdere studie (bv. aan een hogeschool of secundair-na-secundair) of op de arbeidsmarkt" + }, + "2": { + "then": "Arbeidsfinaliteit: een opleiding hier bereidt voor op de arbeidsmarkt" + } + }, + "question": "Waarop wordt een leerling voorbereid?" + }, "school-language": { "render": { "special": { @@ -8151,30 +8201,21 @@ "target-audience": { "mappings": { "0": { - "then": "Deze school richt zich op studenten zonder extra zorgbehoefte.
Dit omvat leerlingen waarbij kleine, ad-hoc maatregelen volstaan om de lessen te volgen.
" }, - "2": { - "then": "Deze school richt zich op volwassenen" - }, - "3": { - "then": "Deze school richt zich op studenten in het autisme-spectrum" - }, - "4": { + "1": { "then": "Deze school richt zich op leerlingen met een leerprobleem" }, - "5": { + "2": { "then": "Deze school richt zich op blinde en slechtziende studenten" }, - "6": { + "3": { "then": "Deze school richt zich op dove en hardhorende studenten" }, - "7": { + "4": { "then": "Deze school richt zich op studenten met een beperking" }, - "8": { + "5": { "then": "Deze school richt zich op studenten met extra zorgbehoeften" } }, @@ -8470,6 +8511,9 @@ }, "title": { "mappings": { + "0": { + "then": "{name}" + }, "1": { "then": "Voetpad" }, @@ -10635,13 +10679,25 @@ } }, "village_green": { - "description": "Een laag die dorpsgroen toont (gemeenschapsgroen, maar niet echt een park)" + "description": "Een laag die dorpsgroen toont (gemeenschapsgroen, maar niet echt een park)", + "name": "Speelweide", + "title": { + "mappings": { + "0": { + "then": "{name}" + } + }, + "render": "Speelweide" + } }, "visitor_information_centre": { "description": "Een bezoekerscentrum biedt informatie over een specifieke attractie of bezienswaardigheid waar het is gevestigd.", "name": "Bezoekerscentrum", "title": { "mappings": { + "0": { + "then": "{name:nl}" + }, "1": { "then": "{name}" } @@ -10871,4 +10927,4 @@ "render": "windturbine" } } -} +} \ No newline at end of file diff --git a/langs/layers/pl.json b/langs/layers/pl.json index c5671dfa7d..a9408413dd 100644 --- a/langs/layers/pl.json +++ b/langs/layers/pl.json @@ -1247,6 +1247,35 @@ } } }, + "childcare": { + "presets": { + "0": { + "title": "żłobek" + } + }, + "tagRenderings": { + "capacity": { + "question": "Jak wiele dzieci (maksymalnie) może być tutaj zapisanych?", + "render": "Ta placówka ma miejsce na {capacity} dzieci" + }, + "name": { + "question": "Jaka jest nazwa tej placówki?", + "render": "Ta placówka nazywa się {name}" + }, + "opening_hours": { + "override": { + "question": "W jakich godzinach ten żłobek jest otwarty?" + } + } + }, + "title": { + "mappings": { + "0": { + "then": "Żłobek {name}" + } + } + } + }, "climbing_area": { "tagRenderings": { "Rock type (crag/rock/cliff only)": { @@ -2377,50 +2406,6 @@ "render": "Krawężnik" } }, - "kindergarten_childcare": { - "name": "Przedszkola i żłobki", - "presets": { - "0": { - "title": "przedszkole" - }, - "1": { - "title": "żłobek" - } - }, - "tagRenderings": { - "capacity": { - "question": "Jak wiele dzieci (maksymalnie) może być tutaj zapisanych?", - "render": "Ta placówka ma miejsce na {capacity} dzieci" - }, - "childcare-type": { - "mappings": { - "0": { - "then": "To jest przedszkole, gdzie małe dzieci otrzymują wczesną edukację." - } - }, - "question": "Jaki to rodzaj placówki?" - }, - "name": { - "question": "Jaka jest nazwa tej placówki?", - "render": "Ta placówka nazywa się {name}" - }, - "opening_hours": { - "override": { - "question": "W jakich godzinach ten żłobek jest otwarty?" - } - } - }, - "title": { - "mappings": { - "0": { - "then": "Przedszkole {name}" - }, - "1": { - "then": "Żłobek {name}" - } - } - } - }, "last_click": { "pointRendering": { "0": { @@ -3466,6 +3451,11 @@ } }, "school": { + "presets": { + "0": { + "title": "przedszkole" + } + }, "tagRenderings": { "school-language": { "render": { @@ -3482,15 +3472,12 @@ "target-audience": { "mappings": { "3": { - "then": "To jest szkoła dla uczniów z autyzmem" - }, - "6": { "then": "To jest szkoła dla uczniów głuchych i słabosłyszących" }, - "7": { + "4": { "then": "To jest szkoła dla uczniów z niepełnosprawnościami" }, - "8": { + "5": { "then": "To jest szkoła dla uczniów z specjalnymi potrzebami" } } diff --git a/langs/layers/ru.json b/langs/layers/ru.json index f535b0dcb9..bf3110103f 100644 --- a/langs/layers/ru.json +++ b/langs/layers/ru.json @@ -1284,13 +1284,6 @@ "render": "Бордюр" } }, - "kindergarten_childcare": { - "presets": { - "0": { - "title": "детский сад" - } - } - }, "map": { "name": "Карты", "presets": { @@ -1637,6 +1630,13 @@ } } }, + "school": { + "presets": { + "0": { + "title": "детский сад" + } + } + }, "shops": { "description": "Магазин", "name": "Магазин", diff --git a/langs/themes/nl.json b/langs/themes/nl.json index 8170fe8912..fc4637708f 100644 --- a/langs/themes/nl.json +++ b/langs/themes/nl.json @@ -653,8 +653,37 @@ "building type": { "question": "Wat voor soort gebouw is dit?" }, + "grb-fixme": { + "mappings": { + "0": { + "then": "Geen fixme" + } + }, + "question": "Wat zegt de fixme?", + "render": "De fixme is {fixme}" + }, + "grb-housenumber": { + "mappings": { + "0": { + "then": "Geen huisnummer" + } + }, + "question": "Wat is het huisnummer?", + "render": "Het huisnummer is {addr:housenumber}" + }, + "grb-min-level": { + "question": "Hoeveel verdiepingen ontbreken?", + "render": "Dit gebouw begint maar op de {building:min_level} verdieping" + }, "grb-reference": { "render": "Werd geïmporteerd vanuit GRB, het referentienummer is {source:geometry:ref}" + }, + "grb-street": { + "question": "Wat is de straat?", + "render": "De straat is {addr:street}" + }, + "grb-unit": { + "render": "De wooneenheid-aanduiding is {addr:unit} " } } }, @@ -671,8 +700,35 @@ } } } + }, + "5": { + "override": { + "tagRenderings+": { + "0": { + "mappings": { + "0": { + "then": "Geen omliggend OSM-gebouw gevonden" + } + } + }, + "3": { + "mappings": { + "0": { + "then": "Geen omliggend OSM-gebouw gevonden. Een omliggend gebouw is nodig om dit punt als adres punt toe te voegen.
Importeer eerst de gebouwen. Vernieuw dan de pagina om losse adressen toe te voegen
" + } + }, + "render": { + "special": { + "text": "Voeg dit adres als een nieuw adrespunt toe" + } + } + } + } + } } - } + }, + "shortDescription": "Grb import helper tool", + "title": "GRB import helper" }, "guideposts": { "description": "Wegwijzers (ook wel handwijzer genoemd) zijn vaak te vinden langs officiële wandel-, fiets-, ski- of paardrijroutes om de richtingen naar verschillende bestemmingen aan te geven. Vaak zijn ze vernoemd naar een regio of plaats en geven ze de hoogte aan.\n\nDe positie van een wegwijzer kan door een wandelaar/fietser/renner/skiër worden gebruikt als bevestiging van de huidige positie, vooral als ze een gedrukte kaart zonder GPS-ontvanger gebruiken. ", @@ -1100,6 +1156,11 @@ }, "title": "Dierenartsen, hondenloopzones en andere huisdiervriendelijke plaatsen" }, + "play_forests": { + "description": "Een speelbos is een zone in een bos die vrij toegankelijk is voor spelende kinderen. Deze wordt in bossen van het Agentschap Natuur en bos altijd aangeduid met het overeenkomstige bord.", + "shortDescription": "Deze kaart toont speelbossen", + "title": "Speelbossen" + }, "playgrounds": { "description": "Op deze kaart vind je speeltuinen en kan je zelf meer informatie en foto's toevoegen", "shortDescription": "Een kaart met speeltuinen", @@ -1173,6 +1234,47 @@ "description": "Alles om te skiën", "title": "Skipistes en kabelbanen" }, + "speelplekken": { + "description": "

Welkom bij de Groendoener!

De Zuidrand dat is spelen, ravotten, chillen, wandelen,… in het groen. Meer dan 200 grote en kleine speelplekken liggen er in parken, in bossen en op pleintjes te wachten om ontdekt te worden. De verschillende speelplekken werden getest én goedgekeurd door kinder- en jongerenreporters uit de Zuidrand. Met leuke challenges dagen de reporters jou uit om ook op ontdekking te gaan. Klik op een speelplek op de kaart, bekijk het filmpje en ga op verkenning!

Het project groendoener kadert binnen het strategisch project Beleefbare Open Ruimte in de Antwerpse Zuidrand en is een samenwerking tussen het departement Leefmilieu van provincie Antwerpen, Sportpret vzw, een OpenStreetMap-België Consultent en Createlli vzw. Het project kwam tot stand met steun van Departement Omgeving van de Vlaamse Overheid.
", + "layers": { + "6": { + "name": "Wandelroutes van provincie Antwerpen", + "tagRenderings": { + "walk-description": { + "render": "

Korte beschrijving:

{description}" + }, + "walk-length": { + "render": "Deze wandeling is {_length:km}km lang" + }, + "walk-operator": { + "question": "Wie beheert deze wandeling en plaatst dus de signalisatiebordjes?" + }, + "walk-operator-email": { + "question": "Naar wie kan men emailen bij problemen rond signalisatie?", + "render": "Bij problemen met signalisatie kan men emailen naar {operator:email}" + }, + "walk-type": { + "mappings": { + "0": { + "then": "Dit is een internationale wandelroute" + }, + "1": { + "then": "Dit is een nationale wandelroute" + }, + "2": { + "then": "Dit is een regionale wandelroute" + }, + "3": { + "then": "Dit is een lokale wandelroute" + } + } + } + } + } + }, + "shortDescription": "Speelplekken in de Antwerpse Zuidrand", + "title": "Welkom bij de groendoener!" + }, "sport_pitches": { "description": "Een sportveld is een ingerichte plaats met infrastructuur om een sport te beoefenen", "shortDescription": "Deze kaart toont sportvelden", @@ -1293,6 +1395,10 @@ }, "title": "Straatverlichting" }, + "street_lighting_assen": { + "description": "Op deze kaart vind je alles over straatlantaarns + een dataset van Assen", + "title": "Straatverlichting - Assen" + }, "surveillance": { "description": "Op deze open kaart kan je bewakingscamera's vinden.", "shortDescription": "Bewakingscameras en dergelijke", @@ -1406,9 +1512,13 @@ "description": "Kaart met afvalbakken en recyclingfaciliteiten.", "title": "Afval" }, + "waste_assen": { + "description": "Kaart met afvalbakken en recyclingfaciliteiten + een dataset voor Assen.", + "title": "Afval - Assen" + }, "waste_basket": { "description": "Op deze kaart vind je afvalbakken bij jou in de buurt. Als er een afvalbak ontbreekt op deze kaart, kun je deze zelf toevoegen", "shortDescription": "Een kaart met vuilnisbakken", "title": "Vuilnisbakken" } -} +} \ No newline at end of file