From 97f1830e3ba6e617d0d8ed2f331208ce8b715c2c Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Wed, 25 Nov 2015 01:28:35 -0500
Subject: [PATCH] Disambiguate building presets (closes #2799)

* "Church" -> "Church Building"
* Match generic building=* preset for nodes
* Don't match specific building presets for nodes

This means that if a user adds a node and types "School" they will be
offered the amenity, not the building.
---
 data/presets.yaml                             | 12 +++---
 data/presets/presets.json                     | 40 ++-----------------
 data/presets/presets/building.json            |  1 +
 data/presets/presets/building/apartments.json |  1 -
 data/presets/presets/building/barn.json       |  1 -
 data/presets/presets/building/bunker.json     |  1 -
 data/presets/presets/building/cabin.json      |  1 -
 data/presets/presets/building/cathedral.json  |  3 +-
 data/presets/presets/building/chapel.json     |  3 +-
 data/presets/presets/building/church.json     |  3 +-
 data/presets/presets/building/college.json    |  1 -
 data/presets/presets/building/commercial.json |  1 -
 .../presets/building/construction.json        |  1 -
 data/presets/presets/building/detached.json   |  1 -
 data/presets/presets/building/dormitory.json  |  1 -
 data/presets/presets/building/garage.json     |  1 -
 data/presets/presets/building/garages.json    |  1 -
 data/presets/presets/building/greenhouse.json |  1 -
 data/presets/presets/building/hospital.json   |  1 -
 data/presets/presets/building/hotel.json      |  1 -
 data/presets/presets/building/house.json      |  1 -
 data/presets/presets/building/hut.json        |  1 -
 data/presets/presets/building/industrial.json |  1 -
 .../presets/building/kindergarten.json        |  1 -
 data/presets/presets/building/public.json     |  1 -
 .../presets/presets/building/residential.json |  1 -
 data/presets/presets/building/retail.json     |  1 -
 data/presets/presets/building/roof.json       |  1 -
 data/presets/presets/building/school.json     |  1 -
 .../presets/building/semidetached_house.json  |  1 -
 data/presets/presets/building/shed.json       |  1 -
 data/presets/presets/building/stable.json     |  1 -
 .../presets/building/static_caravan.json      |  1 -
 data/presets/presets/building/terrace.json    |  1 -
 data/presets/presets/building/university.json |  1 -
 data/presets/presets/building/warehouse.json  |  1 -
 dist/locales/en.json                          |  6 +--
 37 files changed, 17 insertions(+), 81 deletions(-)

diff --git a/data/presets.yaml b/data/presets.yaml
index e8ab4c31d..a4a2deeb3 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -1640,16 +1640,16 @@ en:
         terms: "<translate with synonyms or related terms for 'Cabin', separated by commas>"
       building/cathedral:
         # building=cathedral
-        name: Cathedral
-        terms: "<translate with synonyms or related terms for 'Cathedral', separated by commas>"
+        name: Cathedral Building
+        terms: "<translate with synonyms or related terms for 'Cathedral Building', separated by commas>"
       building/chapel:
         # building=chapel
-        name: Chapel
-        terms: "<translate with synonyms or related terms for 'Chapel', separated by commas>"
+        name: Chapel Building
+        terms: "<translate with synonyms or related terms for 'Chapel Building', separated by commas>"
       building/church:
         # building=church
-        name: Church
-        terms: "<translate with synonyms or related terms for 'Church', separated by commas>"
+        name: Church Building
+        terms: "<translate with synonyms or related terms for 'Church Building', separated by commas>"
       building/college:
         # building=college
         name: College Building
diff --git a/data/presets/presets.json b/data/presets/presets.json
index e67677665..11033ccc2 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -2220,6 +2220,7 @@
             "address"
         ],
         "geometry": [
+            "point",
             "area"
         ],
         "tags": {
@@ -2235,7 +2236,6 @@
             "levels"
         ],
         "geometry": [
-            "point",
             "area"
         ],
         "tags": {
@@ -2250,7 +2250,6 @@
             "levels"
         ],
         "geometry": [
-            "point",
             "area"
         ],
         "tags": {
@@ -2264,7 +2263,6 @@
             "levels"
         ],
         "geometry": [
-            "point",
             "area"
         ],
         "tags": {
@@ -2280,7 +2278,6 @@
             "levels"
         ],
         "geometry": [
-            "point",
             "area"
         ],
         "tags": {
@@ -2295,13 +2292,12 @@
             "levels"
         ],
         "geometry": [
-            "point",
             "area"
         ],
         "tags": {
             "building": "cathedral"
         },
