From 2ed84c00acaa5ac64a1988b3413d0ddb292ee2df Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Tue, 24 Oct 2017 22:46:18 -0400
Subject: [PATCH] Move slaughterhouse under landuse/industrial, add terms

---
 data/presets.yaml                             | 10 +--
 data/presets/presets.json                     | 65 ++++++++++++-------
 .../presets/industrial/slaughterhouse.json    | 24 -------
 .../landuse/industrial/slaughterhouse.json    | 41 ++++++++++++
 data/taginfo.json                             |  8 +--
 dist/locales/en.json                          |  8 +--
 6 files changed, 95 insertions(+), 61 deletions(-)
 delete mode 100644 data/presets/presets/industrial/slaughterhouse.json
 create mode 100644 data/presets/presets/landuse/industrial/slaughterhouse.json

diff --git a/data/presets.yaml b/data/presets.yaml
index 241a13702..660831fd6 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -3229,11 +3229,6 @@ en:
         # historic=wayside_shrine
         name: Wayside Shrine
         terms: '<translate with synonyms or related terms for ''Wayside Shrine'', separated by commas>'
-      industrial/slaughterhouse:
-        # industrial=slaughterhouse
-        name: Slaughterhouse
-        # 'terms: abattoir,shambles,stockyard,butchery,killing house'
-        terms: '<translate with synonyms or related terms for ''Slaughterhouse'', separated by commas>'
       junction:
         # junction=yes
         name: Junction
@@ -3315,6 +3310,11 @@ en:
         # landuse=industrial
         name: Industrial Area
         terms: '<translate with synonyms or related terms for ''Industrial Area'', separated by commas>'
+      landuse/industrial/slaughterhouse:
+        # industrial=slaughterhouse
+        name: Slaughterhouse
+        # 'terms: abattoir,beef,butchery,calf,chicken,cow,killing house,meat,pig,pork,poultry,shambles,stockyard'
+        terms: '<translate with synonyms or related terms for ''Slaughterhouse'', separated by commas>'
       landuse/landfill:
         # landuse=landfill
         name: Landfill
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 35c2a1046..0269b6b88 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -7855,30 +7855,6 @@
             },
             "name": "Wayside Shrine"
         },
-        "industrial/slaughterhouse": {
-            "icon": "slaughterhouse",
-            "fields": [
-                "name",
-                "operator",
-                "address",
-                "opening_hours"
-            ],
-            "geometry": [
-                "point",
-                "area"
-            ],
-            "terms": [
-                "abattoir",
-                "shambles",
-                "stockyard",
-                "butchery",
-                "killing house"
-            ],
-            "tags": {
-                "industrial": "slaughterhouse"
-            },
-            "name": "Slaughterhouse"
-        },
         "junction": {
             "icon": "poi-junction",
             "fields": [
@@ -8181,6 +8157,47 @@
             "matchScore": 0.9,
             "name": "Industrial Area"
         },
+        "landuse/industrial/slaughterhouse": {
+            "icon": "slaughterhouse",
+            "fields": [
+                "name",
+                "operator",
+                "address",
+                "building_area",
+                "opening_hours"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "tags": {
+                "industrial": "slaughterhouse"
+            },
+            "addTags": {
+                "landuse": "industrial",
+                "industrial": "slaughterhouse"
+            },
+            "removeTags": {
+                "landuse": "industrial",
+                "industrial": "slaughterhouse"
+            },
+            "terms": [
+                "abattoir",
+                "beef",
+                "butchery",
+                "calf",
+                "chicken",
+                "cow",
+                "killing house",
+                "meat",
+                "pig",
+                "pork",
+                "poultry",
+                "shambles",
+                "stockyard"
+            ],
+            "name": "Slaughterhouse"
+        },
         "landuse/landfill": {
             "geometry": [
                 "area"
diff --git a/data/presets/presets/industrial/slaughterhouse.json b/data/presets/presets/industrial/slaughterhouse.json
deleted file mode 100644
index dd99c5240..000000000
--- a/data/presets/presets/industrial/slaughterhouse.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "icon": "slaughterhouse",
-    "fields": [
-        "name",
-        "operator",
-        "address",
-        "opening_hours"
-    ],
-    "geometry": [
-        "point",
-        "area"
-    ],
-    "terms": [
-        "abattoir",
-        "shambles",
-        "stockyard",
-        "butchery",
-        "killing house"
-    ],
-    "tags": {
-        "industrial": "slaughterhouse"
-    },
-    "name": "Slaughterhouse"
-}
diff --git a/data/presets/presets/landuse/industrial/slaughterhouse.json b/data/presets/presets/landuse/industrial/slaughterhouse.json
new file mode 100644
index 000000000..e1e8594d5
--- /dev/null
+++ b/data/presets/presets/landuse/industrial/slaughterhouse.json
@@ -0,0 +1,41 @@
+{
+    "icon": "slaughterhouse",
+    "fields": [
+        "name",
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "industrial": "slaughterhouse"
+    },
+    "addTags": {
+        "landuse": "industrial",
+        "industrial": "slaughterhouse"
+    },
+    "removeTags": {
+        "landuse": "industrial",
+        "industrial": "slaughterhouse"
+    },
+    "terms": [
+        "abattoir",
+        "beef",
+        "butchery",
+        "calf",
+        "chicken",
+        "cow",
+        "killing house",
+        "meat",
+        "pig",
+        "pork",
+        "poultry",
+        "shambles",
+        "stockyard"
+    ],
+    "name": "Slaughterhouse"
+}
diff --git a/data/taginfo.json b/data/taginfo.json
index 03f2305c6..a9474c862 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -1495,10 +1495,6 @@
             "key": "historic",
             "value": "wayside_shrine"
         },
-        {
-            "key": "industrial",
-            "value": "slaughterhouse"
-        },
         {
             "key": "junction",
             "value": "yes"
@@ -1574,6 +1570,10 @@
             "key": "landuse",
             "value": "industrial"
         },
+        {
+            "key": "industrial",
+            "value": "slaughterhouse"
+        },
         {
             "key": "landuse",
             "value": "landfill"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 86ef1b37e..b1fbefd0d 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -3915,10 +3915,6 @@
                     "name": "Wayside Shrine",
                     "terms": ""
                 },
-                "industrial/slaughterhouse": {
-                    "name": "Slaughterhouse",
-                    "terms": "abattoir,shambles,stockyard,butchery,killing house"
-                },
                 "junction": {
                     "name": "Junction",
                     "terms": ""
@@ -3995,6 +3991,10 @@
                     "name": "Industrial Area",
                     "terms": ""
                 },
+                "landuse/industrial/slaughterhouse": {
+                    "name": "Slaughterhouse",
+                    "terms": "abattoir,beef,butchery,calf,chicken,cow,killing house,meat,pig,pork,poultry,shambles,stockyard"
+                },
                 "landuse/landfill": {
                     "name": "Landfill",
                     "terms": "dump"