From ab682380db487279f39e9bbc81822d972cdf2646 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Tue, 23 Jun 2020 16:52:38 -0400 Subject: [PATCH] Add grades field to school preset (close #7571) --- data/presets.yaml | 3 +++ data/presets/fields.json | 1 + data/presets/fields/grades.json | 9 +++++++++ data/presets/presets.json | 2 +- data/presets/presets/amenity/school.json | 1 + data/taginfo.json | 1 + dist/locales/en.json | 3 +++ 7 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 data/presets/fields/grades.json diff --git a/data/presets.yaml b/data/presets.yaml index 33eac23e0..29f972b32 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -1020,6 +1020,9 @@ en: government: # government=* label: Type + grades: + # grades=* + label: Grade Levels grape_variety: # grape_variety=* label: Grape Varieties diff --git a/data/presets/fields.json b/data/presets/fields.json index d0b6b7dcb..d54df2cc8 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -188,6 +188,7 @@ "geyser/height": {"key": "geyser:height", "type": "text", "label": "Eruption Height"}, "gnis/feature_id": {"key": "gnis:feature_id", "type": "identifier", "label": "GNIS Feature ID", "urlFormat": "https://geonames.usgs.gov/apex/f?p=gnispq:3:::NO::P3_FID:{value}", "pattern": "^[0-9]{1,}$", "countryCodes": ["us"], "terms": ["Federal Geographic Names Information Service", "United States Board on Geographic Names", "USA"]}, "government": {"key": "government", "type": "typeCombo", "label": "Type"}, + "grades": {"key": "grades", "type": "combo", "label": "Grade Levels", "snake_case": false}, "grape_variety": {"key": "grape_variety", "type": "semiCombo", "label": "Grape Varieties"}, "group_only": {"key": "group_only", "type": "check", "label": "Groups Only"}, "guest_house": {"key": "guest_house", "type": "combo", "label": "Type"}, diff --git a/data/presets/fields/grades.json b/data/presets/fields/grades.json new file mode 100644 index 000000000..c39121232 --- /dev/null +++ b/data/presets/fields/grades.json @@ -0,0 +1,9 @@ +{ + "key": "grades", + "type": "combo", + "label": "Grade Levels", + "terms": [ + "educational stages" + ], + "snake_case": false +} diff --git a/data/presets/presets.json b/data/presets/presets.json index 2ead63307..d27652e70 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -214,7 +214,7 @@ "amenity/restaurant/turkish": {"icon": "maki-restaurant", "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant", "cuisine": "turkish"}, "reference": {"key": "cuisine", "value": "turkish"}, "name": "Turkish Restaurant"}, "amenity/restaurant/vietnamese": {"icon": "maki-restaurant-noodle", "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant", "cuisine": "vietnamese"}, "reference": {"key": "cuisine", "value": "vietnamese"}, "name": "Vietnamese Restaurant"}, "amenity/sanitary_dump_station": {"icon": "temaki-camper_trailer_dump", "fields": ["operator", "access_simple", "fee", "payment_multi_fee", "charge_fee", "water_point"], "moreFields": ["opening_hours", "opening_hours/covid19"], "geometry": ["point", "vertex", "area"], "terms": ["Motor Home", "Camper", "Sanitary", "Dump Station", "Elsan", "CDP", "CTDP", "Chemical Toilet"], "tags": {"amenity": "sanitary_dump_station"}, "name": "RV Toilet Disposal"}, - "amenity/school": {"icon": "temaki-school", "fields": ["name", "operator", "operator/type", "address", "religion", "denomination", "website"], "moreFields": ["charge_fee", "email", "fax", "fee", "gnis/feature_id", "internet_access", "internet_access/ssid", "level", "phone", "polling_station", "wheelchair"], "geometry": ["area", "point"], "terms": ["academy", "elementary school", "middle school", "high school"], "tags": {"amenity": "school"}, "name": "School Grounds"}, + "amenity/school": {"icon": "temaki-school", "fields": ["name", "operator", "operator/type", "address", "grades", "religion", "denomination", "website"], "moreFields": ["charge_fee", "email", "fax", "fee", "gnis/feature_id", "internet_access", "internet_access/ssid", "level", "phone", "polling_station", "wheelchair"], "geometry": ["area", "point"], "terms": ["academy", "elementary school", "middle school", "high school"], "tags": {"amenity": "school"}, "name": "School Grounds"}, "amenity/shelter": {"icon": "maki-shelter", "fields": ["name", "shelter_type", "building_area", "bench", "bin"], "moreFields": ["gnis/feature_id", "lit", "lockable", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": ["lean-to", "gazebo", "picnic"], "tags": {"amenity": "shelter"}, "name": "Shelter"}, "amenity/shelter/gazebo": {"icon": "maki-shelter", "fields": ["name", "building_area", "bench", "lit"], "geometry": ["point", "area"], "tags": {"amenity": "shelter", "shelter_type": "gazebo"}, "name": "Gazebo"}, "amenity/shelter/lean_to": {"icon": "temaki-sleep_shelter", "fields": ["name", "operator", "building_area"], "geometry": ["point", "area"], "tags": {"amenity": "shelter", "shelter_type": "lean_to"}, "terms": ["alpine hut", "cabin", "leanto", "lodging", "overnight accommodations", "sleeping shelter", "wilderness hut"], "name": "Lean-To"}, diff --git a/data/presets/presets/amenity/school.json b/data/presets/presets/amenity/school.json index 6fc043643..40561b9e5 100644 --- a/data/presets/presets/amenity/school.json +++ b/data/presets/presets/amenity/school.json @@ -5,6 +5,7 @@ "operator", "operator/type", "address", + "grades", "religion", "denomination", "website" diff --git a/data/taginfo.json b/data/taginfo.json index e6534eb21..97dd5e8a6 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -1555,6 +1555,7 @@ {"key": "geyser:height", "description": "🄵 Eruption Height"}, {"key": "gnis:feature_id", "description": "🄵 GNIS Feature ID"}, {"key": "government", "description": "🄵 Type"}, + {"key": "grades", "description": "🄵 Grade Levels"}, {"key": "grape_variety", "description": "🄵 Grape Varieties"}, {"key": "group_only", "description": "🄵 Groups Only"}, {"key": "guest_house", "description": "🄵 Type"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 44fcf72cf..18c180a51 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -3581,6 +3581,9 @@ "government": { "label": "Type" }, + "grades": { + "label": "Grade Levels" + }, "grape_variety": { "label": "Grape Varieties" },