-        "name": "Cathedral"
+        "name": "Cathedral Building"
     },
     "building/chapel": {
         "icon": "place-of-worship",
@@ -2310,13 +2306,12 @@
             "levels"
         ],
         "geometry": [
-            "point",
             "area"
         ],
         "tags": {
             "building": "chapel"
         },
-        "name": "Chapel"
+        "name": "Chapel Building"
     },
     "building/church": {
         "icon": "place-of-worship",
@@ -2325,13 +2320,12 @@
             "levels"
         ],
         "geometry": [
-            "point",
             "area"
         ],
         "tags": {
             "building": "church"
         },
-        "name": "Church"
+        "name": "Church Building"
     },
     "building/college": {
         "icon": "building",
@@ -2340,7 +2334,6 @@
             "levels"
         ],
         "geometry": [
-            "point",
             "area"
         ],
         "terms": [
@@ -2359,7 +2352,6 @@
             "smoking"
         ],
         "geometry": [
-            "point",
             "area"
         ],
         "tags": {
@@ -2374,7 +2366,6 @@
             "levels"
         ],
         "geometry": [
-            "point",
             "area"
         ],
         "tags": {
@@ -2389,7 +2380,6 @@
             "levels"
         ],
         "geometry": [
-            "point",
             "area"
         ],
         "tags": {
@@ -2412,7 +2402,6 @@
             "smoking"
         ],
         "geometry": [
-            "point",
             "area"
         ],
         "tags": {
@@ -2436,7 +2425,6 @@
             "capacity"
         ],
         "geometry": [
-            "point",
             "area"
         ],
         "tags": {
@@ -2451,7 +2439,6 @@
             "capacity"
         ],
         "geometry": [
-            "point",
             "area"
         ],
         "tags": {
@@ -2466,7 +2453,6 @@
             "levels"
         ],
         "geometry": [
-            "point",
             "area"
         ],
         "tags": {
@@ -2481,7 +2467,6 @@
             "levels"
         ],
         "geometry": [
-            "point",
             "area"
         ],
         "tags": {
@@ -2497,7 +2482,6 @@
             "smoking"
         ],
         "geometry": [
-            "point",
             "area"
         ],
         "tags": {
@@ -2512,7 +2496,6 @@
             "levels"
         ],
         "geometry": [
-            "point",
             "area"
         ],
         "tags": {
@@ -2528,7 +2511,6 @@
     },
     "building/hut": {
         "geometry": [
-            "point",
             "area"
         ],
         "tags": {
@@ -2543,7 +2525,6 @@
             "levels"
         ],
         "geometry": [
-            "point",
             "area"
         ],
         "tags": {
@@ -2558,7 +2539,6 @@
             "levels"
         ],
         "geometry": [
-            "point",
             "area"
         ],
         "terms": [
@@ -2578,7 +2558,6 @@
             "smoking"
         ],
         "geometry": [
-            "point",
             "area"
         ],
         "tags": {
@@ -2593,7 +2572,6 @@
             "levels"
         ],
         "geometry": [
-            "point",
             "area"
         ],
         "tags": {
@@ -2609,7 +2587,6 @@
             "smoking"
         ],
         "geometry": [
-            "point",
             "area"
         ],
         "tags": {
@@ -2623,7 +2600,6 @@
             "address"
         ],
         "geometry": [
-            "point",
             "area"
         ],
         "tags": {
@@ -2638,7 +2614,6 @@
             "levels"
         ],
         "geometry": [
-            "point",
             "area"
         ],
         "terms": [
@@ -2659,7 +2634,6 @@
             "levels"
         ],
         "geometry": [
-            "point",
             "area"
         ],
         "tags": {
@@ -2683,7 +2657,6 @@
             "levels"
         ],
         "geometry": [
-            "point",
             "area"
         ],
         "tags": {
@@ -2698,7 +2671,6 @@
             "levels"
         ],
         "geometry": [
-            "point",
             "area"
         ],
         "tags": {
@@ -2713,7 +2685,6 @@
             "levels"
         ],
         "geometry": [
-            "point",
             "area"
         ],
         "tags": {
@@ -2728,7 +2699,6 @@
             "levels"
         ],
         "geometry": [
-            "point",
             "area"
         ],
         "tags": {
@@ -2768,7 +2738,6 @@
             "levels"
         ],
         "geometry": [
-            "point",
             "area"
         ],
         "terms": [
@@ -2786,7 +2755,6 @@
             "levels"
         ],
         "geometry": [
-            "point",
             "area"
         ],
         "tags": {
diff --git a/data/presets/presets/building.json b/data/presets/presets/building.json
index e25911488..5a5e9d6b8 100644
--- a/data/presets/presets/building.json
+++ b/data/presets/presets/building.json
@@ -6,6 +6,7 @@
         "address"
     ],
     "geometry": [
+        "point",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/building/apartments.json b/data/presets/presets/building/apartments.json
index a08ad5ca7..09a403e92 100644
--- a/data/presets/presets/building/apartments.json
+++ b/data/presets/presets/building/apartments.json
@@ -5,7 +5,6 @@
         "levels"
     ],
     "geometry": [
-        "point",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/building/barn.json b/data/presets/presets/building/barn.json
index 8ca6ba5dd..7f2ccda09 100644
--- a/data/presets/presets/building/barn.json
+++ b/data/presets/presets/building/barn.json
@@ -5,7 +5,6 @@
         "levels"
     ],
     "geometry": [
-        "point",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/building/bunker.json b/data/presets/presets/building/bunker.json
index 7cddea7ba..48e5db5d4 100644
--- a/data/presets/presets/building/bunker.json
+++ b/data/presets/presets/building/bunker.json
@@ -4,7 +4,6 @@
         "levels"
     ],
     "geometry": [
-        "point",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/building/cabin.json b/data/presets/presets/building/cabin.json
index eeb89a279..8ed028aaf 100644
--- a/data/presets/presets/building/cabin.json
+++ b/data/presets/presets/building/cabin.json
@@ -5,7 +5,6 @@
         "levels"
     ],
     "geometry": [
-        "point",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/building/cathedral.json b/data/presets/presets/building/cathedral.json
index 130df7a40..25b96adce 100644
--- a/data/presets/presets/building/cathedral.json
+++ b/data/presets/presets/building/cathedral.json
@@ -5,11 +5,10 @@
         "levels"
     ],
     "geometry": [
-        "point",
         "area"
     ],
     "tags": {
         "building": "cathedral"
     },
-    "name": "Cathedral"
+    "name": "Cathedral Building"
 }
