From 4d640282322d37f6b4a24c687dd2b0a71449c517 Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Wed, 1 Mar 2017 23:07:13 -0500
Subject: [PATCH] Add historic:civilization field to some historic presets (re:
 #3439)

---
 data/presets.yaml                                      | 3 +++
 data/presets/fields.json                               | 5 +++++
 data/presets/fields/historic/civilization.json         | 5 +++++
 data/presets/presets.json                              | 9 ++++++++-
 data/presets/presets/historic/archaeological_site.json | 5 ++++-
 data/presets/presets/historic/castle.json              | 3 ++-
 data/presets/presets/historic/ruins.json               | 5 ++++-
 dist/locales/en.json                                   | 3 +++
 8 files changed, 34 insertions(+), 4 deletions(-)
 create mode 100644 data/presets/fields/historic/civilization.json

diff --git a/data/presets.yaml b/data/presets.yaml
index 92e13426e..79de5580d 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -542,6 +542,9 @@ en:
       historic:
         # historic=*
         label: Type
+      historic/civilization:
+        # 'historic:civilization=*'
+        label: Historic Civilization
       hoops:
         # hoops=*
         label: Hoops
diff --git a/data/presets/fields.json b/data/presets/fields.json
index ccf16b5f9..d1b7eb733 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -749,6 +749,11 @@
             "type": "typeCombo",
             "label": "Type"
         },
+        "historic/civilization": {
+            "key": "historic:civilization",
+            "type": "combo",
+            "label": "Historic Civilization"
+        },
         "hoops": {
             "key": "hoops",
             "type": "number",
diff --git a/data/presets/fields/historic/civilization.json b/data/presets/fields/historic/civilization.json
new file mode 100644
index 000000000..8410791a0
--- /dev/null
+++ b/data/presets/fields/historic/civilization.json
@@ -0,0 +1,5 @@
+{
+    "key": "historic:civilization",
+    "type": "combo",
+    "label": "Historic Civilization"
+}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 63e47278a..b0555f4cb 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -5818,6 +5818,9 @@
             "name": "Historic Site"
         },
         "historic/archaeological_site": {
+            "fields": [
+                "historic/civilization"
+            ],
             "geometry": [
                 "point",
                 "vertex",
@@ -5842,7 +5845,8 @@
             "icon": "castle",
             "fields": [
                 "castle_type",
-                "building_area"
+                "building_area",
+                "historic/civilization"
             ],
             "geometry": [
                 "point",
@@ -5878,6 +5882,9 @@
             "name": "Monument"
         },
         "historic/ruins": {
+            "fields": [
+                "historic/civilization"
+            ],
             "geometry": [
                 "point",
                 "vertex",
diff --git a/data/presets/presets/historic/archaeological_site.json b/data/presets/presets/historic/archaeological_site.json
index 401f886d7..3b219c264 100644
--- a/data/presets/presets/historic/archaeological_site.json
+++ b/data/presets/presets/historic/archaeological_site.json
@@ -1,4 +1,7 @@
 {
+    "fields": [
+        "historic/civilization"
+    ],
     "geometry": [
         "point",
         "vertex",
@@ -8,4 +11,4 @@
         "historic": "archaeological_site"
     },
     "name": "Archaeological Site"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/historic/castle.json b/data/presets/presets/historic/castle.json
index 8b38554ae..882fbad5c 100644
--- a/data/presets/presets/historic/castle.json
+++ b/data/presets/presets/historic/castle.json
@@ -2,7 +2,8 @@
     "icon": "castle",
     "fields": [
         "castle_type",
-        "building_area"
+        "building_area",
+        "historic/civilization"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/historic/ruins.json b/data/presets/presets/historic/ruins.json
index 6a8936aa5..605319348 100644
--- a/data/presets/presets/historic/ruins.json
+++ b/data/presets/presets/historic/ruins.json
@@ -1,4 +1,7 @@
 {
+    "fields": [
+        "historic/civilization"
+    ],
     "geometry": [
         "point",
         "vertex",
@@ -8,4 +11,4 @@
         "historic": "ruins"
     },
     "name": "Ruins"
-}
\ No newline at end of file
+}
diff --git a/dist/locales/en.json b/dist/locales/en.json
index ed3a11c46..ecd4f13f1 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -1204,6 +1204,9 @@
                 "historic": {
                     "label": "Type"
                 },
+                "historic/civilization": {
+                    "label": "Historic Civilization"
+                },
                 "hoops": {
                     "label": "Hoops",
                     "placeholder": "1, 2, 4..."