From 3569b5af13fd5c065320268b97e9f9d2966fd1ee Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Tue, 4 Sep 2018 17:43:30 -0400 Subject: [PATCH] More consistency between dance, music, driving, dance school presets --- data/presets/presets.json | 6 +++--- data/presets/presets/amenity/language_school.json | 6 ++++-- data/presets/presets/amenity/music_school.json | 4 +++- data/presets/presets/leisure/dancing_school.json | 1 + 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/data/presets/presets.json b/data/presets/presets.json index 6c2e262cc..427b79ef6 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -92,13 +92,13 @@ "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/language_school": {"icon": "maki-school", "fields": ["name", "operator", "address", "building_area", "opening_hours", "language_multi"], "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"}, "amenity/monastery": {"icon": "maki-place-of-worship", "fields": ["name", "religion", "denomination", "address", "building_area"], "geometry": ["point", "area"], "terms": ["abbey", "basilica", "bethel", "cathedral", "chancel", "chantry", "chapel", "church", "fold", "house of God", "house of prayer", "house of worship", "minster", "mission", "monastery", "mosque", "oratory", "parish", "sacellum", "sanctuary", "shrine", "synagogue", "tabernacle", "temple"], "tags": {"amenity": "monastery"}, "name": "Monastery Grounds"}, "amenity/motorcycle_parking": {"icon": "fas-motorcycle", "fields": ["capacity", "operator", "covered", "access_simple"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "motorcycle_parking"}, "name": "Motorcycle Parking"}, - "amenity/music_school": {"icon": "maki-school", "fields": ["name", "operator", "address"], "geometry": ["point", "area"], "terms": ["school of music"], "tags": {"amenity": "music_school"}, "name": "Music School"}, + "amenity/music_school": {"icon": "maki-school", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "geometry": ["point", "area"], "terms": ["school of music"], "tags": {"amenity": "music_school"}, "name": "Music School"}, "amenity/nightclub": {"icon": "maki-bar", "fields": ["name", "operator", "address", "building_area", "opening_hours", "smoking"], "geometry": ["point", "area"], "tags": {"amenity": "nightclub"}, "terms": ["disco*", "night club", "dancing", "dance club"], "name": "Nightclub"}, "amenity/parking_entrance": {"icon": "maki-entrance-alt1", "fields": ["access_simple", "ref"], "geometry": ["vertex"], "tags": {"amenity": "parking_entrance"}, "name": "Parking Garage Entrance/Exit"}, "amenity/parking_space": {"fields": ["capacity"], "geometry": ["point", "vertex", "area"], "terms": [], "tags": {"amenity": "parking_space"}, "matchScore": 0.95, "name": "Parking Space"}, @@ -472,7 +472,7 @@ "leisure/bowling_alley": {"icon": "temaki-bowling", "fields": ["name", "operator", "address", "building_area", "opening_hours", "smoking"], "geometry": ["point", "area"], "terms": ["bowling center"], "tags": {"leisure": "bowling_alley"}, "name": "Bowling Alley"}, "leisure/common": {"icon": "temaki-pedestrian", "geometry": ["point", "area"], "fields": ["name"], "terms": ["open space"], "tags": {"leisure": "common"}, "name": "Common"}, "leisure/dance": {"icon": "maki-music", "fields": ["name", "operator", "address", "building_area", "dance/style", "opening_hours"], "geometry": ["point", "area"], "terms": ["ballroom", "jive", "swing", "tango", "waltz"], "tags": {"leisure": "dance"}, "name": "Dance Hall"}, - "leisure/dancing_school": {"icon": "maki-music", "fields": ["name", "operator", "address", "opening_hours", "dance/style"], "geometry": ["point", "area"], "terms": ["jive", "swing", "tango", "waltz", "dance teaching"], "tags": {"leisure": "dance", "dance:teaching": "yes"}, "reference": {"key": "leisure", "value": "dance"}, "name": "Dance School"}, + "leisure/dancing_school": {"icon": "maki-music", "fields": ["name", "operator", "address", "building_area", "opening_hours", "dance/style"], "geometry": ["point", "area"], "terms": ["jive", "swing", "tango", "waltz", "dance teaching"], "tags": {"leisure": "dance", "dance:teaching": "yes"}, "reference": {"key": "leisure", "value": "dance"}, "name": "Dance School"}, "leisure/dog_park": {"icon": "maki-dog-park", "geometry": ["point", "area"], "fields": ["name"], "terms": [], "tags": {"leisure": "dog_park"}, "name": "Dog Park"}, "leisure/firepit": {"icon": "maki-fire-station", "fields": ["access_simple"], "geometry": ["point", "area"], "tags": {"leisure": "firepit"}, "terms": ["fireplace", "campfire"], "name": "Firepit"}, "leisure/fitness_centre": {"icon": "maki-pitch", "fields": ["name", "sport", "address", "building_area", "opening_hours"], "geometry": ["point", "area"], "tags": {"leisure": "fitness_centre"}, "terms": ["health", "gym", "leisure", "studio"], "name": "Gym / Fitness Center"}, diff --git a/data/presets/presets/amenity/language_school.json b/data/presets/presets/amenity/language_school.json index 4adc86f98..f5c98dda4 100644 --- a/data/presets/presets/amenity/language_school.json +++ b/data/presets/presets/amenity/language_school.json @@ -2,9 +2,11 @@ "icon": "maki-school", "fields": [ "name", - "language_multi", "operator", - "address" + "address", + "building_area", + "opening_hours", + "language_multi" ], "geometry": [ "point", diff --git a/data/presets/presets/amenity/music_school.json b/data/presets/presets/amenity/music_school.json index a453147f8..f65082e26 100644 --- a/data/presets/presets/amenity/music_school.json +++ b/data/presets/presets/amenity/music_school.json @@ -3,7 +3,9 @@ "fields": [ "name", "operator", - "address" + "address", + "building_area", + "opening_hours" ], "geometry": [ "point", diff --git a/data/presets/presets/leisure/dancing_school.json b/data/presets/presets/leisure/dancing_school.json index 366077a63..80a8ace69 100644 --- a/data/presets/presets/leisure/dancing_school.json +++ b/data/presets/presets/leisure/dancing_school.json @@ -4,6 +4,7 @@ "name", "operator", "address", + "building_area", "opening_hours", "dance/style" ],