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 different leaf_cycle/leaf_type for singular tree (closes #2753)

Browse Source 
And don't show "mixed" options for singular tree (closes #2752)
This commit is contained in:
Bryan Housel
2015-09-01 13:44:46 -04:00
parent 794cac6ef1
commit 6afefb7510
7 changed files with 101 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/presets.yaml
+26
View File
@@ -498,6 +498,20 @@ en:
semi_deciduous: Semi-Deciduous
# leaf_cycle=semi_evergreen
semi_evergreen: Semi-Evergreen
leaf_cycle_singular:
# 'leaf_cycle=*'
label: Leaf Cycle
options:
# leaf_cycle=deciduous
deciduous: Deciduous
# leaf_cycle=evergreen
evergreen: Evergreen
# leaf_cycle=mixed
mixed: Mixed
# leaf_cycle=semi_deciduous
semi_deciduous: Semi-Deciduous
# leaf_cycle=semi_evergreen
semi_evergreen: Semi-Evergreen
leaf_type:
# 'leaf_type=*'
label: Leaf Type
@@ -510,6 +524,18 @@ en:
mixed: Mixed
# leaf_type=needleleaved
needleleaved: Needleleaved
leaf_type_singular:
# 'leaf_type=*'
label: Leaf Type
options:
# leaf_type=broadleaved
broadleaved: Broadleaved
# leaf_type=leafless
leafless: Leafless
# leaf_type=mixed
mixed: Mixed
# leaf_type=needleleaved
needleleaved: Needleleaved
leisure:
# 'leisure=*'
label: Type
data/presets/fields.json
+27
View File
@@ -673,6 +673,20 @@
}
}
},
"leaf_cycle_singular": {
"key": "leaf_cycle",
"type": "combo",
"label": "Leaf Cycle",
"strings": {
"options": {
"evergreen": "Evergreen",
"deciduous": "Deciduous",
"semi_evergreen": "Semi-Evergreen",
"semi_deciduous": "Semi-Deciduous",
"mixed": "Mixed"
}
}
},
"leaf_type": {
"key": "leaf_type",
"type": "combo",
@@ -686,6 +700,19 @@
}
}
},
"leaf_type_singular": {
"key": "leaf_type",
"type": "combo",
"label": "Leaf Type",
"strings": {
"options": {
"broadleaved": "Broadleaved",
"needleleaved": "Needleleaved",
"mixed": "Mixed",
"leafless": "Leafless"
}
}
},
"leisure": {
"key": "leisure",
"type": "typeCombo",
data/presets/fields/leaf_cycle_singular.json
+13
View File
@@ -0,0 +1,13 @@
{
"key": "leaf_cycle",
"type": "combo",
"label": "Leaf Cycle",
"strings": {
"options": {
"evergreen": "Evergreen",
"deciduous": "Deciduous",
"semi_evergreen": "Semi-Evergreen",
"semi_deciduous": "Semi-Deciduous"
}
}
}
data/presets/fields/leaf_type_singular.json
+12
View File
@@ -0,0 +1,12 @@
{
"key": "leaf_type",
"type": "combo",
"label": "Leaf Type",
"strings": {
"options": {
"broadleaved": "Broadleaved",
"needleleaved": "Needleleaved",
"leafless": "Leafless"
}
}
}
data/presets/presets.json
+2 -2
View File
@@ -6080,8 +6080,8 @@
},
"natural/tree": {
"fields": [
"leaf_type",
"leaf_cycle",
"leaf_type_singular",
"leaf_cycle_singular",
"denotation"
],
"icon": "park",
data/presets/presets/natural/tree.json
+2 -2
View File
@@ -1,7 +1,7 @@
{
"fields": [
"leaf_type",
"leaf_cycle",
"leaf_type_singular",
"leaf_cycle_singular",
"denotation"
],
"icon": "park",
dist/locales/en.json
Vendored
+19
View File
@@ -1013,6 +1013,16 @@
"mixed": "Mixed"
}
},
"leaf_cycle_singular": {
"label": "Leaf Cycle",
"options": {
"evergreen": "Evergreen",
"deciduous": "Deciduous",
"semi_evergreen": "Semi-Evergreen",
"semi_deciduous": "Semi-Deciduous",
"mixed": "Mixed"
}
},
"leaf_type": {
"label": "Leaf Type",
"options": {
@@ -1022,6 +1032,15 @@
"leafless": "Leafless"
}
},
"leaf_type_singular": {
"label": "Leaf Type",
"options": {
"broadleaved": "Broadleaved",
"needleleaved": "Needleleaved",
"mixed": "Mixed",
"leafless": "Leafless"
}
},
"leisure": {
"label": "Type"
},