From e3212e6ea4e7442d19a69305f4ba8377146f9fbc Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Sat, 19 Nov 2016 01:08:00 -0500
Subject: [PATCH] Add presets for Aquarium, Resort, Dance Hall (closes #3579)

---
 data/presets.yaml                          | 15 ++++++
 data/presets/presets.json                  | 63 ++++++++++++++++++++++
 data/presets/presets/leisure/dance.json    | 23 ++++++++
 data/presets/presets/leisure/resort.json   | 15 ++++++
 data/presets/presets/tourism/aquarium.json | 22 ++++++++
 data/presets/presets/tourism/zoo.json      |  3 ++
 data/taginfo.json                          | 12 +++++
 dist/locales/en.json                       | 14 ++++-
 8 files changed, 166 insertions(+), 1 deletion(-)
 create mode 100644 data/presets/presets/leisure/dance.json
 create mode 100644 data/presets/presets/leisure/resort.json
 create mode 100644 data/presets/presets/tourism/aquarium.json

diff --git a/data/presets.yaml b/data/presets.yaml
index fd311a3e7..bfedba689 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -2654,6 +2654,11 @@ en:
         name: Common
         # 'terms: open space'
         terms: '<translate with synonyms or related terms for ''Common'', separated by commas>'
+      leisure/dance:
+        # leisure=dance
+        name: Dance Hall
+        # 'terms: ballroom,jive,swing,tango,waltz'
+        terms: '<translate with synonyms or related terms for ''Dance Hall'', separated by commas>'
       leisure/dog_park:
         # leisure=dog_park
         name: Dog Park
@@ -2767,6 +2772,10 @@ en:
         name: Playground
         # 'terms: jungle gym,play area'
         terms: '<translate with synonyms or related terms for ''Playground'', separated by commas>'
+      leisure/resort:
+        # leisure=resort
+        name: Resort
+        terms: '<translate with synonyms or related terms for ''Resort'', separated by commas>'
       leisure/running_track:
         # 'leisure=track, sport=running'
         name: Running Track
@@ -3858,6 +3867,11 @@ en:
         # tourism=apartment
         name: Guest Apartment / Condo
         terms: '<translate with synonyms or related terms for ''Guest Apartment / Condo'', separated by commas>'
+      tourism/aquarium:
+        # tourism=aquarium
+        name: Aquarium
+        # 'terms: fish,sea,water'
+        terms: '<translate with synonyms or related terms for ''Aquarium'', separated by commas>'
       tourism/artwork:
         # tourism=artwork
         name: Artwork
@@ -3944,6 +3958,7 @@ en:
       tourism/zoo:
         # tourism=zoo
         name: Zoo
+        # 'terms: animal'
         terms: '<translate with synonyms or related terms for ''Zoo'', separated by commas>'
       traffic_calming:
         # traffic_calming=*
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 7e38bfe64..17564363a 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -6029,6 +6029,29 @@
             },
             "name": "Common"
         },
