From 8e6ae18c261412a28294af0b193910f03f0fc038 Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Tue, 4 Sep 2018 15:47:25 -0400 Subject: [PATCH] Add `languages:` multiselect combo to Language School preset --- data/presets.yaml | 8 ++++++++ data/presets/fields.json | 1 + data/presets/fields/language_multi.json | 5 +++++ data/presets/presets.json | 1 + data/presets/presets/amenity/language_school.json | 13 +++++++------ data/taginfo.json | 8 ++++++++ dist/locales/en.json | 7 +++++++ 7 files changed, 37 insertions(+), 6 deletions(-) create mode 100644 data/presets/fields/language_multi.json diff --git a/data/presets.yaml b/data/presets.yaml index 8b26f7d48..489013b2b 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -794,6 +794,9 @@ en: label: Lanes # lanes field placeholder placeholder: '1, 2, 3...' + language_multi: + # 'language:=*' + label: Languages layer: # layer=* label: Layer @@ -2120,6 +2123,11 @@ en: name: Preschool/Kindergarten Grounds # 'terms: kindergarden,pre-school' terms: '' + amenity/language_school: + # amenity=language_school + name: Language School + # 'terms: esl' + terms: '' amenity/library: # amenity=library name: Library diff --git a/data/presets/fields.json b/data/presets/fields.json index f82ff44b8..d0ccb21db 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -144,6 +144,7 @@ "lamp_type": {"key": "lamp_type", "type": "combo", "label": "Type"}, "landuse": {"key": "landuse", "type": "typeCombo", "label": "Type"}, "lanes": {"key": "lanes", "type": "number", "minValue": 0, "label": "Lanes", "placeholder": "1, 2, 3..."}, + "language_multi": {"key": "language:", "type": "multiCombo", "label": "Languages"}, "layer": {"key": "layer", "type": "number", "label": "Layer", "placeholder": "0"}, "leaf_cycle_singular": {"key": "leaf_cycle", "type": "combo", "label": "Leaf Cycle", "strings": {"options": {"evergreen": "Evergreen", "deciduous": "Deciduous", "semi_evergreen": "Semi-Evergreen", "semi_deciduous": "Semi-Deciduous"}}}, "leaf_cycle": {"key": "leaf_cycle", "type": "combo", "label": "Leaf Cycle", "strings": {"options": {"evergreen": "Evergreen", "deciduous": "Deciduous", "semi_evergreen": "Semi-Evergreen", "semi_deciduous": "Semi-Deciduous", "mixed": "Mixed"}}}, diff --git a/data/presets/fields/language_multi.json b/data/presets/fields/language_multi.json new file mode 100644 index 000000000..29c1df6fb --- /dev/null +++ b/data/presets/fields/language_multi.json @@ -0,0 +1,5 @@ +{ + "key": "language:", + "type": "multiCombo", + "label": "Languages" +} diff --git a/data/presets/presets.json b/data/presets/presets.json index 40518e4c6..6c2e262cc 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -92,6 +92,7 @@ "amenity/ice_cream": {"icon": "maki-ice-cream", "fields": ["name", "address", "building_area", "opening_hours", "takeaway", "delivery", "outdoor_seating"], "geometry": ["point", "area"], "terms": ["gelato", "sorbet", "sherbet", "frozen", "yogurt"], "tags": {"amenity": "ice_cream"}, "name": "Ice Cream Shop"}, "amenity/internet_cafe": {"icon": "temaki-antenna", "fields": ["name", "operator", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "geometry": ["point", "area"], "terms": ["cybercafe", "taxiphone", "teleboutique", "coffee", "cafe", "net", "lanhouse"], "tags": {"amenity": "internet_cafe"}, "name": "Internet Cafe"}, "amenity/kindergarten": {"icon": "maki-school", "fields": ["name", "operator", "address"], "geometry": ["point", "area"], "terms": ["kindergarden", "pre-school"], "tags": {"amenity": "kindergarten"}, "name": "Preschool/Kindergarten Grounds"}, + "amenity/language_school": {"icon": "maki-school", "fields": ["name", "language_multi", "operator", "address"], "geometry": ["point", "area"], "terms": ["esl"], "tags": {"amenity": "language_school"}, "name": "Language School"}, "amenity/library": {"icon": "maki-library", "fields": ["name", "operator", "building_area", "address", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "ref/isil"], "geometry": ["point", "area"], "terms": ["book"], "tags": {"amenity": "library"}, "name": "Library"}, "amenity/love_hotel": {"icon": "maki-heart", "fields": ["name", "operator", "address", "building_area", "smoking", "rooms", "internet_access", "internet_access/fee", "internet_access/ssid"], "geometry": ["point", "area"], "tags": {"amenity": "love_hotel"}, "name": "Love Hotel"}, "amenity/marketplace": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building", "opening_hours"], "geometry": ["point", "area"], "tags": {"amenity": "marketplace"}, "name": "Marketplace"}, diff --git a/data/presets/presets/amenity/language_school.json b/data/presets/presets/amenity/language_school.json index cbdb27e26..4adc86f98 100644 --- a/data/presets/presets/amenity/language_school.json +++ b/data/presets/presets/amenity/language_school.json @@ -2,18 +2,19 @@ "icon": "maki-school", "fields": [ "name", + "language_multi", "operator", - "address", - "phone", - "website", - "wheelchair" + "address" ], "geometry": [ "point", "area" ], + "terms": [ + "esl" + ], "tags": { - "amenity": "school" + "amenity": "language_school" }, - "name": "Language school" + "name": "Language School" } diff --git a/data/taginfo.json b/data/taginfo.json index 730f680ca..8cfea579e 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -616,6 +616,13 @@ "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/school-15.svg?sanitize=true" }, + { + "key": "amenity", + "value": "language_school", + "description": "Language School", + "object_types": ["node", "area"], + "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/school-15.svg?sanitize=true" + }, { "key": "amenity", "value": "library", @@ -6662,6 +6669,7 @@ {"key": "label", "description": "Label"}, {"key": "lamp_type", "description": "Type"}, {"key": "lanes", "description": "Lanes"}, + {"key": "language:", "description": "Languages"}, {"key": "layer", "description": "Layer"}, {"key": "leaf_cycle", "value": "evergreen", "description": "Leaf Cycle"}, {"key": "leaf_cycle", "value": "deciduous", "description": "Leaf Cycle"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 551ed630a..a01c2cac6 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -2142,6 +2142,9 @@ "label": "Lanes", "placeholder": "1, 2, 3..." }, + "language_multi": { + "label": "Languages" + }, "layer": { "label": "Layer", "placeholder": "0" @@ -3297,6 +3300,10 @@ "name": "Preschool/Kindergarten Grounds", "terms": "kindergarden,pre-school" }, + "amenity/language_school": { + "name": "Language School", + "terms": "esl" + }, "amenity/library": { "name": "Library", "terms": "book"