From dd786f8701a79514e9fb8aec153c94d35238e491 Mon Sep 17 00:00:00 2001
From: Tobias <t@tobiasjordans.de>
Date: Fri, 21 Jul 2023 11:33:38 +0200
Subject: [PATCH] Add specific tree presets for common leaf_type/leaf_cycle
 values (#956)

---
 data/fields/leaf_type.json                    |  2 +-
 data/presets/natural/tree.json                |  2 +-
 data/presets/natural/tree/_broadleaved.json   | 23 +++++++++++++++++
 data/presets/natural/tree/_needleleaved.json  | 23 +++++++++++++++++
 .../natural/tree/broadleaved/_evergreen.json  | 25 +++++++++++++++++++
 .../natural/tree/broadleaved/deciduous.json   | 24 ++++++++++++++++++
 .../natural/tree/needleleaved/_deciduous.json | 25 +++++++++++++++++++
 .../natural/tree/needleleaved/evergreen.json  | 24 ++++++++++++++++++
 8 files changed, 146 insertions(+), 2 deletions(-)
 create mode 100644 data/presets/natural/tree/_broadleaved.json
 create mode 100644 data/presets/natural/tree/_needleleaved.json
 create mode 100644 data/presets/natural/tree/broadleaved/_evergreen.json
 create mode 100644 data/presets/natural/tree/broadleaved/deciduous.json
 create mode 100644 data/presets/natural/tree/needleleaved/_deciduous.json
 create mode 100644 data/presets/natural/tree/needleleaved/evergreen.json

diff --git a/data/fields/leaf_type.json b/data/fields/leaf_type.json
index c9932c78..59b69196 100644
--- a/data/fields/leaf_type.json
+++ b/data/fields/leaf_type.json
@@ -11,7 +11,7 @@
         }
     },
     "icons": {
-        "broadleaved": "roentgen-tree",
+        "broadleaved": "maki-park",
         "needleleaved": "roentgen-needleleaved_tree"
     },
     "autoSuggestions": false,
