From 6e7b34d39ab594c13bd4cddbf878c462ff9ef538 Mon Sep 17 00:00:00 2001
From: Quincy Morgan <quincy.morgan@icloud.com>
Date: Sun, 16 Sep 2018 20:26:41 -0700
Subject: [PATCH] Adds the Operator, Country, Lit, Height, and new Flag Type
 fields to the Flagpole preset

---
 data/presets.yaml                           | 3 +++
 data/presets/fields.json                    | 1 +
 data/presets/fields/flag_type.json          | 5 +++++
 data/presets/presets.json                   | 2 +-
 data/presets/presets/man_made/flagpole.json | 7 +++++++
 data/taginfo.json                           | 1 +
 dist/locales/en.json                        | 3 +++
 7 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 data/presets/fields/flag_type.json

diff --git a/data/presets.yaml b/data/presets.yaml
index e26d7c53f..59be78908 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -601,6 +601,9 @@ en:
       fixme:
         # fixme=*
         label: Fix Me
+      flag_type:
+        # 'flag:type=*'
+        label: Flag Type
       ford:
         # ford=*
         label: Type
diff --git a/data/presets/fields.json b/data/presets/fields.json
index dbba6487e..2295f12f5 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -102,6 +102,7 @@
     "fireplace": {"key": "fireplace", "type": "check", "label": "Fireplace"},
     "fitness_station": {"key": "fitness_station", "type": "typeCombo", "label": "Equipment Type"},
     "fixme": {"key": "fixme", "type": "textarea", "label": "Fix Me", "universal": true},
+    "flag_type": {"key": "flag:type", "type": "combo", "label": "Flag Type"},
     "ford": {"key": "ford", "type": "typeCombo", "label": "Type", "placeholder": "Default"},
     "frequency": {"key": "frequency", "type": "combo", "label": "Operating Frequency"},
     "fuel_multi": {"key": "fuel:", "type": "multiCombo", "label": "Fuel Types"},
diff --git a/data/presets/fields/flag_type.json b/data/presets/fields/flag_type.json
new file mode 100644
index 000000000..9f9978a49
--- /dev/null
+++ b/data/presets/fields/flag_type.json
@@ -0,0 +1,5 @@
+{
+    "key": "flag:type",
+    "type": "combo",
+    "label": "Flag Type"
+}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 303469479..ad053bc94 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -544,7 +544,7 @@
     "man_made/clearcut": {"icon": "maki-logging", "geometry": ["area"], "tags": {"man_made": "clearcut"}, "terms": ["cut", "forest", "lumber", "tree", "wood"], "name": "Clearcut Forest"},
     "man_made/crane": {"icon": "temaki-crane", "fields": ["operator", "height", "crane/type"], "geometry": ["point", "line", "vertex", "area"], "tags": {"man_made": "crane"}, "name": "Crane"},
     "man_made/cutline": {"icon": "maki-logging", "geometry": ["line"], "tags": {"man_made": "cutline"}, "name": "Cut line"},
-    "man_made/flagpole": {"icon": "maki-embassy", "geometry": ["point"], "tags": {"man_made": "flagpole"}, "name": "Flagpole"},
+    "man_made/flagpole": {"icon": "maki-embassy", "fields": ["operator", "flag_type", "country", "lit", "height"], "geometry": ["point"], "tags": {"man_made": "flagpole"}, "name": "Flagpole"},
     "man_made/gasometer": {"icon": "temaki-storage_tank", "fields": ["content", "building_area"], "geometry": ["point", "area"], "terms": ["gas holder"], "tags": {"man_made": "gasometer"}, "name": "Gasometer"},
     "man_made/groyne": {"geometry": ["line", "area"], "tags": {"man_made": "groyne"}, "name": "Groyne"},
     "man_made/lighthouse": {"icon": "maki-lighthouse", "fields": ["building_area"], "geometry": ["point", "area"], "tags": {"man_made": "lighthouse"}, "name": "Lighthouse"},
diff --git a/data/presets/presets/man_made/flagpole.json b/data/presets/presets/man_made/flagpole.json
index 19472e84d..f625581df 100644
--- a/data/presets/presets/man_made/flagpole.json
+++ b/data/presets/presets/man_made/flagpole.json
@@ -1,5 +1,12 @@
 {
     "icon": "maki-embassy",
+    "fields": [
+        "operator",
+        "flag_type",
+        "country",
+        "lit",
+        "height"
+    ],
     "geometry": [
         "point"
     ],
diff --git a/data/taginfo.json b/data/taginfo.json
index 166e9e314..0aa2a0afb 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -6647,6 +6647,7 @@
     {"key": "fireplace", "description": "Fireplace"},
     {"key": "fitness_station", "description": "Equipment Type"},
     {"key": "fixme", "description": "Fix Me"},
+    {"key": "flag:type", "description": "Flag Type"},
     {"key": "ford", "description": "Type"},
     {"key": "frequency", "description": "Operating Frequency"},
     {"key": "fuel:", "description": "Fuel Types"},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 61a0c74ed..aaebd403d 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -1972,6 +1972,9 @@
                 "fixme": {
                     "label": "Fix Me"
                 },
+                "flag_type": {
+                    "label": "Flag Type"
+                },
                 "ford": {
                     "label": "Type",
                     "placeholder": "Default"