Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add presets for Germany School Types based on isced:level #331

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"tabWidth": 4,
"useTabs": false,
Comment on lines +2 to +3
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This config file specifies indentation with 4 spaces, but

  • this file uses tabs as indentation
  • the other new files use 2 spaces as indentation

Maybe your config does not apply properly?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might be. But there is a separate PR for the config; let's discuss it there. The file is only in this PR until all the other questions are addressed. I will remove it at the end.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alright, now I saw your linked issue about the Prettier config. So I guess you'll reformat the other files before merging, too?

"semi": false,
"printWidth": 80,
"proseWrap": "never",
"bracketSpacing": true,
"endOfLine": "lf"
}
19 changes: 19 additions & 0 deletions data/fields/isced/level-DE.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"locationSet": {
"include": ["de"]
},
"key": "isced:level",
"type": "combo",
"label": "Ebene der Bildungseinrichtung",
"placeholder": "1, 2, 3,…",
"strings": {
"options": {
"1": "Grundschule meist bis Klasse 4",
"2": "Hauptschule, Real- und Oberschulen, Gesamtschule, Gymnasium bis Klasse 10",
"3": "Gymnasiale Oberstufe, Berufs(fach)schulen",
"2;3": "Gymnasium, Gesamtschule mit gymnasialer Oberstufe (Klassen 5-13)"
}
},
"autoSuggestions": false,
"customValues": false
}
13 changes: 3 additions & 10 deletions data/presets/amenity/school.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"icon": "temaki-school",
"fields": [
"name",
"isced/level-DE",
"operator",
"operator/type",
"address",
Expand All @@ -24,16 +25,8 @@
"polling_station",
"wheelchair"
],
"geometry": [
"area",
"point"
],
"terms": [
"academy",
"elementary school",
"middle school",
"high school"
],
"geometry": ["area", "point"],
"terms": ["academy", "elementary school", "middle school", "high school"],
"tags": {
"amenity": "school"
},
Expand Down
38 changes: 38 additions & 0 deletions data/presets/amenity/school/school-isced-level-1.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"icon": "temaki-school",
"locationSet": {
"include": ["de"]
},
"fields": [
"name",
"isced/level-DE",
"operator",
"operator/type",
"address",
"grades",
"website"
],
"moreFields": [
"religion",
"denomination",
"capacity",
"charge_fee",
"email",
"fax",
"fee",
"gnis/feature_id-US",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can safely remove this line and the corresponding lines in the other Germany-only presets. It’s pretty unlikely that both this U.S.-only field and the surrounding Germany-only preset would simultaneously apply to the selected feature. Since the countries aren’t neighbors, it’s extremely unlikely that the user would manage to select a school in both countries at the same time.

"internet_access",
"internet_access/ssid",
"level",
"phone",
"polling_station",
"wheelchair"
],
"geometry": ["area", "point"],
"terms": ["Grundschule"],
"tags": {
"isced:level": "1",
"amenity": "school"
},
"name": "Grundschule, Schulgelände"
Copy link
Contributor

@1ec5 1ec5 Jan 6, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a weird question, but… are there even obscure English names for these school types? Obviously the German names matter more, but ironically translators for German, Spanish, Russian, etc. would be asked to translate these strings, while there would be no way to translate them into English in Transifex. Or is there a way to mark a string as untranslatable?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I hinted at this in the issue description. I do not know any and the bit wiki table does not provide any. Should we maybe have a name here along the lines of

"name": "_(For translators: This is just for Germany)_ Grundschule, Schulgelände"

