From 85383c314d1c500268851d6de8da9b93e556edcd Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Sun, 23 Sep 2018 11:13:41 -0400 Subject: [PATCH] Change "Pavilion" from an `amenity=shelter` to a `building=pavilion` (closes #5325) https://wiki.openstreetmap.org/wiki/Tag:building%3Dpavilion --- data/presets.yaml | 9 ++++---- data/presets/presets.json | 2 +- .../presets/amenity/shelter/pavilion.json | 19 ----------------- data/presets/presets/building/pavilion.json | 21 +++++++++++++++++++ data/taginfo.json | 14 ++++++------- dist/locales/en.json | 8 +++---- 6 files changed, 38 insertions(+), 35 deletions(-) delete mode 100644 data/presets/presets/amenity/shelter/pavilion.json create mode 100644 data/presets/presets/building/pavilion.json diff --git a/data/presets.yaml b/data/presets.yaml index de51982fd..f9649c76e 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -2459,10 +2459,6 @@ en: # '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 @@ -2944,6 +2940,11 @@ en: # building=mosque name: Mosque Building terms: '' + building/pavilion: + # building=pavilion + name: Pavilion Building + # 'terms: sports' + terms: '' building/public: # building=public name: Public Building diff --git a/data/presets/presets.json b/data/presets/presets.json index 0abf2e2f7..1279817ff 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -131,7 +131,6 @@ "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"}, @@ -240,6 +239,7 @@ "building/industrial": {"icon": "maki-industry", "fields": ["name", "address", "levels", "height"], "geometry": ["area"], "tags": {"building": "industrial"}, "matchScore": 0.5, "name": "Industrial Building"}, "building/kindergarten": {"icon": "maki-building", "fields": ["name", "address", "levels", "height"], "geometry": ["area"], "terms": ["kindergarden", "pre-school"], "tags": {"building": "kindergarten"}, "matchScore": 0.5, "name": "Preschool/Kindergarten Building"}, "building/mosque": {"icon": "maki-place-of-worship", "fields": ["name", "address", "levels", "height"], "geometry": ["area"], "tags": {"building": "mosque"}, "matchScore": 0.5, "name": "Mosque Building"}, + "building/pavilion": {"icon": "maki-building", "fields": ["name", "address", "levels", "height", "smoking"], "geometry": ["area"], "terms": ["sports"], "tags": {"building": "pavilion"}, "matchScore": 0.5, "name": "Pavilion Building"}, "building/public": {"icon": "maki-building", "fields": ["name", "address", "levels", "height", "smoking"], "geometry": ["area"], "tags": {"building": "public"}, "matchScore": 0.5, "name": "Public Building"}, "building/residential": {"icon": "maki-residential-community", "fields": ["name", "address", "levels", "height"], "geometry": ["area"], "tags": {"building": "residential"}, "matchScore": 0.5, "name": "Residential Building"}, "building/retail": {"icon": "maki-commercial", "fields": ["name", "address", "levels", "height", "smoking"], "geometry": ["area"], "tags": {"building": "retail"}, "matchScore": 0.5, "name": "Retail Building"}, diff --git a/data/presets/presets/amenity/shelter/pavilion.json b/data/presets/presets/amenity/shelter/pavilion.json deleted file mode 100644 index ad8474d34..000000000 --- a/data/presets/presets/amenity/shelter/pavilion.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "icon": "maki-shelter", - "fields": [ - "name", - "building_area", - "bench", - "bin" - ], - "geometry": [ - "point", - "vertex", - "area" - ], - "tags": { - "amenity": "shelter", - "shelter_type": "pavilion" - }, - "name": "Pavilion" -} diff --git a/data/presets/presets/building/pavilion.json b/data/presets/presets/building/pavilion.json new file mode 100644 index 000000000..b2fcf810d --- /dev/null +++ b/data/presets/presets/building/pavilion.json @@ -0,0 +1,21 @@ +{ + "icon": "maki-building", + "fields": [ + "name", + "address", + "levels", + "height", + "smoking" + ], + "geometry": [ + "area" + ], + "terms": [ + "sports" + ], + "tags": { + "building": "pavilion" + }, + "matchScore": 0.5, + "name": "Pavilion Building" +} diff --git a/data/taginfo.json b/data/taginfo.json index 431b11e5d..82ac1505c 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -889,13 +889,6 @@ "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", @@ -1636,6 +1629,13 @@ "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/place-of-worship-15.svg?sanitize=true" }, + { + "key": "building", + "value": "pavilion", + "description": "Pavilion Building", + "object_types": ["area"], + "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/building-15.svg?sanitize=true" + }, { "key": "building", "value": "public", diff --git a/dist/locales/en.json b/dist/locales/en.json index 1dab04fda..568d3977e 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -3569,10 +3569,6 @@ "name": "Lean-To", "terms": "" }, - "amenity/shelter/pavilion": { - "name": "Pavilion", - "terms": "" - }, "amenity/shower": { "name": "Shower", "terms": "rain closet" @@ -4005,6 +4001,10 @@ "name": "Mosque Building", "terms": "" }, + "building/pavilion": { + "name": "Pavilion Building", + "terms": "sports" + }, "building/public": { "name": "Public Building", "terms": ""