From 840e3727cb88828b755d008d43a888d6ad456c02 Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@7thposition.com>
Date: Thu, 28 May 2015 09:42:49 -0400
Subject: [PATCH] Add presets for man_made=storage_tank and silo (closes #2662)

---
 data/presets.yaml                             |  8 ++++
 data/presets/fields.json                      |  5 +++
 data/presets/fields/content.json              |  5 +++
 data/presets/presets.json                     | 38 +++++++++++++++++++
 data/presets/presets/man_made/silo.json       | 19 ++++++++++
 .../presets/man_made/storage_tank.json        | 19 ++++++++++
 data/taginfo.json                             |  8 ++++
 dist/locales/en.json                          | 11 ++++++
 8 files changed, 113 insertions(+)
 create mode 100644 data/presets/fields/content.json
 create mode 100644 data/presets/presets/man_made/silo.json
 create mode 100644 data/presets/presets/man_made/storage_tank.json

diff --git a/data/presets.yaml b/data/presets.yaml
index 9bc11704f..ce2260565 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -157,6 +157,8 @@ en:
         label: Collection Times
       construction:
         label: Type
+      content:
+        label: Contents
       country:
         label: Country
       covered:
@@ -1591,6 +1593,12 @@ en:
       man_made/pipeline:
         name: Pipeline
         terms: "<translate with synonyms or related terms for 'Pipeline', separated by commas>"
+      man_made/silo:
+        name: Silo
+        terms: "<translate with synonyms or related terms for 'Silo', separated by commas>"
+      man_made/storage_tank:
+        name: Storage Tank
+        terms: "<translate with synonyms or related terms for 'Storage Tank', separated by commas>"
       man_made/survey_point:
         name: Survey Point
         terms: "<translate with synonyms or related terms for 'Survey Point', separated by commas>"
diff --git a/data/presets/fields.json b/data/presets/fields.json
index 1eef09dcf..518aacbeb 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -286,6 +286,11 @@
         "type": "combo",
         "label": "Type"
     },
+    "content": {
+        "key": "content",
+        "type": "combo",
+        "label": "Contents"
+    },
     "country": {
         "key": "country",
         "type": "combo",
diff --git a/data/presets/fields/content.json b/data/presets/fields/content.json
new file mode 100644
index 000000000..d338fae5d
--- /dev/null
+++ b/data/presets/fields/content.json
@@ -0,0 +1,5 @@
+{
+    "key": "content",
+    "type": "combo",
+    "label": "Contents"
+}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index df6c8e4fb..987defd23 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -5538,6 +5538,44 @@
         },
         "name": "Pipeline"
     },
+    "man_made/silo": {
+        "fields": [
+            "building_area",
+            "crop"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "grain",
+            "corn",
+            "wheat"
+        ],
+        "tags": {
+            "man_made": "silo"
+        },
+        "name": "Silo"
+    },
+    "man_made/storage_tank": {
+        "fields": [
+            "building_area",
+            "content"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "oil",
+            "gas",
+            "petrol"
+        ],
+        "tags": {
+            "man_made": "storage_tank"
+        },
+        "name": "Storage Tank"
+    },
     "man_made/survey_point": {
         "icon": "monument",
         "fields": [
diff --git a/data/presets/presets/man_made/silo.json b/data/presets/presets/man_made/silo.json
new file mode 100644
index 000000000..e380f5ab7
--- /dev/null
+++ b/data/presets/presets/man_made/silo.json
@@ -0,0 +1,19 @@
+{
+    "fields": [
+        "building_area",
+        "crop"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "grain",
+        "corn",
+        "wheat"
+    ],
+    "tags": {
+        "man_made": "silo"
+    },
+    "name": "Silo"
+}
diff --git a/data/presets/presets/man_made/storage_tank.json b/data/presets/presets/man_made/storage_tank.json
new file mode 100644
index 000000000..b53456cec
--- /dev/null
+++ b/data/presets/presets/man_made/storage_tank.json
@@ -0,0 +1,19 @@
+{
+    "fields": [
+        "building_area",
+        "content"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "oil",
+        "gas",
+        "petrol"
+    ],
+    "tags": {
+        "man_made": "storage_tank"
+    },
+    "name": "Storage Tank"
+}
diff --git a/data/taginfo.json b/data/taginfo.json
index d9a9e98b0..ed0ce10e6 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -1299,6 +1299,14 @@
             "key": "man_made",
             "value": "pipeline"
         },
+        {
+            "key": "man_made",
+            "value": "silo"
+        },
+        {
+            "key": "man_made",
+            "value": "storage_tank"
+        },
         {
             "key": "man_made",
             "value": "survey_point"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 97a124ba8..2ee71335c 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -765,6 +765,9 @@
             "construction": {
                 "label": "Type"
             },
+            "content": {
+                "label": "Contents"
+            },
             "country": {
                 "label": "Country"
             },
@@ -2688,6 +2691,14 @@
                 "name": "Pipeline",
                 "terms": ""
             },
+            "man_made/silo": {
+                "name": "Silo",
+                "terms": "grain,corn,wheat"
+            },
+            "man_made/storage_tank": {
+                "name": "Storage Tank",
+                "terms": "oil,gas,petrol"
+            },
             "man_made/survey_point": {
                 "name": "Survey Point",
                 "terms": ""