From 1619237398569d7baeb0b2bad0ac0ffbd9bfbba1 Mon Sep 17 00:00:00 2001 From: pietervdvn Date: Tue, 21 Jun 2022 16:45:35 +0200 Subject: [PATCH] Improvements to the school theme --- assets/layers/school/school.json | 53 +++++++++++-------- .../tertiary_education.json | 45 ++++++++++++++++ 2 files changed, 76 insertions(+), 22 deletions(-) diff --git a/assets/layers/school/school.json b/assets/layers/school/school.json index 47d188d41a..360ccea3e5 100644 --- a/assets/layers/school/school.json +++ b/assets/layers/school/school.json @@ -53,50 +53,59 @@ } }, { - "id": "education-level", - "question": "What level of education is given on this school?", + "id": "education-level-belgium", + "condition": "_country=be", + "question": { + "en":"What level of education is given on this school?" + }, "mappings": [ { - "if": "isced:2011:level=early_childhood", + "if": "school=kindergarten", "then": { - "en": "This is a school with a kindergarten section where young kids receive some education which prepares reading and writing." + "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" } }, { - "if": "isced:2011:level=primary", + "if": "school=primary", "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
" + "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" } }, { - "if": "isced:2011:level=vocational_lower_secondary", + "if": "school=secondary", "then": { - "en": "This is a school where one learns vocational lower secondary skills with a focus to acquire the necessary knowledge and skill for a particular occupation or trade.
This includes programs with a work-based component such as apprenticeships or dual-system education. This is commonly called middle education. Pupils typically enroll from 12 years old till 14 or 15 years old
" + "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)" } }, { - "if": "isced:2011:level=general_lower_secondary", + "if": "school=lower_secondary", "then": { - "en": "This is a school where one learns general lower secondary skills with a focus on general skills in order to prepare student for further studies.
This is commonly called middle education. Pupils typically enroll from 12 years old till 14 or 15 years old
" - } - }, - - { - "if": "isced:2011:level=vocational_upper_secondary", - "then": { - "en": "This is a school where one learns vocational upper secondary skills with a focus to acquire the necessary knowledge and skill for a particular occupation or trade.
This includes programs with a work-based component such as apprenticeships or dual-system education. Pupils typically enroll from 14 or 15 years old till 18 years old
" + "en": "This is a secondary school which does not have all grades, but offers first and second grade", + "nl": "Dit is een middenlbare school die niet alle schooljaren aanbiedt, maar wel het eerste en tweede middelbaar" } }, { - "if": "isced:2011:level=general_upper_secondary", + "if": "school=middle_secondary", "then": { - "en": "This is a school where one learns general upper secondary skills with a focus on general skills in order to prepare student for further studies.
Pupils typically enroll from 14 or 15 years old till 18 years old
" + "en": "This is a secondary school which does not have all grades, but offers third and fourth grade", + "nl": "Dit is een middenlbare school die niet alle schooljaren aanbiedt, maar wel het derde en vierde middelbaar" } }, { - "if": "isced:2011:level=post_secondary", + "if": "school=upper_secondary", "then": { - "en": "This is a school where one learns skills and competencies which require secondary schooling, but are not sufficiently complex for tertiary education.
Examples are vocational training for adults
" + "en": "This is a secondary school which does not have all grades, but offers fifth and sixth grade", + "nl": "Dit is een middenlbare school die niet alle schooljaren aanbiedt, maar wel het vijfde en zesde middelbaar" + } + }, + { + "if": "school=post_secondary", + "then": { + "en": "This schools offers post-secondary education (e.g. a seventh or eight specialisation year)", + "nl": "Deze school biedt post-secundair onderwijs (bijvoorbeeld specialisatiejaren)" } } ], @@ -149,7 +158,7 @@ }, "mappings": [ { - "if": "school:for=normal_pupils", + "if": "school:for=mainstream", "then": { "en": "This is a school where students study skills at their age-adequate level" } diff --git a/assets/layers/tertiary_education/tertiary_education.json b/assets/layers/tertiary_education/tertiary_education.json index cd07dde3a7..498c9f55f9 100644 --- a/assets/layers/tertiary_education/tertiary_education.json +++ b/assets/layers/tertiary_education/tertiary_education.json @@ -52,6 +52,51 @@ ] }, "tagRenderings": [ + { + "id": "institution-kind", + "question": { + "en": "What kind of institution is this?" + }, + "mappings": [ + { + "if": "amenity=college", + "then": { + "en": "This is an institution of post-secondary, non-tertiary education. One has to have completed secondary education to enroll here, but no bachelor (or higher) degrees are awarded here" + } + }, + { + "if":"amenity=university", + "then": { + "en": "This is a university, an institution of tertiary education where bachelor degrees or higher are awarded." + } + } + ] + }, + { + "id": "isced", + "question": { + "en": "What level of education is given here?" + }, + "multiAnswer": true, + "mappings": [{ + "if": "isced:2011:level=bachelor", + "then": { + "en": "Bachelor degrees are awarded here" + } + }, + { + "if": "isced:2011:level=master", + "then": { + "en": "Master degrees are awarded here" + } + },{ + "if": "isced:2011:level=doctorate", + "then": { + "en": "Doctorate degrees are awarded here" + } + }], + "condition": "amenity=university" + }, { "builtin": ["school.capacity","school.gender"], "override": {