From 37965f40d8296a4742fc783bcc079dddb1a4bcb6 Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Mon, 7 Nov 2016 01:12:14 -0500
Subject: [PATCH] Adjust tower field labels, remove lighthouse icons

---
 data/presets.yaml                           | 12 ++++++++++--
 data/presets/fields.json                    | 15 +++++++++++++--
 data/presets/fields/tower/construction.json |  2 +-
 data/presets/fields/tower/type.json         |  2 +-
 data/presets/presets.json                   |  9 ++++++++-
 data/presets/presets/man_made/mast.json     |  1 -
 data/presets/presets/man_made/tower.json    |  1 -
 dist/locales/en.json                        | 11 +++++++++--
 8 files changed, 42 insertions(+), 11 deletions(-)

diff --git a/data/presets.yaml b/data/presets.yaml
index 8a72eae94..7aa559841 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -441,6 +441,9 @@ en:
       handrail:
         # handrail=*
         label: Handrail
+      height:
+        # height=*
+        label: Height (meters)
       highway:
         # highway=*
         label: Type
@@ -1074,9 +1077,14 @@ en:
       tourism:
         # tourism=*
         label: Type
-      towertype:
+      tower/construction:
+        # 'tower:construction=*'
+        label: Construction
+        # tower/construction field placeholder
+        placeholder: 'Guyed, Lattice, Concealed, ...'
+      tower/type:
         # 'tower:type=*'
-        label: Tower type
+        label: Type
       tracktype:
         # tracktype=*
         label: Track Type
diff --git a/data/presets/fields.json b/data/presets/fields.json
index 07b14a6c0..561340768 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -615,6 +615,11 @@
             "type": "check",
             "label": "Handrail"
         },
+        "height": {
+            "key": "height",
+            "type": "number",
+            "label": "Height (meters)"
+        },
         "highway": {
             "key": "highway",
             "type": "typeCombo",
@@ -1451,10 +1456,16 @@
             "type": "typeCombo",
             "label": "Type"
         },
-        "towertype": {
+        "tower/construction": {
+            "key": "tower:construction",
+            "type": "combo",
+            "label": "Construction",
+            "placeholder": "Guyed, Lattice, Concealed, ..."
+        },
+        "tower/type": {
             "key": "tower:type",
             "type": "combo",
-            "label": "Tower type"
+            "label": "Type"
         },
         "tracktype": {
             "key": "tracktype",
diff --git a/data/presets/fields/tower/construction.json b/data/presets/fields/tower/construction.json
index 8166ec014..d6723507d 100644
--- a/data/presets/fields/tower/construction.json
+++ b/data/presets/fields/tower/construction.json
@@ -1,6 +1,6 @@
 {
     "key": "tower:construction",
     "type": "combo",
-    "label": "Tower construction",
+    "label": "Construction",
     "placeholder": "Guyed, Lattice, Concealed, ..."
 }
diff --git a/data/presets/fields/tower/type.json b/data/presets/fields/tower/type.json
index 08bbc5e9f..f73bf9737 100644
--- a/data/presets/fields/tower/type.json
+++ b/data/presets/fields/tower/type.json
@@ -1,5 +1,5 @@
 {
     "key": "tower:type",
     "type": "combo",
-    "label": "Tower type"
+    "label": "Type"
 }
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 008a4845b..de79a65fa 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -6711,6 +6711,11 @@
             "name": "Lighthouse"
         },
         "man_made/mast": {
+            "fields": [
+                "tower/type",
+                "tower/construction",
+                "height"
+            ],
             "geometry": [
                 "point"
             ],
@@ -6870,7 +6875,9 @@
         },
         "man_made/tower": {
             "fields": [
-                "towertype"
+                "tower/type",
+                "tower/construction",
+                "height"
             ],
             "geometry": [
                 "point",
diff --git a/data/presets/presets/man_made/mast.json b/data/presets/presets/man_made/mast.json
index b498ad29b..eb118bdfb 100644
--- a/data/presets/presets/man_made/mast.json
+++ b/data/presets/presets/man_made/mast.json
@@ -1,5 +1,4 @@
 {
-    "icon": "lighthouse",
     "fields": [
         "tower/type",
         "tower/construction",
diff --git a/data/presets/presets/man_made/tower.json b/data/presets/presets/man_made/tower.json
index f60381e5d..2023409c1 100644
--- a/data/presets/presets/man_made/tower.json
+++ b/data/presets/presets/man_made/tower.json
@@ -1,5 +1,4 @@
 {
-    "icon": "lighthouse",
     "fields": [
         "tower/type",
         "tower/construction",
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 006554a92..7d70c675e 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -1024,6 +1024,9 @@
                 "handrail": {
                     "label": "Handrail"
                 },
+                "height": {
+                    "label": "Height (meters)"
+                },
                 "highway": {
                     "label": "Type"
                 },
@@ -1533,8 +1536,12 @@
                 "tourism": {
                     "label": "Type"
                 },
-                "towertype": {
-                    "label": "Tower type"
+                "tower/construction": {
+                    "label": "Construction",
+                    "placeholder": "Guyed, Lattice, Concealed, ..."
+                },
+                "tower/type": {
+                    "label": "Type"
                 },
                 "tracktype": {
                     "label": "Track Type",