diff --git a/data/presets/natural/tree.json b/data/presets/natural/tree.json
index 2cbbb389..7a5272fe 100644
--- a/data/presets/natural/tree.json
+++ b/data/presets/natural/tree.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-park",
+    "icon": "roentgen-tree",
     "fields": [
         "leaf_type_singular",
         "leaf_cycle_singular",
diff --git a/data/presets/natural/tree/_broadleaved.json b/data/presets/natural/tree/_broadleaved.json
new file mode 100644
index 00000000..9fead41f
--- /dev/null
+++ b/data/presets/natural/tree/_broadleaved.json
@@ -0,0 +1,23 @@
+{
+    "icon": "maki-park",
+    "fields": [
+        "leaf_type_singular",
+        "leaf_cycle_singular",
+        "{natural/tree}"
+    ],
+    "geometry": [
+        "point",
+        "vertex"
+    ],
+    "tags": {
+        "natural": "tree",
+        "leaf_type": "broadleaved"
+    },
+    "terms": [
+        "broadleaf",
+        "broadleaved",
+        "hardwood"
+    ],
+    "name": "Broadleaved Tree",
+    "searchable": false
+}
diff --git a/data/presets/natural/tree/_needleleaved.json b/data/presets/natural/tree/_needleleaved.json
new file mode 100644
index 00000000..271a3dfe
--- /dev/null
+++ b/data/presets/natural/tree/_needleleaved.json
@@ -0,0 +1,23 @@
+{
+    "icon": "roentgen-needleleaved_tree",
+    "fields": [
+        "leaf_type_singular",
+        "leaf_cycle_singular",
+        "{natural/tree}"
+    ],
+    "geometry": [
+        "point",
+        "vertex"
+    ],
+    "tags": {
+        "natural": "tree",
+        "leaf_type": "needleleaved"
+    },
+    "terms": [
+        "conifer",
+        "needleleaved",
+        "softwood"
+    ],
+    "name": "Needleleaved Tree",
+    "searchable": false
+}
diff --git a/data/presets/natural/tree/broadleaved/_evergreen.json b/data/presets/natural/tree/broadleaved/_evergreen.json
new file mode 100644
index 00000000..5818f2ae
--- /dev/null
+++ b/data/presets/natural/tree/broadleaved/_evergreen.json
@@ -0,0 +1,25 @@
+{
+    "icon": "maki-park",
+    "fields": [
+        "leaf_type_singular",
+        "leaf_cycle_singular",
+        "{natural/tree/broadleaved}"
+    ],
+    "geometry": [
+        "point",
+        "vertex"
+    ],
+    "tags": {
+        "natural": "tree",
+        "leaf_type": "broadleaved",
+        "leaf_cycle": "evergreen"
+    },
+    "terms": [
+        "broadleaf",
+        "broadleaved",
+        "evergreen",
+        "hardwood"
+    ],
+    "name": "Broadleaved Tree (evergreen)",
+    "searchable": false
+}
diff --git a/data/presets/natural/tree/broadleaved/deciduous.json b/data/presets/natural/tree/broadleaved/deciduous.json
new file mode 100644
index 00000000..9626ac9a
--- /dev/null
+++ b/data/presets/natural/tree/broadleaved/deciduous.json
@@ -0,0 +1,24 @@
+{
+    "icon": "maki-park",
+    "fields": [
+        "leaf_type_singular",
+        "leaf_cycle_singular",
+        "{natural/tree/broadleaved}"
+    ],
+    "geometry": [
+        "point",
+        "vertex"
+    ],
+    "tags": {
+        "natural": "tree",
+        "leaf_type": "broadleaved",
+        "leaf_cycle": "deciduous"
+    },
+    "terms": [
+        "broadleaf",
+        "broadleaved",
+        "deciduous",
+        "hardwood"
+    ],
+    "name": "Broadleaved Tree (deciduous)"
+}
diff --git a/data/presets/natural/tree/needleleaved/_deciduous.json b/data/presets/natural/tree/needleleaved/_deciduous.json
new file mode 100644
index 00000000..d8b86a5b
--- /dev/null
+++ b/data/presets/natural/tree/needleleaved/_deciduous.json
@@ -0,0 +1,25 @@
+{
+    "icon": "roentgen-needleleaved_tree",
+    "fields": [
+        "leaf_type_singular",
+        "leaf_cycle_singular",
+        "{natural/tree/needleleaved}"
+    ],
+    "geometry": [
+        "point",
+        "vertex"
+    ],
+    "tags": {
+        "natural": "tree",
+        "leaf_type": "needleleaved",
+        "leaf_cycle": "deciduous"
+    },
+    "terms": [
+        "conifer",
+        "deciduous",
+        "needleleaved",
+        "softwood"
+    ],
+    "name": "Needleleaved Tree (deciduous)",
+    "searchable": false
+}
diff --git a/data/presets/natural/tree/needleleaved/evergreen.json b/data/presets/natural/tree/needleleaved/evergreen.json
new file mode 100644
index 00000000..bd4b0222
--- /dev/null
+++ b/data/presets/natural/tree/needleleaved/evergreen.json
@@ -0,0 +1,24 @@
+{
+    "icon": "roentgen-needleleaved_tree",
+    "fields": [
+        "leaf_type_singular",
+        "leaf_cycle_singular",
+        "{natural/tree/needleleaved}"
+    ],
+    "geometry": [
+        "point",
+        "vertex"
+    ],
+    "tags": {
+        "natural": "tree",
+        "leaf_type": "needleleaved",
+        "leaf_cycle": "evergreen"
+    },
+    "terms": [
+        "conifer",
+        "evergreen",
+        "needleleaved",
+        "softwood"
+    ],
+    "name": "Needleleaved Tree (evergreen)"
+}