From 7e30fa0fe39e4fa613a6e9ebf7b845585edca598 Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Sun, 28 Aug 2016 16:10:16 -0400
Subject: [PATCH] Add string suggestions for display and visibility combos

---
 data/presets.yaml                   | 19 +++++++++++++++++
 data/presets/fields.json            | 33 +++++++++++++++++++++++++++++
 data/presets/fields/display.json    |  3 ++-
 data/presets/fields/visibility.json |  9 +++++++-
 data/presets/presets.json           |  6 ++++++
 dist/locales/en.json                | 17 +++++++++++++++
 6 files changed, 85 insertions(+), 2 deletions(-)

diff --git a/data/presets.yaml b/data/presets.yaml
index c67164e04..b5180ed2c 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -321,6 +321,9 @@ en:
         types:
           'cycleway:left': Left side
           'cycleway:right': Right side
+      date:
+        # date=*
+        label: Date
       delivery:
         # delivery=*
         label: Delivery
@@ -336,6 +339,9 @@ en:
       diaper:
         # diaper=*
         label: Diaper Changing Available
+      display:
+        # display=*
+        label: Display
       dock:
         # dock=*
         label: Type
@@ -1040,6 +1046,9 @@ en:
       supervised:
         # supervised=*
         label: Supervised
+      support:
+        # support=*
+        label: Support
       surface:
         # surface=*
         label: Surface
@@ -1122,6 +1131,16 @@ en:
       vending:
         # vending=*
         label: Type of Goods
+      visibility:
+        # visibility=*
+        label: Visibility
+        options:
+          # visibility=area
+          area: Over 20m (65ft)
+          # visibility=house
+          house: Up to 5m (16ft)
+          # visibility=street
+          street: 5 to 20m (16 to 65ft)
       water:
         # water=*
         label: Type
diff --git a/data/presets/fields.json b/data/presets/fields.json
index e16b320bc..3d5ebf5bc 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -418,6 +418,11 @@
             }
         }
     },
+    "date": {
+        "key": "date",
+        "type": "check",
+        "label": "Date"
+    },
     "delivery": {
         "key": "delivery",
         "type": "check",
@@ -454,6 +459,17 @@
             "5"
         ]
     },
+    "display": {
+        "key": "display",
+        "type": "combo",
+        "label": "Display",
+        "options": [
+            "analog",
+            "digital",
+            "sundial",
+            "unorthodox"
+        ]
+    },
     "dock": {
         "key": "dock",
         "type": "combo",
@@ -1391,6 +1407,11 @@
         "type": "check",
         "label": "Supervised"
     },
+    "support": {
+        "key": "support",
+        "type": "combo",
+        "label": "Support"
+    },
     "surface": {
         "key": "surface",
         "type": "combo",
@@ -1489,6 +1510,18 @@
         "type": "combo",
         "label": "Type of Goods"
     },
+    "visibility": {
+        "key": "visibility",
+        "type": "combo",
+        "label": "Visibility",
+        "strings": {
+            "options": {
+                "house": "Up to 5m (16ft)",
+                "street": "5 to 20m (16 to 65ft)",
+                "area": "Over 20m (65ft)"
+            }
+        }
+    },
     "water_point": {
         "key": "water_point",
         "type": "check",
diff --git a/data/presets/fields/display.json b/data/presets/fields/display.json
index 19298b277..83d9dc845 100644
--- a/data/presets/fields/display.json
+++ b/data/presets/fields/display.json
@@ -1,5 +1,6 @@
 {
     "key": "display",
     "type": "combo",
-    "label": "Display"
+    "label": "Display",
+    "options": ["analog", "digital", "sundial", "unorthodox"]
 }
diff --git a/data/presets/fields/visibility.json b/data/presets/fields/visibility.json
index 7802424fb..a36b27396 100644
--- a/data/presets/fields/visibility.json
+++ b/data/presets/fields/visibility.json
@@ -1,5 +1,12 @@
 {
     "key": "visibility",
     "type": "combo",
-    "label": "Visibility"
+    "label": "Visibility",
+    "strings": {
+        "options": {
+            "house": "Up to 5m (16ft)",
+            "street": "5 to 20m (16 to 65ft)",
+            "area": "Over 20m (65ft)"
+        }
+    }
 }
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 0e5fc7eae..923f44e41 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -906,6 +906,12 @@
         "name": "Clinic"
     },
     "amenity/clock": {
+        "fields": [
+            "support",
+            "display",
+            "visibility",
+            "date"
+        ],
         "geometry": [
             "point",
             "vertex"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 86f3a4565..2345ba686 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -914,6 +914,9 @@
                     }
                 }
             },
+            "date": {
+                "label": "Date"
+            },
             "delivery": {
                 "label": "Delivery"
             },
@@ -929,6 +932,9 @@
             "diaper": {
                 "label": "Diaper Changing Available"
             },
+            "display": {
+                "label": "Display"
+            },
             "dock": {
                 "label": "Type"
             },
@@ -1499,6 +1505,9 @@
             "supervised": {
                 "label": "Supervised"
             },
+            "support": {
+                "label": "Support"
+            },
             "surface": {
                 "label": "Surface"
             },
@@ -1564,6 +1573,14 @@
             "vending": {
                 "label": "Type of Goods"
             },
+            "visibility": {
+                "label": "Visibility",
+                "options": {
+                    "house": "Up to 5m (16ft)",
+                    "street": "5 to 20m (16 to 65ft)",
+                    "area": "Over 20m (65ft)"
+                }
+            },
             "water_point": {
                 "label": "Water Point"
             },