CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-17 22:24:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use multiCombo for fuel options

Browse Source 
(closes #1987)
This commit is contained in:
Bryan Housel
2016-05-01 11:44:22 -04:00
parent f071b93654
commit 1495f45c20
16 changed files with 360 additions and 315 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/presets.yaml
+3 -27
View File
@@ -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
data/presets/fields.json
+4 -44
View File
@@ -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",
data/presets/fields/fuel/biodiesel.json
-5
View File
@@ -1,5 +0,0 @@
{
"key": "fuel:biodiesel",
"type": "check",
"label": "Sells Biodiesel"
}
data/presets/fields/fuel/diesel.json
-5
View File
@@ -1,5 +0,0 @@
{
"key": "fuel:diesel",
"type": "check",
"label": "Sells Diesel"
}
data/presets/fields/fuel/e10.json
-5
View File
@@ -1,5 +0,0 @@
{
"key": "fuel:e10",
"type": "check",
"label": "Sells E10"
}
data/presets/fields/fuel/e85.json
-5
View File
@@ -1,5 +0,0 @@
{
"key": "fuel:e85",
"type": "check",
"label": "Sells E85"
}
data/presets/fields/fuel/lpg.json
-5
View File
@@ -1,5 +0,0 @@
{
"key": "fuel:lpg",
"type": "check",
"label": "Sells Propane"
}
data/presets/fields/fuel/octane_100.json
-5
View File
@@ -1,5 +0,0 @@
{
"key": "fuel:octane_100",
"type": "check",
"label": "Sells Racing Gasoline"
}
data/presets/fields/fuel/octane_91.json
-5
View File
@@ -1,5 +0,0 @@
{
"key": "fuel:octane_91",
"type": "check",
"label": "Sells Regular Gasoline"
}
data/presets/fields/fuel/octane_95.json
-5
View File
@@ -1,5 +0,0 @@
{
"key": "fuel:octane_95",
"type": "check",
"label": "Sells Midgrade Gasoline"
}
data/presets/fields/fuel/octane_98.json
-5
View File
@@ -1,5 +0,0 @@
{
"key": "fuel:octane_98",
"type": "check",
"label": "Sells Premium Gasoline"
}
data/presets/fields/fuel_multi.json
+5
View File
@@ -0,0 +1,5 @@
{
"key": "fuel:",
"type": "multiCombo",
"label": "Fuel Types"
}
data/presets/presets.json
+342 -171
View File
File diff suppressed because it is too large Load Diff
data/presets/presets/amenity/fuel.json
+2 -1
View File
@@ -3,7 +3,8 @@
"fields": [
"operator",
"address",
"opening_hours"
"opening_hours",
"fuel_multi"
],
"geometry": [
"point",
data/presets/presets/waterway/fuel.json
+2 -1
View File
@@ -3,7 +3,8 @@
"fields": [
"operator",
"address",
"opening_hours"
"opening_hours",
"fuel_multi"
],
"geometry": [
"point",
dist/locales/en.json
Vendored
+2 -26
View File
@@ -955,32 +955,8 @@
"fuel": {
"label": "Fuel"
},
"fuel/biodiesel": {
"label": "Sells Biodiesel"
},
"fuel/diesel": {
"label": "Sells Diesel"
},
"fuel/e10": {
"label": "Sells E10"
},
"fuel/e85": {
"label": "Sells E85"
},
"fuel/lpg": {
"label": "Sells Propane"
},
"fuel/octane_100": {
"label": "Sells Racing Gasoline"
},
"fuel/octane_91": {
"label": "Sells Regular Gasoline"
},
"fuel/octane_95": {
"label": "Sells Midgrade Gasoline"
},
"fuel/octane_98": {
"label": "Sells Premium Gasoline"
"fuel_multi": {
"label": "Fuel Types"
},
"gauge": {
"label": "Gauge"