Change "Pavilion" from an amenity=shelter to a building=pavilion

(closes #5325)

https://wiki.openstreetmap.org/wiki/Tag:building%3Dpavilion

data/presets.yaml

@@ -2459,10 +2459,6 @@ en:
         # 'amenity=shelter, shelter_type=lean_to'
         name: Lean-To
         terms: '<translate with synonyms or related terms for ''Lean-To'', separated by commas>'
-      amenity/shelter/pavilion:
-        # 'amenity=shelter, shelter_type=pavilion'
-        name: Pavilion
-        terms: '<translate with synonyms or related terms for ''Pavilion'', separated by commas>'
       amenity/shower:
         # amenity=shower
         name: Shower
@@ -2944,6 +2940,11 @@ en:
         # building=mosque
         name: Mosque Building
         terms: '<translate with synonyms or related terms for ''Mosque Building'', separated by commas>'
+      building/pavilion:
+        # building=pavilion
+        name: Pavilion Building
+        # 'terms: sports'
+        terms: '<translate with synonyms or related terms for ''Pavilion Building'', separated by commas>'
       building/public:
         # building=public
         name: Public Building

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"},

data/presets/presets/amenity/shelter/pavilion.json

@@ -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"
-}

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"
+}

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",

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": ""