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

Update preset options according to #2296

Browse Source
This commit is contained in:
Bryan Housel
2014-07-22 12:15:05 -04:00
parent 2b96064ed3
commit cc7649406d
9 changed files with 56 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/presets.yaml
-35
View File
@@ -380,14 +380,6 @@ en:
label: Type
religion:
label: Religion
options:
christian: Christian
muslim: Muslim
buddhist: Buddhist
jewish: Jewish
hindu: Hindu
shinto: Shinto
taoist: Taoist
restriction:
label: Type
restrictions:
@@ -410,24 +402,10 @@ en:
label: Seasonal
service:
label: Type
options:
parking_aisle: Parking Aisle
driveway: Driveway
alley: Alley
emergency_access: Emergency Access
drive-through: Drive-through
shelter:
label: Shelter
shelter_type:
label: Type
options:
public_transport: Public Transport
picnic_shelter: Picnic Shelter
weather_shelter: Weather Shelter
lean_to: Lean-to
basic_hut: Basic Hut
field_shelter: Field Shelter
rock_shelter: Rock Shelter
shop:
label: Type
sloped_curb:
@@ -463,12 +441,6 @@ en:
label: Sport
sport_ice:
label: Sport
options:
skating: Ice Skating
hockey: Ice Hockey
multi: Multi
curling: Curling
ice_stock: Ice Stock
structure:
label: Structure
placeholder: Unknown
@@ -480,9 +452,6 @@ en:
ford: Ford
studio_type:
label: Type
options:
audio: Audio
video: Video
supervised:
label: Supervised
surface:
@@ -521,10 +490,6 @@ en:
"no": "No: pathless, excellent orientation skills required"
tree_type:
label: Type
options:
broad_leaved: Broad Leaved
conifer: Conifer
palm: Palm
trees:
label: Trees
tunnel:
data/presets/fields.json
+25 -55
View File
@@ -771,18 +771,7 @@
"religion": {
"key": "religion",
"type": "combo",
"label": "Religion",
"strings": {
"options": {
"christian": "Christian",
"muslim": "Muslim",
"buddhist": "Buddhist",
"jewish": "Jewish",
"hindu": "Hindu",
"shinto": "Shinto",
"taoist": "Taoist"
}
}
"label": "Religion"
},
"restriction": {
"key": "restriction",
@@ -833,15 +822,13 @@
"key": "service",
"type": "combo",
"label": "Type",
"strings": {
"options": {
"parking_aisle": "Parking Aisle",
"driveway": "Driveway",
"alley": "Alley",
"emergency_access": "Emergency Access",
"drive-through": "Drive-through"
}
}
"options": [
"parking_aisle",
"driveway",
"alley",
"emergency_access",
"drive-through"
]
},
"shelter": {
"key": "shelter",
@@ -851,18 +838,7 @@
"shelter_type": {
"key": "shelter_type",
"type": "combo",
"label": "Type",
"strings": {
"options": {
"public_transport": "Public Transport",
"picnic_shelter": "Picnic Shelter",
"weather_shelter": "Weather Shelter",
"lean_to": "Lean-to",
"basic_hut": "Basic Hut",
"field_shelter": "Field Shelter",
"rock_shelter": "Rock Shelter"
}
}
"label": "Type"
},
"shop": {
"key": "shop",
@@ -946,15 +922,13 @@
"key": "sport",
"type": "combo",
"label": "Sport",
"strings": {
"options": {
"skating": "Ice Skating",
"hockey": "Ice Hockey",
"multi": "Multi",
"curling": "Curling",
"ice_stock": "Ice Stock"
}
}
"options": [
"skating",
"hockey",
"multi",
"curling",
"ice_stock"
]
},
"structure": {
"type": "radio",
@@ -981,12 +955,10 @@
"key": "type",
"type": "combo",
"label": "Type",
"strings": {
"options": {
"audio": "Audio",
"video": "Video"
}
}
"options": [
"audio",
"video"
]
},
"supervised": {
"key": "supervised",
@@ -1061,13 +1033,11 @@
"key": "type",
"type": "combo",
"label": "Type",
"strings": {
"options": {
"broad_leaved": "Broad Leaved",
"conifer": "Conifer",
"palm": "Palm"
}
}
"options": [
"broad_leaved",
"conifer",
"palm"
]
},
"trees": {
"key": "trees",
data/presets/fields/religion.json
+1 -12
View File
@@ -1,16 +1,5 @@
{
"key": "religion",
"type": "combo",
"label": "Religion",
"strings": {
"options": {
"christian": "Christian",
"muslim": "Muslim",
"buddhist": "Buddhist",
"jewish": "Jewish",
"hindu": "Hindu",
"shinto": "Shinto",
"taoist": "Taoist"
}
}
"label": "Religion"
}
data/presets/fields/service.json
+7 -9
View File
@@ -2,13 +2,11 @@
"key": "service",
"type": "combo",
"label": "Type",
"strings": {
"options": {
"parking_aisle": "Parking Aisle",
"driveway": "Driveway",
"alley": "Alley",
"emergency_access": "Emergency Access",
"drive-through": "Drive-through"
}
}
"options": [
"parking_aisle",
"driveway",
"alley",
"emergency_access",
"drive-through"
]
}
data/presets/fields/shelter_type.json
+1 -13
View File
@@ -1,17 +1,5 @@
{
"key": "shelter_type",
"type": "combo",
"label": "Type",
"strings": {
"options": {
"public_transport": "Public Transport",
"picnic_shelter": "Picnic Shelter",
"weather_shelter": "Weather Shelter",
"lean_to": "Lean-to",
"basic_hut": "Basic Hut",
"field_shelter": "Field Shelter",
"rock_shelter": "Rock Shelter"
}
}
"label": "Type"
}
data/presets/fields/sport_ice.json
+7 -10
View File
@@ -2,14 +2,11 @@
"key": "sport",
"type": "combo",
"label": "Sport",
"strings": {
"options": {
"skating": "Ice Skating",
"hockey": "Ice Hockey",
"multi": "Multi",
"curling": "Curling",
"ice_stock": "Ice Stock"
}
}
"options": [
"skating",
"hockey",
"multi",
"curling",
"ice_stock"
]
}
data/presets/fields/studio_type.json
+4 -6
View File
@@ -2,10 +2,8 @@
"key": "type",
"type": "combo",
"label": "Type",
"strings": {
"options": {
"audio": "Audio",
"video": "Video"
}
}
"options": [
"audio",
"video"
]
}
data/presets/fields/tree_type.json
+5 -7
View File
@@ -2,11 +2,9 @@
"key": "type",
"type": "combo",
"label": "Type",
"strings": {
"options": {
"broad_leaved": "Broad Leaved",
"conifer": "Conifer",
"palm": "Palm"
}
}
"options": [
"broad_leaved",
"conifer",
"palm"
]
}
dist/locales/en.json
Vendored
+6 -47
View File
@@ -935,16 +935,7 @@
"label": "Type"
},
"religion": {
"label": "Religion",
"options": {
"christian": "Christian",
"muslim": "Muslim",
"buddhist": "Buddhist",
"jewish": "Jewish",
"hindu": "Hindu",
"shinto": "Shinto",
"taoist": "Taoist"
}
"label": "Religion"
},
"restriction": {
"label": "Type"
@@ -974,29 +965,13 @@
"label": "Seasonal"
},
"service": {
"label": "Type",
"options": {
"parking_aisle": "Parking Aisle",
"driveway": "Driveway",
"alley": "Alley",
"emergency_access": "Emergency Access",
"drive-through": "Drive-through"
}
"label": "Type"
},
"shelter": {
"label": "Shelter"
},
"shelter_type": {
"label": "Type",
"options": {
"public_transport": "Public Transport",
"picnic_shelter": "Picnic Shelter",
"weather_shelter": "Weather Shelter",
"lean_to": "Lean-to",
"basic_hut": "Basic Hut",
"field_shelter": "Field Shelter",
"rock_shelter": "Rock Shelter"
}
"label": "Type"
},
"shop": {
"label": "Type"
@@ -1041,14 +1016,7 @@
"label": "Sport"
},
"sport_ice": {
"label": "Sport",
"options": {
"skating": "Ice Skating",
"hockey": "Ice Hockey",
"multi": "Multi",
"curling": "Curling",
"ice_stock": "Ice Stock"
}
"label": "Sport"
},
"structure": {
"label": "Structure",
@@ -1062,11 +1030,7 @@
}
},
"studio_type": {
"label": "Type",
"options": {
"audio": "Audio",
"video": "Video"
}
"label": "Type"
},
"supervised": {
"label": "Supervised"
@@ -1116,12 +1080,7 @@
}
},
"tree_type": {
"label": "Type",
"options": {
"broad_leaved": "Broad Leaved",
"conifer": "Conifer",
"palm": "Palm"
}
"label": "Type"
},
"trees": {
"label": "Trees"