From 641554f5d9fbc825a007584fa22f91b05f1c5796 Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Thu, 8 Jun 2017 14:59:29 -0400
Subject: [PATCH] Add terms and product field to brewery and distillery presets

---
 data/presets.yaml                          |  4 +--
 data/presets/presets.json                  | 37 ++++++++++++++++------
 data/presets/presets/craft/brewery.json    | 11 +++++--
 data/presets/presets/craft/distillery.json | 26 +++++++++++----
 dist/locales/en.json                       |  4 +--
 5 files changed, 58 insertions(+), 24 deletions(-)

diff --git a/data/presets.yaml b/data/presets.yaml
index ede5bef2d..ef477fc24 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -2253,7 +2253,7 @@ en:
       craft/brewery:
         # craft=brewery
         name: Brewery
-        # 'terms: beer,bier'
+        # 'terms: alcohol,beer,beverage,bier,booze,cider'
         terms: '<translate with synonyms or related terms for ''Brewery'', separated by commas>'
       craft/carpenter:
         # craft=carpenter
@@ -2280,7 +2280,7 @@ en:
       craft/distillery:
         # craft=distillery
         name: Distillery
-        # 'terms: beer,bier,non-beer,spirits,liquor,hard alcohol,beverage'
+        # 'terms: alcohol,beverage,bourbon,booze,brandy,gin,hooch,liquor,mezcal,moonshine,rum,scotch,spirits,still,tequila,vodka,whiskey,whisky'
         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 894f4e5a6..4be539c6f 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -4127,20 +4127,25 @@
             "name": "Bookbinder"
         },
         "craft/brewery": {
-            "icon": "beer",
+            "icon": "poi-storage-tank",
             "fields": [
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "product"
             ],
             "geometry": [
                 "point",
                 "area"
             ],
             "terms": [
+                "alcohol",
                 "beer",
-                "bier"
+                "beverage",
+                "bier",
+                "booze",
+                "cider"
             ],
             "tags": {
                 "craft": "brewery"
@@ -4246,20 +4251,32 @@
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "product"
             ],
             "geometry": [
                 "point",
                 "area"
             ],
             "terms": [
-                "beer",
-                "bier",
-                "non-beer",
-                "spirits",
+                "alcohol",
+                "beverage",
+                "bourbon",
+                "booze",
+                "brandy",
+                "gin",
+                "hooch",
                 "liquor",
-                "hard alcohol",
-                "beverage"
+                "mezcal",
+                "moonshine",
+                "rum",
+                "scotch",
+                "spirits",
+                "still",
+                "tequila",
+                "vodka",
+                "whiskey",
+                "whisky"
             ],
             "tags": {
                 "craft": "distillery"
diff --git a/data/presets/presets/craft/brewery.json b/data/presets/presets/craft/brewery.json
index 8450f8c4d..295759537 100644
--- a/data/presets/presets/craft/brewery.json
+++ b/data/presets/presets/craft/brewery.json
@@ -1,18 +1,23 @@
 {
-    "icon": "beer",
+    "icon": "poi-storage-tank",
     "fields": [
         "operator",
         "address",
         "building_area",
-        "opening_hours"
+        "opening_hours",
+        "product"
     ],
     "geometry": [
         "point",
         "area"
     ],
     "terms": [
+        "alcohol",
         "beer",
-        "bier"
+        "beverage",
+        "bier",
+        "booze",
+        "cider"
     ],
     "tags": {
         "craft": "brewery"
diff --git a/data/presets/presets/craft/distillery.json b/data/presets/presets/craft/distillery.json
index 924083368..9cefeb5c8 100644
--- a/data/presets/presets/craft/distillery.json
+++ b/data/presets/presets/craft/distillery.json
@@ -4,20 +4,32 @@
         "operator",
         "address",
         "building_area",
-        "opening_hours"
+        "opening_hours",
+        "product"
     ],
     "geometry": [
         "point",
         "area"
     ],
     "terms": [
-        "beer",
-        "bier",
-        "non-beer",
-        "spirits",
+        "alcohol",
+        "beverage",
+        "bourbon",
+        "booze",
+        "brandy",
+        "gin",
+        "hooch",
         "liquor",
-        "hard alcohol",
-        "beverage"
+        "mezcal",
+        "moonshine",
+        "rum",
+        "scotch",
+        "spirits",
+        "still",
+        "tequila",
+        "vodka",
+        "whiskey",
+        "whisky"
     ],
     "tags": {
         "craft": "distillery"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index d9ed34fcc..819d76b1e 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -3013,7 +3013,7 @@
                 },
                 "craft/brewery": {
                     "name": "Brewery",
-                    "terms": "beer,bier"
+                    "terms": "alcohol,beer,beverage,bier,booze,cider"
                 },
                 "craft/carpenter": {
                     "name": "Carpenter",
@@ -3037,7 +3037,7 @@
                 },
                 "craft/distillery": {
                     "name": "Distillery",
-                    "terms": "beer,bier,non-beer,spirits,liquor,hard alcohol,beverage"
+                    "terms": "alcohol,beverage,bourbon,booze,brandy,gin,hooch,liquor,mezcal,moonshine,rum,scotch,spirits,still,tequila,vodka,whiskey,whisky"
                 },
                 "craft/dressmaker": {
                     "name": "Dressmaker",