Merge pull request #5316 from quincylvania/add-flagpole-preset-fields

Adds fields to the Flagpole preset

data/presets.yaml

@@ -601,6 +601,9 @@ en:
       fixme:
         # fixme=*
         label: Fix Me
+      flag/type:
+        # 'flag:type=*'
+        label: Flag Type
       ford:
         # ford=*
         label: Type

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"},

data/presets/fields/flag/type.json

@@ -0,0 +1,5 @@
+{
+    "key": "flag:type",
+    "type": "combo",
+    "label": "Flag Type"
+}

data/presets/presets.json

@@ -545,7 +545,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", "vertex"], "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"},

data/presets/presets/man_made/flagpole.json

@@ -1,7 +1,15 @@
 {
     "icon": "maki-embassy",
+    "fields": [
+        "operator",
+        "flag/type",
+        "country",
+        "lit",
+        "height"
+    ],
     "geometry": [
-        "point"
+        "point",
+        "vertex"
     ],
     "tags": {
         "man_made": "flagpole"

data/taginfo.json

@@ -6675,6 +6675,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"},

dist/locales/en.json

@@ -1972,6 +1972,9 @@
                 "fixme": {
                     "label": "Fix Me"
                 },
+                "flag/type": {
+                    "label": "Flag Type"
+                },
                 "ford": {
                     "label": "Type",
                     "placeholder": "Default"