From d2a314ff01deaf02ce336b02047e62b66de52fac Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Thu, 16 Mar 2017 13:55:48 -0400
Subject: [PATCH] Add preset for club=* (re: #3651)

---
 data/presets.yaml              |  8 ++++++++
 data/presets/fields.json       |  5 +++++
 data/presets/fields/club.json  |  5 +++++
 data/presets/presets.json      | 21 +++++++++++++++++++++
 data/presets/presets/club.json | 21 +++++++++++++++++++++
 data/taginfo.json              |  3 +++
 dist/locales/en.json           |  7 +++++++
 7 files changed, 70 insertions(+)
 create mode 100644 data/presets/fields/club.json
 create mode 100644 data/presets/presets/club.json

diff --git a/data/presets.yaml b/data/presets.yaml
index 54c843350..861a9fd4d 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -316,6 +316,9 @@ en:
           anticlockwise: Counterclockwise
           # direction=clockwise
           clockwise: Clockwise
+      club:
+        # club=*
+        label: Type
       collection_times:
         # collection_times=*
         label: Collection Times
@@ -2189,6 +2192,11 @@ en:
         name: Camp Pitch
         # 'terms: tent,rv'
         terms: '<translate with synonyms or related terms for ''Camp Pitch'', separated by commas>'
+      club:
+        # club=*
+        name: Club
+        # 'terms: social'
+        terms: '<translate with synonyms or related terms for ''Club'', separated by commas>'
       craft:
         # craft=*
         name: Craft
diff --git a/data/presets/fields.json b/data/presets/fields.json
index c51733d1b..1d329dea0 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -401,6 +401,11 @@
                 }
             }
         },
+        "club": {
+            "key": "club",
+            "type": "typeCombo",
+            "label": "Type"
+        },
         "collection_times": {
             "key": "collection_times",
             "type": "text",
diff --git a/data/presets/fields/club.json b/data/presets/fields/club.json
new file mode 100644
index 000000000..9483b0113
--- /dev/null
+++ b/data/presets/fields/club.json
@@ -0,0 +1,5 @@
+{
+    "key": "club",
+    "type": "typeCombo",
+    "label": "Type"
+}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index f832f8694..db95c5e5d 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -3781,6 +3781,27 @@
             },
             "name": "Camp Pitch"
         },
+        "club": {
+            "icon": "heart",
+            "fields": [
+                "club",
+                "operator",
+                "address",
+                "building_area",
+                "opening_hours"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "tags": {
+                "club": "*"
+            },
+            "terms": [
+                "social"
+            ],
+            "name": "Club"
+        },
         "craft": {
             "icon": "poi-tool",
             "fields": [
diff --git a/data/presets/presets/club.json b/data/presets/presets/club.json
new file mode 100644
index 000000000..45d86d73e
--- /dev/null
+++ b/data/presets/presets/club.json
@@ -0,0 +1,21 @@
+{
+    "icon": "heart",
+    "fields": [
+        "club",
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "club": "*"
+    },
+    "terms": [
+        "social"
+    ],
+    "name": "Club"
+}
diff --git a/data/taginfo.json b/data/taginfo.json
index 61a8bda72..60fa5a30d 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -796,6 +796,9 @@
             "key": "camp_site",
             "value": "camp_pitch"
         },
+        {
+            "key": "club"
+        },
         {
             "key": "craft"
         },
diff --git a/dist/locales/en.json b/dist/locales/en.json
index e32274bec..e8cc898a0 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -1003,6 +1003,9 @@
                         "anticlockwise": "Counterclockwise"
                     }
                 },
+                "club": {
+                    "label": "Type"
+                },
                 "collection_times": {
                     "label": "Collection Times"
                 },
@@ -2656,6 +2659,10 @@
                     "name": "Camp Pitch",
                     "terms": "tent,rv"
                 },
+                "club": {
+                    "name": "Club",
+                    "terms": "social"
+                },
                 "craft": {
                     "name": "Craft",
                     "terms": ""