Use multiCombo for fuel options

(closes #1987)
openstreetmap · May 1, 2016 · 1495f45 · 1495f45
1 parent f071b93
commit 1495f45
Show file tree

Hide file tree

Showing 16 changed files with 360 additions and 315 deletions.
diff --git a/data/presets.yaml b/data/presets.yaml
@@ -370,33 +370,9 @@ en:
       fuel:
         # 'fuel=*'
         label: Fuel
-      fuel/biodiesel:
-        # 'fuel:biodiesel=*'
-        label: Sells Biodiesel
-      fuel/diesel:
-        # 'fuel:diesel=*'
-        label: Sells Diesel
-      fuel/e10:
-        # 'fuel:e10=*'
-        label: Sells E10
-      fuel/e85:
-        # 'fuel:e85=*'
-        label: Sells E85
-      fuel/lpg:
-        # 'fuel:lpg=*'
-        label: Sells Propane
-      fuel/octane_100:
-        # 'fuel:octane_100=*'
-        label: Sells Racing Gasoline
-      fuel/octane_91:
-        # 'fuel:octane_91=*'
-        label: Sells Regular Gasoline
-      fuel/octane_95:
-        # 'fuel:octane_95=*'
-        label: Sells Midgrade Gasoline
-      fuel/octane_98:
-        # 'fuel:octane_98=*'
-        label: Sells Premium Gasoline
+      fuel_multi:
+        # 'fuel:=*'
+        label: Fuel Types
       gauge:
         # 'gauge=*'
         label: Gauge

diff --git a/data/presets/fields.json b/data/presets/fields.json
@@ -505,50 +505,10 @@
         "type": "combo",
         "label": "Fuel"
     },
-    "fuel/biodiesel": {
-        "key": "fuel:biodiesel",
-        "type": "check",
-        "label": "Sells Biodiesel"
-    },
-    "fuel/diesel": {
-        "key": "fuel:diesel",
-        "type": "check",
-        "label": "Sells Diesel"
-    },
-    "fuel/e10": {
-        "key": "fuel:e10",
-        "type": "check",
-        "label": "Sells E10"
-    },
-    "fuel/e85": {
-        "key": "fuel:e85",
-        "type": "check",
-        "label": "Sells E85"
-    },
-    "fuel/lpg": {
-        "key": "fuel:lpg",
-        "type": "check",
-        "label": "Sells Propane"
-    },
-    "fuel/octane_100": {
-        "key": "fuel:octane_100",
-        "type": "check",
-        "label": "Sells Racing Gasoline"
-    },
-    "fuel/octane_91": {
-        "key": "fuel:octane_91",
-        "type": "check",
-        "label": "Sells Regular Gasoline"
-    },
-    "fuel/octane_95": {
-        "key": "fuel:octane_95",
-        "type": "check",
-        "label": "Sells Midgrade Gasoline"
-    },
-    "fuel/octane_98": {
-        "key": "fuel:octane_98",
-        "type": "check",
-        "label": "Sells Premium Gasoline"
+    "fuel_multi": {
+        "key": "fuel:",
+        "type": "multiCombo",
+        "label": "Fuel Types"
     },
     "gauge": {
         "key": "gauge",

diff --git a/data/presets/fields/fuel/biodiesel.json b/data/presets/fields/fuel/biodiesel.json
diff --git a/data/presets/fields/fuel/diesel.json b/data/presets/fields/fuel/diesel.json
diff --git a/data/presets/fields/fuel/e10.json b/data/presets/fields/fuel/e10.json
diff --git a/data/presets/fields/fuel/e85.json b/data/presets/fields/fuel/e85.json
diff --git a/data/presets/fields/fuel/lpg.json b/data/presets/fields/fuel/lpg.json
diff --git a/data/presets/fields/fuel/octane_100.json b/data/presets/fields/fuel/octane_100.json
diff --git a/data/presets/fields/fuel/octane_91.json b/data/presets/fields/fuel/octane_91.json
diff --git a/data/presets/fields/fuel/octane_95.json b/data/presets/fields/fuel/octane_95.json
diff --git a/data/presets/fields/fuel/octane_98.json b/data/presets/fields/fuel/octane_98.json
diff --git a/data/presets/fields/fuel_multi.json b/data/presets/fields/fuel_multi.json
@@ -0,0 +1,5 @@
+{
+    "key": "fuel:",
+    "type": "multiCombo",
+    "label": "Fuel Types"
+}