From 23c0262bc334461a129e902e7e0707b2ea327cb3 Mon Sep 17 00:00:00 2001
From: JamesKingdom <james@unetworks.org>
Date: Thu, 8 Jun 2017 19:03:10 +0100
Subject: [PATCH 1/3] Add distillery

---
 data/presets.yaml         |  5 +++++
 data/presets/presets.json | 21 +++++++++++++++++++++
 data/taginfo.json         |  4 ++++
 dist/locales/en.json      |  4 ++++
 4 files changed, 34 insertions(+)

diff --git a/data/presets.yaml b/data/presets.yaml
index 73eb3e338..076a2f82c 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -2277,6 +2277,11 @@ en:
         name: Confectionery
         # 'terms: sweets,candy'
         terms: '<translate with synonyms or related terms for ''Confectionery'', separated by commas>'
+      craft/distillery:
+        # craft=distillery
+        name: Distillery
+        # 'terms: beer,bier'
+        terms: '<translate with synonyms or related terms for ''Distillery'', separated by commas>'
       craft/dressmaker:
         # craft=dressmaker
         name: Dressmaker
diff --git a/data/presets/presets.json b/data/presets/presets.json
index ba308aead..3c04fdaf7 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -4240,6 +4240,27 @@
             },
             "name": "Confectionery"
         },
+        "craft/distillery": {
+            "icon": "beer",
+            "fields": [
+                "operator",
+                "address",
+                "building_area",
+                "opening_hours"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "terms": [
+                "beer",
+                "bier"
+            ],
+            "tags": {
+                "craft": "distillery"
+            },
+            "name": "Distillery"
+        },
         "craft/dressmaker": {
             "icon": "clothing-store",
             "fields": [
diff --git a/data/taginfo.json b/data/taginfo.json
index cc55e9101..1028448f8 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -870,6 +870,10 @@
             "key": "craft",
             "value": "confectionery"
         },
+        {
+            "key": "craft",
+            "value": "distillery"
+        },
         {
             "key": "craft",
             "value": "dressmaker"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index da87f9381..105aae5e5 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -3035,6 +3035,10 @@
                     "name": "Confectionery",
                     "terms": "sweets,candy"
                 },
+                "craft/distillery": {
+                    "name": "Distillery",
+                    "terms": "beer,bier"
+                },
                 "craft/dressmaker": {
                     "name": "Dressmaker",
                     "terms": "seamstress"

From fa123716c7bf670c6fdc4e5545b4e7069e42e8eb Mon Sep 17 00:00:00 2001
From: JamesKingdom <james@unetworks.org>
Date: Thu, 8 Jun 2017 19:04:19 +0100
Subject: [PATCH 2/3] Add distillery

---
 data/presets/presets/craft/distillery.json | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 data/presets/presets/craft/distillery.json

diff --git a/data/presets/presets/craft/distillery.json b/data/presets/presets/craft/distillery.json
new file mode 100644
index 000000000..8b8773499
--- /dev/null
+++ b/data/presets/presets/craft/distillery.json
@@ -0,0 +1,21 @@
+{
+    "icon": "beer",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "beer",
+        "bier"
+    ],
+    "tags": {
+        "craft": "distillery"
+    },
+    "name": "Distillery"
+}

From 3457316108a82072aae6f0bdf6e2402bae236304 Mon Sep 17 00:00:00 2001
From: JamesKingdom <james@unetworks.org>
Date: Thu, 8 Jun 2017 19:18:52 +0100
Subject: [PATCH 3/3] Add other terms

---
 data/presets.yaml                          | 2 +-
 data/presets/presets.json                  | 9 +++++++--
 data/presets/presets/craft/distillery.json | 9 +++++++--
 dist/locales/en.json                       | 2 +-
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/data/presets.yaml b/data/presets.yaml
index 076a2f82c..ede5bef2d 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -2280,7 +2280,7 @@ en:
       craft/distillery:
         # craft=distillery
         name: Distillery
-        # 'terms: beer,bier'
+        # 'terms: beer,bier,non-beer,spirits,liquor,hard alcohol,beverage'
         terms: '<translate with synonyms or related terms for ''Distillery'', separated by commas>'
       craft/dressmaker:
         # craft=dressmaker
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 3c04fdaf7..894f4e5a6 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -4241,7 +4241,7 @@
             "name": "Confectionery"
         },
         "craft/distillery": {
-            "icon": "beer",
+            "icon": "poi-storage-tank",
             "fields": [
                 "operator",
                 "address",
@@ -4254,7 +4254,12 @@
             ],
             "terms": [
                 "beer",
-                "bier"
+                "bier",
+                "non-beer",
+                "spirits",
+                "liquor",
+                "hard alcohol",
+                "beverage"
             ],
             "tags": {
                 "craft": "distillery"
diff --git a/data/presets/presets/craft/distillery.json b/data/presets/presets/craft/distillery.json
index 8b8773499..924083368 100644
--- a/data/presets/presets/craft/distillery.json
+++ b/data/presets/presets/craft/distillery.json
@@ -1,5 +1,5 @@
 {
-    "icon": "beer",
+    "icon": "poi-storage-tank",
     "fields": [
         "operator",
         "address",
@@ -12,7 +12,12 @@
     ],
     "terms": [
         "beer",
-        "bier"
+        "bier",
+        "non-beer",
+        "spirits",
+        "liquor",
+        "hard alcohol",
+        "beverage"
     ],
     "tags": {
         "craft": "distillery"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 105aae5e5..d9ed34fcc 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -3037,7 +3037,7 @@
                 },
                 "craft/distillery": {
                     "name": "Distillery",
-                    "terms": "beer,bier"
+                    "terms": "beer,bier,non-beer,spirits,liquor,hard alcohol,beverage"
                 },
                 "craft/dressmaker": {
                     "name": "Dressmaker",