From a9ce12a074dd3d5c3d8799b074c7d7647d9a13c7 Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Fri, 16 Dec 2016 16:35:51 -0500
Subject: [PATCH] Improve factory/works preset, add Product field

---
 data/presets.yaml                        |  9 ++++++---
 data/presets/fields.json                 |  5 +++++
 data/presets/fields/product.json         |  5 +++++
 data/presets/presets.json                | 22 ++++++++++++++++------
 data/presets/presets/man_made/works.json | 20 +++++++++++++-------
 dist/locales/en.json                     |  7 +++++--
 6 files changed, 50 insertions(+), 18 deletions(-)
 create mode 100644 data/presets/fields/product.json

diff --git a/data/presets.yaml b/data/presets.yaml
index 24ed753d6..57230cc3d 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -907,6 +907,9 @@ en:
       power_supply:
         # power_supply=*
         label: Power Supply
+      product:
+        # product=*
+        label: Product
       railway:
         # railway=*
         label: Type
@@ -3016,9 +3019,9 @@ en:
         terms: '<translate with synonyms or related terms for ''Water Works'', separated by commas>'
       man_made/works:
         # man_made=works
-        name: Works
-        # 'terms: car assembly plant,aluminium processing plant,brewery,furniture manufacture factory,oil refinery,plastic recycling'
-        terms: '<translate with synonyms or related terms for ''Works'', separated by commas>'
+        name: Factory
+        # 'terms: assembly,build,brewery,car,plant,plastic,processing,manufacture,refinery'
+        terms: '<translate with synonyms or related terms for ''Factory'', separated by commas>'
       military/airfield:
         # military=airfield
         name: Airfield
diff --git a/data/presets/fields.json b/data/presets/fields.json
index 36f39c0be..59b74a898 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -1198,6 +1198,11 @@
             "type": "typeCombo",
             "label": "Type"
         },
+        "product": {
+            "key": "product",
+            "type": "combo",
+            "label": "Product"
+        },
         "railway": {
             "key": "railway",
             "type": "typeCombo",
diff --git a/data/presets/fields/product.json b/data/presets/fields/product.json
new file mode 100644
index 000000000..a5261de28
--- /dev/null
+++ b/data/presets/fields/product.json
@@ -0,0 +1,5 @@
+{
+    "key": "product",
+    "type": "combo",
+    "label": "Product"
+}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index c5e3549e7..5100aec59 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -7227,22 +7227,32 @@
             "name": "Water Works"
         },
         "man_made/works": {
+            "icon": "industrial",
+            "fields": [
+                "operator",
+                "address",
+                "building_area",
+                "product"
+            ],
             "geometry": [
                 "point",
                 "area"
             ],
             "terms": [
-                "car assembly plant",
-                "aluminium processing plant",
+                "assembly",
+                "build",
                 "brewery",
-                "furniture manufacture factory",
-                "oil refinery",
-                "plastic recycling"
+                "car",
+                "plant",
+                "plastic",
+                "processing",
+                "manufacture",
+                "refinery"
             ],
             "tags": {
                 "man_made": "works"
             },
-            "name": "Works"
+            "name": "Factory"
         },
         "military/airfield": {
             "icon": "airfield",
diff --git a/data/presets/presets/man_made/works.json b/data/presets/presets/man_made/works.json
index 7b797c827..6f6ac809f 100644
--- a/data/presets/presets/man_made/works.json
+++ b/data/presets/presets/man_made/works.json
@@ -1,22 +1,28 @@
 {
+    "icon": "industrial",
     "fields": [
+        "operator",
         "address",
-        "building_area"
+        "building_area",
+        "product"
     ],
     "geometry": [
         "point",
         "area"
     ],
     "terms": [
-        "car assembly plant",
-        "aluminium processing plant",
+        "assembly",
+        "build",
         "brewery",
-        "furniture manufacture factory",
-        "oil refinery",
-        "plastic recycling"
+        "car",
+        "plant",
+        "plastic",
+        "processing",
+        "manufacture",
+        "refinery"
     ],
     "tags": {
         "man_made": "works"
     },
-    "name": "Works"
+    "name": "Factory"
 }
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 2ccb82125..6566d6891 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -1417,6 +1417,9 @@
                 "power": {
                     "label": "Type"
                 },
+                "product": {
+                    "label": "Product"
+                },
                 "railway": {
                     "label": "Type"
                 },
@@ -3336,8 +3339,8 @@
                     "terms": ""
                 },
                 "man_made/works": {
-                    "name": "Works",
-                    "terms": "car assembly plant,aluminium processing plant,brewery,furniture manufacture factory,oil refinery,plastic recycling"
+                    "name": "Factory",
+                    "terms": "assembly,build,brewery,car,plant,plastic,processing,manufacture,refinery"
                 },
                 "military/airfield": {
                     "name": "Airfield",