From c63541379c012a9eaa566f97979eb68e20dfe7dc Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Wed, 25 Jul 2018 21:15:03 -0400
Subject: [PATCH] Add building fields for pavilions and shelters in walkthrough
 (re: #5084)

---
 data/intro_graph.json                      | 12 ++++++++++--
 data/presets/presets.json                  |  2 +-
 data/presets/presets/amenity/pavilion.json |  8 +++++---
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/data/intro_graph.json b/data/intro_graph.json
index fcf2b191e..51fce20fa 100644
--- a/data/intro_graph.json
+++ b/data/intro_graph.json
@@ -21494,7 +21494,8 @@
       "id": "w136",
       "nodes": ["n612", "n613", "n614", "n615", "n612"],
       "tags": {
-        "amenity": "shelter"
+        "amenity": "shelter",
+        "building": "yes"
       }
     },
     "w137": {
@@ -23457,6 +23458,7 @@
       "nodes": ["n2018", "n1626", "n1627", "n2017", "n2018"],
       "tags": {
         "amenity": "shelter",
+        "building": "yes",
         "shelter_type": "picnic_shelter"
       }
     },
@@ -24072,6 +24074,7 @@
       "nodes": ["n2050", "n2051", "n2052", "n2053", "n2050"],
       "tags": {
         "amenity": "shelter",
+        "building": "yes",
         "shelter_type": "picnic_shelter"
       }
     },
@@ -24370,6 +24373,7 @@
       "nodes": ["n2054", "n2055", "n2056", "n2057", "n2054"],
       "tags": {
         "amenity": "shelter",
+        "building": "yes",
         "shelter_type": "picnic_shelter"
       }
     },
@@ -24753,6 +24757,7 @@
       "nodes": ["n217", "n218", "n219", "n220", "n217"],
       "tags": {
         "amenity": "shelter",
+        "building": "yes",
         "shelter_type": "picnic_shelter"
       }
     },
@@ -24835,6 +24840,7 @@
       "nodes": ["n221", "n222", "n223", "n224", "n221"],
       "tags": {
         "amenity": "shelter",
+        "building": "yes",
         "shelter_type": "picnic_shelter"
       }
     },
@@ -26081,6 +26087,7 @@
       "nodes": ["n3021", "n3022", "n3023", "n3024", "n3021"],
       "tags": {
         "amenity": "shelter",
+        "building": "yes",
         "shelter_type": "picnic_shelter"
       }
     },
@@ -28716,7 +28723,8 @@
       "nodes": ["n4669", "n4670", "n4671", "n4672", "n4669"],
       "tags": {
         "amenity": "shelter",
-        "shelter_type": "picnic_shelters"
+        "building": "yes",
+        "shelter_type": "picnic_shelter"
       }
     },
     "w815": {
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 5c824b596..62e881f36 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -102,7 +102,7 @@
     "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": ["bin", "bench"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "shelter", "shelter_type": "pavilion"}, "name": "Pavilion"},
+    "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": ["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"},
diff --git a/data/presets/presets/amenity/pavilion.json b/data/presets/presets/amenity/pavilion.json
index b17fe8d5b..ad8474d34 100644
--- a/data/presets/presets/amenity/pavilion.json
+++ b/data/presets/presets/amenity/pavilion.json
@@ -1,8 +1,10 @@
 {
     "icon": "maki-shelter",
     "fields": [
-        "bin",
-        "bench"
+        "name",
+        "building_area",
+        "bench",
+        "bin"
     ],
     "geometry": [
         "point",
@@ -11,7 +13,7 @@
     ],
     "tags": {
         "amenity": "shelter",
-    "shelter_type": "pavilion"
+        "shelter_type": "pavilion"
     },
     "name": "Pavilion"
 }