+        "leisure/dance": {
+            "fields": [
+                "operator",
+                "address",
+                "building_area",
+                "opening_hours"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "terms": [
+                "ballroom",
+                "jive",
+                "swing",
+                "tango",
+                "waltz"
+            ],
+            "tags": {
+                "leisure": "dance"
+            },
+            "name": "Dance Hall"
+        },
         "leisure/dog_park": {
             "icon": "dog-park",
             "geometry": [
@@ -6490,6 +6513,21 @@
             },
             "name": "Playground"
         },
+        "leisure/resort": {
+            "fields": [
+                "operator",
+                "address",
+                "opening_hours"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "tags": {
+                "leisure": "resort"
+            },
+            "name": "Resort"
+        },
         "leisure/running_track": {
             "icon": "pitch",
             "fields": [
@@ -10778,6 +10816,28 @@
             },
             "name": "Guest Apartment / Condo"
         },
+        "tourism/aquarium": {
+            "icon": "water",
+            "fields": [
+                "operator",
+                "address",
+                "building_area",
+                "opening_hours"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "terms": [
+                "fish",
+                "sea",
+                "water"
+            ],
+            "tags": {
+                "tourism": "aquarium"
+            },
+            "name": "Aquarium"
+        },
         "tourism/artwork": {
             "icon": "art-gallery",
             "fields": [
@@ -11165,6 +11225,9 @@
                 "point",
                 "area"
             ],
+            "terms": [
+                "animal"
+            ],
             "tags": {
                 "tourism": "zoo"
             },
diff --git a/data/presets/presets/leisure/dance.json b/data/presets/presets/leisure/dance.json
new file mode 100644
index 000000000..4bef9be5e
--- /dev/null
+++ b/data/presets/presets/leisure/dance.json
@@ -0,0 +1,23 @@
+{
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "ballroom",
+        "jive",
+        "swing",
+        "tango",
+        "waltz"
+    ],
+    "tags": {
+        "leisure": "dance"
+    },
+    "name": "Dance Hall"
+}
diff --git a/data/presets/presets/leisure/resort.json b/data/presets/presets/leisure/resort.json
new file mode 100644
index 000000000..e37c283d1
--- /dev/null
+++ b/data/presets/presets/leisure/resort.json
@@ -0,0 +1,15 @@
+{
+    "fields": [
+        "operator",
+        "address",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "leisure": "resort"
+    },
+    "name": "Resort"
+}
diff --git a/data/presets/presets/tourism/aquarium.json b/data/presets/presets/tourism/aquarium.json
new file mode 100644
index 000000000..622245b06
--- /dev/null
+++ b/data/presets/presets/tourism/aquarium.json
@@ -0,0 +1,22 @@
+{
+    "icon": "water",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "fish",
+        "sea",
+        "water"
+    ],
+    "tags": {
+        "tourism": "aquarium"
+    },
+    "name": "Aquarium"
+}
diff --git a/data/presets/presets/tourism/zoo.json b/data/presets/presets/tourism/zoo.json
index 1925708cd..46add901b 100644
--- a/data/presets/presets/tourism/zoo.json
+++ b/data/presets/presets/tourism/zoo.json
@@ -9,6 +9,9 @@
         "point",
         "area"
     ],
+    "terms": [
+        "animal"
+    ],
     "tags": {
         "tourism": "zoo"
     },
diff --git a/data/taginfo.json b/data/taginfo.json
index e9c3f7073..2c01b336c 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -1359,6 +1359,10 @@
             "key": "leisure",
             "value": "common"
         },
+        {
+            "key": "leisure",
+            "value": "dance"
+        },
         {
             "key": "leisure",
             "value": "dog_park"
@@ -1459,6 +1463,10 @@
             "key": "leisure",
             "value": "playground"
         },
+        {
+            "key": "leisure",
+            "value": "resort"
+        },
         {
             "key": "sport",
             "value": "running"
@@ -2437,6 +2445,10 @@
             "key": "tourism",
             "value": "apartment"
         },
+        {
+            "key": "tourism",
+            "value": "aquarium"
+        },
         {
             "key": "tourism",
             "value": "artwork"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index b50af2647..9a706a2b8 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -2997,6 +2997,10 @@
                     "name": "Common",
                     "terms": "open space"
                 },
+                "leisure/dance": {
+                    "name": "Dance Hall",
+                    "terms": "ballroom,jive,swing,tango,waltz"
+                },
                 "leisure/dog_park": {
                     "name": "Dog Park",
                     "terms": ""
@@ -3097,6 +3101,10 @@
                     "name": "Playground",
                     "terms": "jungle gym,play area"
                 },
+                "leisure/resort": {
+                    "name": "Resort",
+                    "terms": ""
+                },
                 "leisure/running_track": {
                     "name": "Running Track",
                     "terms": ""
@@ -4093,6 +4101,10 @@
                     "name": "Guest Apartment / Condo",
                     "terms": ""
                 },
+                "tourism/aquarium": {
+                    "name": "Aquarium",
+                    "terms": "fish,sea,water"
+                },
                 "tourism/artwork": {
                     "name": "Artwork",
                     "terms": "mural,sculpture,statue"
@@ -4171,7 +4183,7 @@
                 },
                 "tourism/zoo": {
                     "name": "Zoo",
-                    "terms": ""
+                    "terms": "animal"
                 },
                 "traffic_calming": {
                     "name": "Traffic Calming",