From e113c47835197eeb8445ceb3780c8cf541b4c782 Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Thu, 9 Nov 2017 22:35:49 -0500
Subject: [PATCH] Add `government=*` type field to Government Office preset
 (closes #4517)

---
 data/presets.yaml                           | 3 +++
 data/presets/fields.json                    | 5 +++++
 data/presets/fields/government.json         | 5 +++++
 data/presets/presets.json                   | 1 +
 data/presets/presets/office/government.json | 1 +
 dist/locales/en.json                        | 3 +++
 6 files changed, 18 insertions(+)
 create mode 100644 data/presets/fields/government.json

diff --git a/data/presets.yaml b/data/presets.yaml
index 8ce8c9ac31..552794f3ed 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -600,6 +600,9 @@ en:
       generator/type:
         # 'generator:type=*'
         label: Type
+      government:
+        # government=*
+        label: Type
       grape_variety:
         # grape_variety=*
         label: Grape Varieties
diff --git a/data/presets/fields.json b/data/presets/fields.json
index b3ea88859c..5c086d4792 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -820,6 +820,11 @@
             "type": "combo",
             "label": "Type"
         },
+        "government": {
+            "key": "government",
+            "type": "typeCombo",
+            "label": "Type"
+        },
         "grape_variety": {
             "key": "grape_variety",
             "type": "semiCombo",
diff --git a/data/presets/fields/government.json b/data/presets/fields/government.json
new file mode 100644
index 0000000000..0133a83d55
--- /dev/null
+++ b/data/presets/fields/government.json
@@ -0,0 +1,5 @@
+{
+    "key": "government",
+    "type": "typeCombo",
+    "label": "Type"
+}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 4e48d556fa..76fa19d144 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -11818,6 +11818,7 @@
             "icon": "commercial",
             "fields": [
                 "name",
+                "government",
                 "address",
                 "building_area",
                 "opening_hours"
diff --git a/data/presets/presets/office/government.json b/data/presets/presets/office/government.json
index 29c4cc4cc5..31050bd318 100644
--- a/data/presets/presets/office/government.json
+++ b/data/presets/presets/office/government.json
@@ -2,6 +2,7 @@
     "icon": "commercial",
     "fields": [
         "name",
+        "government",
         "address",
         "building_area",
         "opening_hours"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 34e3d749a5..a519d47e73 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -1610,6 +1610,9 @@
                 "generator/type": {
                     "label": "Type"
                 },
+                "government": {
+                    "label": "Type"
+                },
                 "grape_variety": {
                     "label": "Grape Varieties"
                 },