This way, people might be less confused in Transfer.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That will be unsightly for any English speakers who have the misfortune of editing in Germany. Leaving it as is would be better. We need a dedicated property for flagging untranslatable names and other strings: ideditor/schema-builder#27. In the meantime, I suppose whoever has administrator access in iD’s Transifex project could manually add that context for these strings.

}
44 changes: 44 additions & 0 deletions data/presets/amenity/school/school-isced-level-2.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
"icon": "temaki-school",
"locationSet": {
"include": ["de"]
},
"fields": [
"name",
"isced/level-DE",
"operator",
"operator/type",
"address",
"grades",
"website"
],
"moreFields": [
"religion",
"denomination",
"capacity",
"charge_fee",
"email",
"fax",
"fee",
"gnis/feature_id-US",
"internet_access",
"internet_access/ssid",
"level",
"phone",
"polling_station",
"wheelchair"
],
"geometry": ["area", "point"],
"terms": [
"Hauptschule",
"Realschule",
"Oberschule",
"Gymnasium",
"Gesamtschule"
],
"tags": {
"isced:level": "2",
"amenity": "school"
},
"name": "Schule Sekundarstufe 1, Schulgelände"
}
38 changes: 38 additions & 0 deletions data/presets/amenity/school/school-isced-level-2_3.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"icon": "temaki-school",
"locationSet": {
"include": ["de"]
},
"fields": [
"name",
"isced/level-DE",
"operator",
"operator/type",
"address",
"grades",
"website"
],
"moreFields": [
"religion",
"denomination",
"capacity",
"charge_fee",
"email",
"fax",
"fee",
"gnis/feature_id-US",
"internet_access",
"internet_access/ssid",
"level",
"phone",
"polling_station",
"wheelchair"
],
"geometry": ["area", "point"],
"terms": ["Gymnasium", "Gesamtschule", "Gymnasiale Oberstufe"],
"tags": {
"isced:level": "2;3",
"amenity": "school"
},
"name": "Schule mit gymnasialer Oberstufe, Schulgelände"
}
38 changes: 38 additions & 0 deletions data/presets/amenity/school/school-isced-level-3.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"icon": "temaki-school",
"locationSet": {
"include": ["de"]
},
"fields": [
"name",
"isced/level-DE",
"operator",
"operator/type",
"address",
"grades",
"website"
],
"moreFields": [
"religion",
"denomination",
"capacity",
"charge_fee",
"email",
"fax",
"fee",
"gnis/feature_id-US",
"internet_access",
"internet_access/ssid",
"level",
"phone",
"polling_station",
"wheelchair"
],
"geometry": ["area", "point"],
"terms": ["Gymnasium", "Gesamtschule", "Gymnasiale Oberstufe"],
"tags": {
"isced:level": "3",
"amenity": "school"
},
"name": "Schule Sekundarstufe 2, Schulgelände"
}
34 changes: 34 additions & 0 deletions interim/source_strings.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1429,6 +1429,20 @@ en:
# interval=*
label: Interval
terms: '[translate with synonyms or related terms for ''Interval'', separated by commas]'
isced/level-DE:
# 'isced:level=*'
label: Ebene der Bildungseinrichtung
options:
# 'isced:level=1'
'1': Grundschule meist bis Klasse 4
# 'isced:level=2'
'2': 'Hauptschule, Real- und Oberschulen, Gesamtschule, Gymnasium bis Klasse 10'
# 'isced:level=2;3'
2;3: 'Gymnasium, Gesamtschule mit gymnasialer Oberstufe (Klassen 5-13)'
# 'isced:level=3'
'3': 'Gymnasiale Oberstufe, Berufs(fach)schulen'
# isced/level-DE field placeholder
placeholder: '1, 2, 3,…'
junction/ref_oneway:
# 'junction:ref=*'
label: Junction Number
Expand Down Expand Up @@ -4266,6 +4280,26 @@ en:
name: School Grounds
# 'terms: academy,elementary school,middle school,high school'
terms: '<translate with synonyms or related terms for ''School Grounds'', separated by commas>'
amenity/school/school-isced-level-1:
# 'isced:level=1 + amenity=school\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).'
name: 'Grundschule, Schulgelände'
# 'terms: grundschule'
terms: '<translate with synonyms or related terms for ''Grundschule, Schulgelände'', separated by commas>'
amenity/school/school-isced-level-2:
# 'isced:level=2 + amenity=school\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).'
name: 'Schule Sekundarstufe 1, Schulgelände'
# 'terms: hauptschule,realschule,oberschule,gymnasium,gesamtschule'
terms: '<translate with synonyms or related terms for ''Schule Sekundarstufe 1, Schulgelände'', separated by commas>'
amenity/school/school-isced-level-2_3:
# 'isced:level=2;3 + amenity=school\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).'
name: 'Schule mit gymnasialer Oberstufe, Schulgelände'
# 'terms: gymnasium,gesamtschule,gymnasiale oberstufe'
terms: '<translate with synonyms or related terms for ''Schule mit gymnasialer Oberstufe, Schulgelände'', separated by commas>'
amenity/school/school-isced-level-3:
# 'isced:level=3 + amenity=school\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).'
name: 'Schule Sekundarstufe 2, Schulgelände'
# 'terms: gymnasium,gesamtschule,gymnasiale oberstufe'
terms: '<translate with synonyms or related terms for ''Schule Sekundarstufe 2, Schulgelände'', separated by commas>'
amenity/shelter:
# 'amenity=shelter\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).'
name: Shelter
Expand Down