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

Update tree and forest presets

Browse Source 
(closes #2512)

for `natural=tree`, `natural=wood`, `landuse=forest`
deprecate keys `type` and `wood`
now use keys `leaf_type`, `leaf_cycle`
This commit is contained in:
Bryan Housel
2015-01-24 23:16:11 -05:00
parent 32007fc814
commit 3bc98bec58
11 changed files with 124 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/presets.yaml
+15 -4
View File
@@ -273,6 +273,21 @@ en:
placeholder: "1, 2, 3..."
layer:
label: Layer
leaf_cycle:
label: Leaf Cycle
options:
evergreen: Evergreen
deciduous: Deciduous
semi_evergreen: Semi-Evergreen
semi_deciduous: Semi-Deciduous
mixed: Mixed
leaf_type:
label: Leaf Type
options:
broadleaved: Broadleaved
needleleaved: Needleleaved
mixed: Mixed
leafless: Leafless
leisure:
label: Type
length:
@@ -549,8 +564,6 @@ en:
bad: "Bad: no markers, path sometimes invisible/pathless"
horrible: "Horrible: often pathless, some orientation skills required"
"no": "No: pathless, excellent orientation skills required"
tree_type:
label: Type
trees:
label: Trees
tunnel:
@@ -572,8 +585,6 @@ en:
label: Width (Meters)
wikipedia:
label: Wikipedia
wood:
label: Type
presets:
address:
name: Address
data/presets/fields.json
+27 -15
View File
@@ -554,6 +554,33 @@
"type": "combo",
"label": "Layer"
},
"leaf_cycle": {
"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",
"label": "Leaf Type",
"strings": {
"options": {
"broadleaved": "Broadleaved",
"needleleaved": "Needleleaved",
"mixed": "Mixed",
"leafless": "Leafless"
}
}
},
"leisure": {
"key": "leisure",
"type": "typeCombo",
@@ -1153,16 +1180,6 @@
}
}
},
"tree_type": {
"key": "type",
"type": "combo",
"label": "Type",
"options": [
"broad_leaved",
"conifer",
"palm"
]
},
"trees": {
"key": "trees",
"type": "combo",
@@ -1224,10 +1241,5 @@
"icon": "wikipedia",
"universal": true,
"label": "Wikipedia"
},
"wood": {
"key": "wood",
"type": "combo",
"label": "Type"
}
}
data/presets/fields/leaf_cycle.json
+14
View File
@@ -0,0 +1,14 @@
{
"key": "leaf_cycle",
"type": "combo",
"label": "Leaf Cycle",
"strings": {
"options": {
"evergreen": "Evergreen",
"deciduous": "Deciduous",
"semi_evergreen": "Semi-Evergreen",
"semi_deciduous": "Semi-Deciduous",
"mixed": "Mixed"
}
}
}
data/presets/fields/leaf_type.json
+13
View File
@@ -0,0 +1,13 @@
{
"key": "leaf_type",
"type": "combo",
"label": "Leaf Type",
"strings": {
"options": {
"broadleaved": "Broadleaved",
"needleleaved": "Needleleaved",
"mixed": "Mixed",
"leafless": "Leafless"
}
}
}
data/presets/fields/tree_type.json
-10
View File
@@ -1,10 +0,0 @@
{
"key": "type",
"type": "combo",
"label": "Type",
"options": [
"broad_leaved",
"conifer",
"palm"
]
}
data/presets/fields/wood.json
-5
View File
@@ -1,5 +0,0 @@
{
"key": "wood",
"type": "combo",
"label": "Type"
}
data/presets/presets.json
+16 -9
View File
@@ -4748,10 +4748,11 @@
"icon": "farm"
},
"landuse/forest": {
"fields": [
"wood"
],
"icon": "park2",
"fields": [
"leaf_type",
"leaf_cycle"
],
"geometry": [
"point",
"area"
@@ -4759,7 +4760,9 @@
"tags": {
"landuse": "forest"
},
"terms": [],
"terms": [
"tree"
],
"name": "Forest"
},
"landuse/garages": {
@@ -5761,7 +5764,8 @@
},
"natural/tree": {
"fields": [
"tree_type",
"leaf_type",
"leaf_cycle",
"denotation"
],
"icon": "park",
@@ -5849,10 +5853,11 @@
"name": "Wetland"
},
"natural/wood": {
"fields": [
"wood"
],
"icon": "park2",
"fields": [
"leaf_type",
"leaf_cycle"
],
"geometry": [
"point",
"area"
@@ -5860,7 +5865,9 @@
"tags": {
"natural": "wood"
},
"terms": [],
"terms": [
"tree"
],
"name": "Wood"
},
"office": {
data/presets/presets/landuse/forest.json
+8 -5
View File
@@ -1,8 +1,9 @@
{
"fields": [
"wood"
],
"icon": "park2",
"fields": [
"leaf_type",
"leaf_cycle"
],
"geometry": [
"point",
"area"
@@ -10,6 +11,8 @@
"tags": {
"landuse": "forest"
},
"terms": [],
"terms": [
"tree"
],
"name": "Forest"
}
}
data/presets/presets/natural/tree.json
+2 -1
View File
@@ -1,6 +1,7 @@
{
"fields": [
"tree_type",
"leaf_type",
"leaf_cycle",
"denotation"
],
"icon": "park",
data/presets/presets/natural/wood.json
+8 -5
View File
@@ -1,8 +1,9 @@
{
"fields": [
"wood"
],
"icon": "park2",
"fields": [
"leaf_type",
"leaf_cycle"
],
"geometry": [
"point",
"area"
@@ -10,6 +11,8 @@
"tags": {
"natural": "wood"
},
"terms": [],
"terms": [
"tree"
],
"name": "Wood"
}
}
dist/locales/en.json
Vendored
+21 -8
View File
@@ -886,6 +886,25 @@
"layer": {
"label": "Layer"
},
"leaf_cycle": {
"label": "Leaf Cycle",
"options": {
"evergreen": "Evergreen",
"deciduous": "Deciduous",
"semi_evergreen": "Semi-Evergreen",
"semi_deciduous": "Semi-Deciduous",
"mixed": "Mixed"
}
},
"leaf_type": {
"label": "Leaf Type",
"options": {
"broadleaved": "Broadleaved",
"needleleaved": "Needleleaved",
"mixed": "Mixed",
"leafless": "Leafless"
}
},
"leisure": {
"label": "Type"
},
@@ -1250,9 +1269,6 @@
"no": "No: pathless, excellent orientation skills required"
}
},
"tree_type": {
"label": "Type"
},
"trees": {
"label": "Trees"
},
@@ -1283,9 +1299,6 @@
},
"wikipedia": {
"label": "Wikipedia"
},
"wood": {
"label": "Type"
}
},
"presets": {
@@ -2387,7 +2400,7 @@
},
"landuse/forest": {
"name": "Forest",
"terms": ""
"terms": "tree"
},
"landuse/garages": {
"name": "Garages",
@@ -2699,7 +2712,7 @@
},
"natural/wood": {
"name": "Wood",
"terms": ""
"terms": "tree"
},
"office": {
"name": "Office",