From 6c8b3a370ae6e23be03e6b2fbcc35ed3f14032e0 Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@7thposition.com>
Date: Thu, 26 Dec 2013 23:43:02 -0500
Subject: [PATCH] remove building_area for school, kindergarden, etc

These keys should not automatically get building=yes added:
amenity/school, amenity/kindergarden,
tourism/picnic_site, tourism/theme_park

Also renamed to "School Grounds" and "Kindergarden Grounds"
for clarity..
---
 data/presets.yaml                              | 8 ++++----
 data/presets/presets.json                      | 9 +++------
 data/presets/presets/amenity/kindergarten.json | 3 +--
 data/presets/presets/amenity/school.json       | 5 ++---
 data/presets/presets/tourism/picnic_site.json  | 4 ++--
 data/presets/presets/tourism/theme_park.json   | 3 +--
 dist/locales/en.json                           | 4 ++--
 7 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/data/presets.yaml b/data/presets.yaml
index b06c03e68..62d6f50c5 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -480,8 +480,8 @@ en:
         name: Hospital
         terms: "<translate with synonyms or related terms for 'Hospital', separated by commas>"
       amenity/kindergarten: 
-        name: Kindergarten
-        terms: "<translate with synonyms or related terms for 'Kindergarten', separated by commas>"
+        name: Kindergarten Grounds
+        terms: "<translate with synonyms or related terms for 'Kindergarten Grounds', separated by commas>"
       amenity/library: 
         name: Library
         terms: "<translate with synonyms or related terms for 'Library', separated by commas>"
@@ -531,8 +531,8 @@ en:
         name: Restaurant
         terms: "<translate with synonyms or related terms for 'Restaurant', separated by commas>"
       amenity/school: 
-        name: School
-        terms: "<translate with synonyms or related terms for 'School', separated by commas>"
+        name: School Grounds
+        terms: "<translate with synonyms or related terms for 'School Grounds', separated by commas>"
       amenity/shelter: 
         name: Shelter
         terms: "<translate with synonyms or related terms for 'Shelter', separated by commas>"
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 9a751caa5..c0d017684 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -862,7 +862,6 @@
     "amenity/kindergarten": {
         "icon": "school",
         "fields": [
-            "building_area",
             "address"
         ],
         "geometry": [
@@ -877,7 +876,7 @@
         "tags": {
             "amenity": "kindergarten"
         },
-        "name": "Kindergarten"
+        "name": "Kindergarten Grounds"
     },
     "amenity/library": {
         "icon": "library",
@@ -1314,7 +1313,6 @@
         "icon": "school",
         "fields": [
             "operator",
-            "building_area",
             "address"
         ],
         "geometry": [
@@ -1343,7 +1341,7 @@
         "tags": {
             "amenity": "school"
         },
-        "name": "School"
+        "name": "School Grounds"
     },
     "amenity/shelter": {
         "fields": [
@@ -7514,9 +7512,9 @@
         "name": "Museum"
     },
     "tourism/picnic_site": {
+        "icon": "park",
         "fields": [
             "operator",
-            "building_area",
             "address"
         ],
         "geometry": [
@@ -7533,7 +7531,6 @@
     "tourism/theme_park": {
         "fields": [
             "operator",
-            "building_area",
             "address"
         ],
         "geometry": [
diff --git a/data/presets/presets/amenity/kindergarten.json b/data/presets/presets/amenity/kindergarten.json
index f4a794333..a2fc1792d 100644
--- a/data/presets/presets/amenity/kindergarten.json
+++ b/data/presets/presets/amenity/kindergarten.json
@@ -1,7 +1,6 @@
 {
     "icon": "school",
     "fields": [
-        "building_area",
         "address"
     ],
     "geometry": [
@@ -16,5 +15,5 @@
     "tags": {
         "amenity": "kindergarten"
     },
-    "name": "Kindergarten"
+    "name": "Kindergarten Grounds"
 }
diff --git a/data/presets/presets/amenity/school.json b/data/presets/presets/amenity/school.json
index 9f9edf685..beed32e3e 100644
--- a/data/presets/presets/amenity/school.json
+++ b/data/presets/presets/amenity/school.json
@@ -2,7 +2,6 @@
     "icon": "school",
     "fields": [
         "operator",
-        "building_area",
         "address"
     ],
     "geometry": [
@@ -31,5 +30,5 @@
     "tags": {
         "amenity": "school"
     },
-    "name": "School"
-}
\ No newline at end of file
+    "name": "School Grounds"
+}
diff --git a/data/presets/presets/tourism/picnic_site.json b/data/presets/presets/tourism/picnic_site.json
index 77651acef..c13bc7854 100644
--- a/data/presets/presets/tourism/picnic_site.json
+++ b/data/presets/presets/tourism/picnic_site.json
@@ -1,7 +1,7 @@
 {
+    "icon": "park",
     "fields": [
         "operator",
-        "building_area",
         "address"
     ],
     "geometry": [
@@ -14,4 +14,4 @@
         "tourism": "picnic_site"
     },
     "name": "Picnic Site"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/tourism/theme_park.json b/data/presets/presets/tourism/theme_park.json
index 1a1ba2bb8..6856bdd92 100644
--- a/data/presets/presets/tourism/theme_park.json
+++ b/data/presets/presets/tourism/theme_park.json
@@ -1,7 +1,6 @@
 {
     "fields": [
         "operator",
-        "building_area",
         "address"
     ],
     "geometry": [
@@ -13,4 +12,4 @@
         "tourism": "theme_park"
     },
     "name": "Theme Park"
-}
\ No newline at end of file
+}
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 894eaf3a1..3c0c0a4a2 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -1071,7 +1071,7 @@
                 "terms": "clinic,emergency room,health service,hospice,infirmary,institution,nursing home,rest home,sanatorium,sanitarium,sick bay,surgery,ward"
             },
             "amenity/kindergarten": {
-                "name": "Kindergarten",
+                "name": "Kindergarten Grounds",
                 "terms": "nursery,preschool"
             },
             "amenity/library": {
@@ -1139,7 +1139,7 @@
                 "terms": "bar,cafeteria,café,canteen,chophouse,coffee shop,diner,dining room,dive*,doughtnut shop,drive-in,eatery,eating house,eating place,fast-food place,fish and chips,greasy spoon,grill,hamburger stand,hashery,hideaway,hotdog stand,inn,joint*,luncheonette,lunchroom,night club,outlet*,pizzeria,saloon,soda fountain,watering hole"
             },
             "amenity/school": {
-                "name": "School",
+                "name": "School Grounds",
                 "terms": "academy,alma mater,blackboard,college,department,discipline,establishment,faculty,hall,halls of ivy,institute,institution,jail*,schoolhouse,seminary,university"
             },
             "amenity/shelter": {