diff --git a/data/presets.yaml b/data/presets.yaml index b18f77a8d..84fa7b34a 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -2094,10 +2094,6 @@ en: name: Gas Station # 'terms: petrol,fuel,gasoline,propane,diesel,lng,cng,biodiesel' terms: '' - amenity/gazebo: - # 'amenity=shelter, shelter_type=gazebo' - name: Gazebo - terms: '' amenity/grave_yard: # amenity=grave_yard name: Graveyard @@ -2137,10 +2133,6 @@ en: name: Language School # 'terms: esl' terms: '' - amenity/lean_to: - # 'amenity=shelter, shelter_type=lean_to' - name: Lean-To - terms: '' amenity/library: # amenity=library name: Library @@ -2188,10 +2180,6 @@ en: # amenity=parking_space name: Parking Space terms: '' - amenity/pavilion: - # 'amenity=shelter, shelter_type=pavilion' - name: Pavilion - terms: '' amenity/pharmacy: # amenity=pharmacy name: Pharmacy @@ -2323,6 +2311,18 @@ en: name: Shelter # 'terms: lean-to,gazebo,picnic' terms: '' + amenity/shelter/gazebo: + # 'amenity=shelter, shelter_type=gazebo' + name: Gazebo + terms: '' + amenity/shelter/lean_to: + # 'amenity=shelter, shelter_type=lean_to' + name: Lean-To + terms: '' + amenity/shelter/pavilion: + # 'amenity=shelter, shelter_type=pavilion' + name: Pavilion + terms: '' amenity/shower: # amenity=shower name: Shower diff --git a/data/presets/presets.json b/data/presets/presets.json index 5dc8bd601..1ba89797c 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -85,7 +85,6 @@ "amenity/food_court": {"icon": "maki-restaurant", "fields": ["name", "operator", "address", "building_area", "opening_hours", "smoking", "outdoor_seating"], "geometry": ["point", "area"], "terms": ["fast food", "restaurant", "food"], "tags": {"amenity": "food_court"}, "name": "Food Court"}, "amenity/fountain": {"icon": "temaki-fountain", "fields": ["name"], "geometry": ["point", "area"], "tags": {"amenity": "fountain"}, "name": "Fountain"}, "amenity/fuel": {"icon": "maki-fuel", "fields": ["name", "brand", "operator", "address", "fuel_multi", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "terms": ["petrol", "fuel", "gasoline", "propane", "diesel", "lng", "cng", "biodiesel"], "tags": {"amenity": "fuel"}, "name": "Gas Station"}, - "amenity/gazebo": {"icon": "maki-shelter", "fields": ["name", "building_area", "bench", "lit"], "geometry": ["point", "area"], "tags": {"amenity": "shelter", "shelter_type": "gazebo"}, "name": "Gazebo"}, "amenity/grave_yard": {"icon": "maki-cemetery", "fields": ["religion", "denomination"], "geometry": ["point", "area"], "tags": {"amenity": "grave_yard"}, "name": "Graveyard"}, "amenity/grit_bin": {"fields": ["access_simple"], "geometry": ["point", "vertex"], "tags": {"amenity": "grit_bin"}, "terms": ["salt", "sand"], "name": "Grit Bin"}, "amenity/hospital": {"icon": "maki-hospital", "fields": ["name", "operator", "healthcare/speciality", "address", "emergency"], "geometry": ["point", "area"], "terms": ["clinic", "doctor", "emergency room", "health", "infirmary", "institution", "sanatorium", "sanitarium", "sick", "surgery", "ward"], "tags": {"amenity": "hospital"}, "addTags": {"amenity": "hospital", "healthcare": "hospital"}, "removeTags": {"amenity": "hospital", "healthcare": "hospital"}, "reference": {"key": "amenity", "value": "hospital"}, "name": "Hospital Grounds"}, @@ -94,7 +93,6 @@ "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", "operator", "address", "building_area", "opening_hours", "language_multi"], "geometry": ["point", "area"], "terms": ["esl"], "tags": {"amenity": "language_school"}, "name": "Language School"}, - "amenity/lean_to": {"icon": "maki-shelter", "fields": ["name", "operator", "building_area", "fireplace"], "geometry": ["point", "area"], "tags": {"amenity": "shelter", "shelter_type": "lean_to"}, "name": "Lean-To"}, "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"}, @@ -105,7 +103,6 @@ "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"}, "amenity/parking": {"icon": "maki-parking", "fields": ["name", "operator", "parking", "capacity", "fee", "access_simple", "supervised", "park_ride", "surface", "maxstay"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "parking"}, "terms": [], "name": "Car Parking"}, - "amenity/pavilion": {"icon": "maki-shelter", "fields": ["name", "building_area", "bench", "bin"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "shelter", "shelter_type": "pavilion"}, "name": "Pavilion"}, "amenity/pharmacy": {"icon": "maki-pharmacy", "fields": ["name", "operator", "address", "building_area", "drive_through", "opening_hours", "payment_multi", "dispensing"], "geometry": ["point", "area"], "tags": {"amenity": "pharmacy"}, "addTags": {"amenity": "pharmacy", "healthcare": "pharmacy"}, "removeTags": {"amenity": "pharmacy", "healthcare": "pharmacy"}, "reference": {"key": "amenity", "value": "pharmacy"}, "terms": ["apothecary", "drug*", "med*", "prescription"], "name": "Pharmacy"}, "amenity/place_of_worship": {"icon": "maki-place-of-worship", "fields": ["name", "religion", "denomination", "address", "building_area", "service_times"], "geometry": ["point", "area"], "terms": ["abbey", "basilica", "bethel", "cathedral", "chancel", "chantry", "chapel", "church", "fold", "house of God", "house of prayer", "house of worship", "minster", "mission", "mosque", "oratory", "parish", "sacellum", "sanctuary", "shrine", "synagogue", "tabernacle", "temple"], "tags": {"amenity": "place_of_worship"}, "name": "Place of Worship"}, "amenity/place_of_worship/buddhist": {"icon": "maki-buddhism", "fields": ["name", "denomination", "building_area", "address", "service_times"], "geometry": ["point", "area"], "terms": ["stupa", "vihara", "monastery", "temple", "pagoda", "zendo", "dojo"], "tags": {"amenity": "place_of_worship", "religion": "buddhist"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Buddhist Temple"}, @@ -131,6 +128,9 @@ "amenity/sanitary_dump_station": {"icon": "temaki-storage_tank", "fields": ["operator", "access_simple", "fee", "water_point"], "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": "maki-school", "fields": ["name", "operator", "address", "religion", "denomination"], "geometry": ["point", "area"], "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"], "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": "maki-shelter", "fields": ["name", "operator", "building_area"], "geometry": ["point", "area"], "tags": {"amenity": "shelter", "shelter_type": "lean_to"}, "name": "Lean-To"}, + "amenity/shelter/pavilion": {"icon": "maki-shelter", "fields": ["name", "building_area", "bench", "bin"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "shelter", "shelter_type": "pavilion"}, "name": "Pavilion"}, "amenity/shower": {"icon": "temaki-shower", "fields": ["operator", "opening_hours", "fee", "supervised", "building_area", "access_simple"], "geometry": ["point", "vertex", "area"], "terms": ["rain closet"], "tags": {"amenity": "shower"}, "name": "Shower"}, "amenity/smoking_area": {"icon": "fas-smoking", "fields": ["name", "shelter", "bin", "bench", "opening_hours"], "geometry": ["point", "vertex", "area"], "terms": [], "tags": {"amenity": "smoking_area"}, "name": "Smoking Area"}, "amenity/social_facility": {"icon": "temaki-social_facility", "fields": ["name", "operator", "address", "building_area", "social_facility", "social_facility_for", "opening_hours", "wheelchair"], "geometry": ["point", "area"], "terms": [], "tags": {"amenity": "social_facility"}, "name": "Social Facility"}, diff --git a/data/presets/presets/amenity/gazebo.json b/data/presets/presets/amenity/shelter/gazebo.json similarity index 100% rename from data/presets/presets/amenity/gazebo.json rename to data/presets/presets/amenity/shelter/gazebo.json diff --git a/data/presets/presets/amenity/lean_to.json b/data/presets/presets/amenity/shelter/lean_to.json similarity index 85% rename from data/presets/presets/amenity/lean_to.json rename to data/presets/presets/amenity/shelter/lean_to.json index 067f53437..db6e3e75a 100644 --- a/data/presets/presets/amenity/lean_to.json +++ b/data/presets/presets/amenity/shelter/lean_to.json @@ -3,8 +3,7 @@ "fields": [ "name", "operator", - "building_area", - "fireplace" + "building_area" ], "geometry": [ "point", diff --git a/data/presets/presets/amenity/pavilion.json b/data/presets/presets/amenity/shelter/pavilion.json similarity index 100% rename from data/presets/presets/amenity/pavilion.json rename to data/presets/presets/amenity/shelter/pavilion.json diff --git a/data/taginfo.json b/data/taginfo.json index e74c82dec..91f07864c 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -568,13 +568,6 @@ "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/fuel-15.svg?sanitize=true" }, - { - "key": "shelter_type", - "value": "gazebo", - "description": "Gazebo", - "object_types": ["node", "area"], - "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shelter-15.svg?sanitize=true" - }, { "key": "amenity", "value": "grave_yard", @@ -630,13 +623,6 @@ "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/school-15.svg?sanitize=true" }, - { - "key": "shelter_type", - "value": "lean_to", - "description": "Lean-To", - "object_types": ["node", "area"], - "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shelter-15.svg?sanitize=true" - }, { "key": "amenity", "value": "library", @@ -706,13 +692,6 @@ "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/parking-15.svg?sanitize=true" }, - { - "key": "shelter_type", - "value": "pavilion", - "description": "Pavilion", - "object_types": ["node", "area"], - "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shelter-15.svg?sanitize=true" - }, { "key": "amenity", "value": "pharmacy", @@ -888,6 +867,27 @@ "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shelter-15.svg?sanitize=true" }, + { + "key": "shelter_type", + "value": "gazebo", + "description": "Gazebo", + "object_types": ["node", "area"], + "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shelter-15.svg?sanitize=true" + }, + { + "key": "shelter_type", + "value": "lean_to", + "description": "Lean-To", + "object_types": ["node", "area"], + "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shelter-15.svg?sanitize=true" + }, + { + "key": "shelter_type", + "value": "pavilion", + "description": "Pavilion", + "object_types": ["node", "area"], + "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shelter-15.svg?sanitize=true" + }, { "key": "amenity", "value": "shower", diff --git a/dist/locales/en.json b/dist/locales/en.json index 5e22ded82..95cef1ff9 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -3276,10 +3276,6 @@ "name": "Gas Station", "terms": "petrol,fuel,gasoline,propane,diesel,lng,cng,biodiesel" }, - "amenity/gazebo": { - "name": "Gazebo", - "terms": "" - }, "amenity/grave_yard": { "name": "Graveyard", "terms": "" @@ -3312,10 +3308,6 @@ "name": "Language School", "terms": "esl" }, - "amenity/lean_to": { - "name": "Lean-To", - "terms": "" - }, "amenity/library": { "name": "Library", "terms": "book" @@ -3356,10 +3348,6 @@ "name": "Car Parking", "terms": "" }, - "amenity/pavilion": { - "name": "Pavilion", - "terms": "" - }, "amenity/pharmacy": { "name": "Pharmacy", "terms": "apothecary,drug*,med*,prescription" @@ -3460,6 +3448,18 @@ "name": "Shelter", "terms": "lean-to,gazebo,picnic" }, + "amenity/shelter/gazebo": { + "name": "Gazebo", + "terms": "" + }, + "amenity/shelter/lean_to": { + "name": "Lean-To", + "terms": "" + }, + "amenity/shelter/pavilion": { + "name": "Pavilion", + "terms": "" + }, "amenity/shower": { "name": "Shower", "terms": "rain closet"