diff --git a/data/presets/presets/building/chapel.json b/data/presets/presets/building/chapel.json
index d403a6838..ce07621b1 100644
--- a/data/presets/presets/building/chapel.json
+++ b/data/presets/presets/building/chapel.json
@@ -5,11 +5,10 @@
         "levels"
     ],
     "geometry": [
-        "point",
         "area"
     ],
     "tags": {
         "building": "chapel"
     },
-    "name": "Chapel"
+    "name": "Chapel Building"
 }
diff --git a/data/presets/presets/building/church.json b/data/presets/presets/building/church.json
index 3c786b694..f63e910bd 100644
--- a/data/presets/presets/building/church.json
+++ b/data/presets/presets/building/church.json
@@ -5,11 +5,10 @@
         "levels"
     ],
     "geometry": [
-        "point",
         "area"
     ],
     "tags": {
         "building": "church"
     },
-    "name": "Church"
+    "name": "Church Building"
 }
diff --git a/data/presets/presets/building/college.json b/data/presets/presets/building/college.json
index 67836d615..9d6bb4964 100644
--- a/data/presets/presets/building/college.json
+++ b/data/presets/presets/building/college.json
@@ -5,7 +5,6 @@
         "levels"
     ],
     "geometry": [
-        "point",
         "area"
     ],
     "terms": [
diff --git a/data/presets/presets/building/commercial.json b/data/presets/presets/building/commercial.json
index 1290bc445..98f170160 100644
--- a/data/presets/presets/building/commercial.json
+++ b/data/presets/presets/building/commercial.json
@@ -6,7 +6,6 @@
         "smoking"
     ],
     "geometry": [
-        "point",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/building/construction.json b/data/presets/presets/building/construction.json
index cc21c71fd..77eb525ee 100644
--- a/data/presets/presets/building/construction.json
+++ b/data/presets/presets/building/construction.json
@@ -5,7 +5,6 @@
         "levels"
     ],
     "geometry": [
-        "point",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/building/detached.json b/data/presets/presets/building/detached.json
index d51a47d50..e5847da2c 100644
--- a/data/presets/presets/building/detached.json
+++ b/data/presets/presets/building/detached.json
@@ -5,7 +5,6 @@
         "levels"
     ],
     "geometry": [
-        "point",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/building/dormitory.json b/data/presets/presets/building/dormitory.json
index fe5528250..080b5d80c 100644
--- a/data/presets/presets/building/dormitory.json
+++ b/data/presets/presets/building/dormitory.json
@@ -6,7 +6,6 @@
         "smoking"
     ],
     "geometry": [
-        "point",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/building/garage.json b/data/presets/presets/building/garage.json
index 41aa55a01..4e533fdd4 100644
--- a/data/presets/presets/building/garage.json
+++ b/data/presets/presets/building/garage.json
@@ -3,7 +3,6 @@
         "capacity"
     ],
     "geometry": [
-        "point",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/building/garages.json b/data/presets/presets/building/garages.json
index a25331ac9..55793fcf3 100644
--- a/data/presets/presets/building/garages.json
+++ b/data/presets/presets/building/garages.json
@@ -4,7 +4,6 @@
         "capacity"
     ],
     "geometry": [
-        "point",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/building/greenhouse.json b/data/presets/presets/building/greenhouse.json
index 5c1dedc00..feb3d4492 100644
--- a/data/presets/presets/building/greenhouse.json
+++ b/data/presets/presets/building/greenhouse.json
@@ -5,7 +5,6 @@
         "levels"
     ],
     "geometry": [
-        "point",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/building/hospital.json b/data/presets/presets/building/hospital.json
index d4ae10cdc..170b97f36 100644
--- a/data/presets/presets/building/hospital.json
+++ b/data/presets/presets/building/hospital.json
@@ -5,7 +5,6 @@
         "levels"
     ],
     "geometry": [
-        "point",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/building/hotel.json b/data/presets/presets/building/hotel.json
index d162e754a..b76757f13 100644
--- a/data/presets/presets/building/hotel.json
+++ b/data/presets/presets/building/hotel.json
@@ -6,7 +6,6 @@
         "smoking"
     ],
     "geometry": [
-        "point",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/building/house.json b/data/presets/presets/building/house.json
index 0aed03b8c..5ecfd2f05 100644
--- a/data/presets/presets/building/house.json
+++ b/data/presets/presets/building/house.json
@@ -5,7 +5,6 @@
         "levels"
     ],
     "geometry": [
-        "point",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/building/hut.json b/data/presets/presets/building/hut.json
index 8e9c886a1..f3ceca080 100644
--- a/data/presets/presets/building/hut.json
+++ b/data/presets/presets/building/hut.json
@@ -1,6 +1,5 @@
 {
     "geometry": [
-        "point",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/building/industrial.json b/data/presets/presets/building/industrial.json
index b811d102a..283bd7752 100644
--- a/data/presets/presets/building/industrial.json
+++ b/data/presets/presets/building/industrial.json
@@ -5,7 +5,6 @@
         "levels"
     ],
     "geometry": [
-        "point",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/building/kindergarten.json b/data/presets/presets/building/kindergarten.json
index ec4fab7ab..9d4eac599 100644
--- a/data/presets/presets/building/kindergarten.json
+++ b/data/presets/presets/building/kindergarten.json
@@ -5,7 +5,6 @@
         "levels"
     ],
     "geometry": [
-        "point",
         "area"
     ],
     "terms": [
diff --git a/data/presets/presets/building/public.json b/data/presets/presets/building/public.json
index 75798fc2e..5276110ef 100644
--- a/data/presets/presets/building/public.json
+++ b/data/presets/presets/building/public.json
@@ -6,7 +6,6 @@
         "smoking"
     ],
     "geometry": [
-        "point",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/building/residential.json b/data/presets/presets/building/residential.json
index 116f1eeb1..2015f9e80 100644
--- a/data/presets/presets/building/residential.json
+++ b/data/presets/presets/building/residential.json
@@ -5,7 +5,6 @@
         "levels"
     ],
     "geometry": [
-        "point",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/building/retail.json b/data/presets/presets/building/retail.json
index d4eaddef2..418e24652 100644
--- a/data/presets/presets/building/retail.json
+++ b/data/presets/presets/building/retail.json
@@ -6,7 +6,6 @@
         "smoking"
     ],
     "geometry": [
-        "point",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/building/roof.json b/data/presets/presets/building/roof.json
index 802f90e8c..d7e9ccfcd 100644
--- a/data/presets/presets/building/roof.json
+++ b/data/presets/presets/building/roof.json
@@ -4,7 +4,6 @@
         "address"
     ],
     "geometry": [
-        "point",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/building/school.json b/data/presets/presets/building/school.json
index 2f9f5061d..ce4168131 100644
--- a/data/presets/presets/building/school.json
+++ b/data/presets/presets/building/school.json
@@ -5,7 +5,6 @@
         "levels"
     ],
     "geometry": [
-        "point",
         "area"
     ],
     "terms": [
diff --git a/data/presets/presets/building/semidetached_house.json b/data/presets/presets/building/semidetached_house.json
index 7e0ecedb0..f074adf2c 100644
--- a/data/presets/presets/building/semidetached_house.json
+++ b/data/presets/presets/building/semidetached_house.json
@@ -5,7 +5,6 @@
         "levels"
     ],
     "geometry": [
-        "point",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/building/shed.json b/data/presets/presets/building/shed.json
index d9b58d192..8935c4397 100644
--- a/data/presets/presets/building/shed.json
+++ b/data/presets/presets/building/shed.json
@@ -5,7 +5,6 @@
         "levels"
     ],
     "geometry": [
-        "point",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/building/stable.json b/data/presets/presets/building/stable.json
index 12d8262d1..ba43b6518 100644
--- a/data/presets/presets/building/stable.json
+++ b/data/presets/presets/building/stable.json
@@ -5,7 +5,6 @@
         "levels"
     ],
     "geometry": [
-        "point",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/building/static_caravan.json b/data/presets/presets/building/static_caravan.json
index 626e6341b..f1120daa1 100644
--- a/data/presets/presets/building/static_caravan.json
+++ b/data/presets/presets/building/static_caravan.json
@@ -5,7 +5,6 @@
         "levels"
     ],
     "geometry": [
-        "point",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/building/terrace.json b/data/presets/presets/building/terrace.json
index 8ce767bb0..90911e4b9 100644
--- a/data/presets/presets/building/terrace.json
+++ b/data/presets/presets/building/terrace.json
@@ -5,7 +5,6 @@
         "levels"
     ],
     "geometry": [
-        "point",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/building/university.json b/data/presets/presets/building/university.json
index ace9d0014..2a7487fe2 100644
--- a/data/presets/presets/building/university.json
+++ b/data/presets/presets/building/university.json
@@ -5,7 +5,6 @@
         "levels"
     ],
     "geometry": [
-        "point",
         "area"
     ],
     "terms": [
diff --git a/data/presets/presets/building/warehouse.json b/data/presets/presets/building/warehouse.json
index 96f68cf4d..84f0ce3e9 100644
--- a/data/presets/presets/building/warehouse.json
+++ b/data/presets/presets/building/warehouse.json
@@ -5,7 +5,6 @@
         "levels"
     ],
     "geometry": [
-        "point",
         "area"
     ],
     "tags": {
diff --git a/dist/locales/en.json b/dist/locales/en.json
index f44ee1635..1fd62dc4a 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -1980,15 +1980,15 @@
                 "terms": ""
             },
             "building/cathedral": {
-                "name": "Cathedral",
+                "name": "Cathedral Building",
                 "terms": ""
             },
             "building/chapel": {
-                "name": "Chapel",
+                "name": "Chapel Building",
                 "terms": ""
             },
             "building/church": {
-                "name": "Church",
+                "name": "Church Building",
                 "terms": ""
             },
             "building/college": {