From 3bc98bec58a48de946996c5071dee37f3ba40108 Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Sat, 24 Jan 2015 23:16:11 -0500 Subject: [PATCH] Update tree and forest presets (closes #2512) for `natural=tree`, `natural=wood`, `landuse=forest` deprecate keys `type` and `wood` now use keys `leaf_type`, `leaf_cycle` --- data/presets.yaml | 19 ++++++++--- data/presets/fields.json | 42 +++++++++++++++--------- data/presets/fields/leaf_cycle.json | 14 ++++++++ data/presets/fields/leaf_type.json | 13 ++++++++ data/presets/fields/tree_type.json | 10 ------ data/presets/fields/wood.json | 5 --- data/presets/presets.json | 25 +++++++++----- data/presets/presets/landuse/forest.json | 13 +++++--- data/presets/presets/natural/tree.json | 3 +- data/presets/presets/natural/wood.json | 13 +++++--- dist/locales/en.json | 29 +++++++++++----- 11 files changed, 124 insertions(+), 62 deletions(-) create mode 100644 data/presets/fields/leaf_cycle.json create mode 100644 data/presets/fields/leaf_type.json delete mode 100644 data/presets/fields/tree_type.json delete mode 100644 data/presets/fields/wood.json diff --git a/data/presets.yaml b/data/presets.yaml index ea20eb02e..5d5c7b38c 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -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 diff --git a/data/presets/fields.json b/data/presets/fields.json index 7847c2eca..84e3b7170 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -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" } } \ No newline at end of file diff --git a/data/presets/fields/leaf_cycle.json b/data/presets/fields/leaf_cycle.json new file mode 100644 index 000000000..96851b55b --- /dev/null +++ b/data/presets/fields/leaf_cycle.json @@ -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" + } + } +} diff --git a/data/presets/fields/leaf_type.json b/data/presets/fields/leaf_type.json new file mode 100644 index 000000000..864c0478e --- /dev/null +++ b/data/presets/fields/leaf_type.json @@ -0,0 +1,13 @@ +{ + "key": "leaf_type", + "type": "combo", + "label": "Leaf Type", + "strings": { + "options": { + "broadleaved": "Broadleaved", + "needleleaved": "Needleleaved", + "mixed": "Mixed", + "leafless": "Leafless" + } + } +} diff --git a/data/presets/fields/tree_type.json b/data/presets/fields/tree_type.json deleted file mode 100644 index 54faa3793..000000000 --- a/data/presets/fields/tree_type.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "key": "type", - "type": "combo", - "label": "Type", - "options": [ - "broad_leaved", - "conifer", - "palm" - ] -} diff --git a/data/presets/fields/wood.json b/data/presets/fields/wood.json deleted file mode 100644 index f9ed5c6f7..000000000 --- a/data/presets/fields/wood.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "key": "wood", - "type": "combo", - "label": "Type" -} \ No newline at end of file diff --git a/data/presets/presets.json b/data/presets/presets.json index 7af0e34c8..e4e354830 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -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": { diff --git a/data/presets/presets/landuse/forest.json b/data/presets/presets/landuse/forest.json index 8c6af66e1..fb61bcd42 100644 --- a/data/presets/presets/landuse/forest.json +++ b/data/presets/presets/landuse/forest.json @@ -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" -} \ No newline at end of file +} diff --git a/data/presets/presets/natural/tree.json b/data/presets/presets/natural/tree.json index 29337059b..218a3fe44 100644 --- a/data/presets/presets/natural/tree.json +++ b/data/presets/presets/natural/tree.json @@ -1,6 +1,7 @@ { "fields": [ - "tree_type", + "leaf_type", + "leaf_cycle", "denotation" ], "icon": "park", diff --git a/data/presets/presets/natural/wood.json b/data/presets/presets/natural/wood.json index e4afa1ad8..f8ab42d78 100644 --- a/data/presets/presets/natural/wood.json +++ b/data/presets/presets/natural/wood.json @@ -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" -} \ No newline at end of file +} diff --git a/dist/locales/en.json b/dist/locales/en.json index 197c2c940..bb2a06e3d 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -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",