diff --git a/data/presets.yaml b/data/presets.yaml index 7b483b096..84fa7b34a 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -592,6 +592,9 @@ en: underground: Underground # 'fire_hydrant:type=wall' wall: Wall + fireplace: + # fireplace=* + label: Fireplace fitness_station: # fitness_station=* label: Equipment Type @@ -2177,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 @@ -2312,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/fields.json b/data/presets/fields.json index c7a35225f..b92a073f6 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -99,6 +99,7 @@ "fence_type": {"key": "fence_type", "type": "combo", "label": "Type"}, "fire_hydrant/position": {"key": "fire_hydrant:position", "type": "combo", "label": "Position", "strings": {"options": {"lane": "Lane", "parking_lot": "Parking Lot", "sidewalk": "Sidewalk", "green": "Green"}}}, "fire_hydrant/type": {"key": "fire_hydrant:type", "type": "combo", "label": "Type", "strings": {"options": {"pillar": "Pillar/Aboveground", "underground": "Underground", "wall": "Wall", "pond": "Pond"}}}, + "fireplace": {"key": "fireplace", "type": "check", "label": "Fireplace"}, "fitness_station": {"key": "fitness_station", "type": "typeCombo", "label": "Equipment Type"}, "fixme": {"key": "fixme", "type": "textarea", "label": "Fix Me", "universal": true}, "ford": {"key": "ford", "type": "typeCombo", "label": "Type", "placeholder": "Default"}, diff --git a/data/presets/fields/fireplace.json b/data/presets/fields/fireplace.json new file mode 100644 index 000000000..70254ec55 --- /dev/null +++ b/data/presets/fields/fireplace.json @@ -0,0 +1,5 @@ +{ + "key": "fireplace", + "type": "check", + "label": "Fireplace" +} diff --git a/data/presets/presets.json b/data/presets/presets.json index 6b34e9e71..1ba89797c 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -103,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"}, @@ -129,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"}, @@ -900,7 +902,7 @@ "tourism/theme_park": {"icon": "maki-amusement-park", "fields": ["name", "operator", "address", "opening_hours"], "geometry": ["point", "area"], "tags": {"tourism": "theme_park"}, "name": "Theme Park"}, "tourism/trail_riding_station": {"icon": "maki-horse-riding", "fields": ["name", "horse_stables", "horse_riding", "horse_dressage", "address", "phone", "website", "description"], "geometry": ["point", "area"], "tags": {"tourism": "trail_riding_station"}, "name": "Trail Riding Station", "matchScore": 2}, "tourism/viewpoint": {"icon": "temaki-binoculars", "geometry": ["point", "vertex"], "fields": ["direction"], "tags": {"tourism": "viewpoint"}, "name": "Viewpoint"}, - "tourism/wilderness_hut": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area"], "geometry": ["point", "area"], "terms": ["wilderness hut", "backcountry hut", "bothy"], "tags": {"tourism": "wilderness_hut"}, "name": "Wilderness Hut"}, + "tourism/wilderness_hut": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "fireplace"], "geometry": ["point", "area"], "terms": ["wilderness hut", "backcountry hut", "bothy"], "tags": {"tourism": "wilderness_hut"}, "name": "Wilderness Hut"}, "tourism/zoo": {"icon": "maki-zoo", "fields": ["name", "operator", "address", "opening_hours"], "geometry": ["point", "area"], "terms": ["animal"], "tags": {"tourism": "zoo"}, "name": "Zoo"}, "traffic_calming": {"icon": "temaki-diamond", "fields": ["traffic_calming", "direction_vertex"], "geometry": ["vertex", "line"], "tags": {"traffic_calming": "*"}, "terms": ["bump", "hump", "slow", "speed"], "name": "Traffic Calming"}, "traffic_calming/bump": {"icon": "temaki-diamond", "fields": ["surface", "direction_vertex"], "geometry": ["vertex", "line"], "terms": ["hump", "speed", "slow"], "tags": {"traffic_calming": "bump"}, "name": "Speed Bump"}, diff --git a/data/presets/presets/amenity/shelter/gazebo.json b/data/presets/presets/amenity/shelter/gazebo.json new file mode 100644 index 000000000..72a57ff9d --- /dev/null +++ b/data/presets/presets/amenity/shelter/gazebo.json @@ -0,0 +1,18 @@ +{ + "icon": "maki-shelter", + "fields": [ + "name", + "building_area", + "bench", + "lit" + ], + "geometry": [ + "point", + "area" + ], + "tags": { + "amenity": "shelter", + "shelter_type": "gazebo" + }, + "name": "Gazebo" +} diff --git a/data/presets/presets/amenity/shelter/lean_to.json b/data/presets/presets/amenity/shelter/lean_to.json new file mode 100644 index 000000000..db6e3e75a --- /dev/null +++ b/data/presets/presets/amenity/shelter/lean_to.json @@ -0,0 +1,17 @@ +{ + "icon": "maki-shelter", + "fields": [ + "name", + "operator", + "building_area" + ], + "geometry": [ + "point", + "area" + ], + "tags": { + "amenity": "shelter", + "shelter_type": "lean_to" + }, + "name": "Lean-To" +} 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/presets/presets/tourism/wilderness_hut.json b/data/presets/presets/tourism/wilderness_hut.json index 5a3836143..3b4b6bf82 100644 --- a/data/presets/presets/tourism/wilderness_hut.json +++ b/data/presets/presets/tourism/wilderness_hut.json @@ -4,7 +4,8 @@ "name", "operator", "address", - "building_area" + "building_area", + "fireplace" ], "geometry": [ "point", diff --git a/data/taginfo.json b/data/taginfo.json index a850ee93a..91f07864c 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -692,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", @@ -874,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", @@ -6577,6 +6591,7 @@ {"key": "fire_hydrant:type", "value": "underground", "description": "Type"}, {"key": "fire_hydrant:type", "value": "wall", "description": "Type"}, {"key": "fire_hydrant:type", "value": "pond", "description": "Type"}, + {"key": "fireplace", "description": "Fireplace"}, {"key": "fitness_station", "description": "Equipment Type"}, {"key": "fixme", "description": "Fix Me"}, {"key": "ford", "description": "Type"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 94c6f0d97..95cef1ff9 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -1963,6 +1963,9 @@ "pond": "Pond" } }, + "fireplace": { + "label": "Fireplace" + }, "fitness_station": { "label": "Equipment Type" }, @@ -3345,10 +3348,6 @@ "name": "Car Parking", "terms": "" }, - "amenity/pavilion": { - "name": "Pavilion", - "terms": "" - }, "amenity/pharmacy": { "name": "Pharmacy", "terms": "apothecary,drug*,med*,prescription" @@ -3449,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"