From 818f6a1b9dc0bce122c453244b8bebfad9f9cb0f Mon Sep 17 00:00:00 2001
From: Lukas Toggenburger <lukas.toggenburger@fhgr.ch>
Date: Wed, 26 May 2021 20:29:55 +0200
Subject: [PATCH 1/2] Create chunk 'species_taxon'

---
 master_preset.xml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/master_preset.xml b/master_preset.xml
index e3c31190..91a40fc8 100644
--- a/master_preset.xml
+++ b/master_preset.xml
@@ -724,11 +724,14 @@
         <text key="symbol" text="Symbol description"/>
         <text key="description" text="Description" length="255" />
     </chunk>
-    <chunk id="genus_species_taxon">
-        <text key="genus" text="Genus"/>
+    <chunk id="species_taxon">
         <text key="species" text="Species"/>
         <text key="taxon" text="Taxon"/>
     </chunk>
+    <chunk id="genus_species_taxon">
+        <text key="genus" text="Genus"/>
+        <reference ref="species_taxon"/>
+    </chunk>
     <chunk id="leaf">
         <combo key="leaf_type" text="Leaf type" values="broadleaved,needleleaved,mixed,leafless" display_values="Broadleaved,Needleleaved,Mixed,Leafless" values_searchable="true"/>
         <combo key="leaf_cycle" text="Leaf cycle" values_searchable="true">

From 15e3b91cdab19ee99f64661c4ee9280a4fc5111f Mon Sep 17 00:00:00 2001
From: Lukas Toggenburger <lukas.toggenburger@fhgr.ch>
Date: Thu, 27 May 2021 21:18:00 +0200
Subject: [PATCH 2/2] Create chunks tree_genus, tree_genus_species_taxon and
 use them in items tree, tree row

---
 master_preset.xml | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/master_preset.xml b/master_preset.xml
index 91a40fc8..87b6a830 100644
--- a/master_preset.xml
+++ b/master_preset.xml
@@ -732,6 +732,18 @@
         <text key="genus" text="Genus"/>
         <reference ref="species_taxon"/>
     </chunk>
+    <chunk id="tree_genus">
+        <combo key="genus" text="Genus (first part of scientific name)"
+	    values="Abies,Acer,Aesculus,Ananas,Betula,Carpinus,Cedrus,Celtis,Citrus,Cocos,Cydonia,Elaeis,Eucalyptus,Fraxinus,Ginkgo,Gleditsia,Juglans,Malus,Musa,Olea,Persea,Phoenix,Picea,Pinus,Platanus,Populus,Prunus,Pyrus,Quercus,Robinia,Salix,Sophora,Sorbus,Tilia,Ulmus"
+	    display_values="Abies (Fir),Acer (Maple),Aesculus (Horse chestnut / Buckeye),Ananas (Pineapple),Betula (Birch),Carpinus (Hornbeam),Cedrus (Cedar),Celtis (Hackberry / Nettle tree),Citrus (Citrus fruit),Cocos (Coconut tree),Cydonia (Quince),Elaeis (Oil palm),Eucalyptus,Fraxinus (Ash),Ginkgo,Gleditsia (Honey locust),Juglans (Walnut tree),Malus (Apple),Musa (Banana),Olea (Olive),Persea (Avocado),Phoenix (Date palm),Picea (Spruce),Pinus (Pine),Platanus,Populus (Aspen / Poplar / Cottonwood),Prunus (Plum / Cherry / Peach / Nectarine / Apricot / Almond),Pyrus (Pear),Quercus (Oak),Robinia (Locust),Salix (Willow / Sallow / Osier),Sophora,Sorbus (Whitebeam / Rowan / Service tree / Mountain-ash),Tilia (Linden / Lime / Basswood),Ulmus (Elm)"
+	    use_last_as_default="true"
+	    editable="false"
+	    values_searchable="true"/>
+    </chunk>
+    <chunk id="tree_genus_species_taxon">
+        <reference ref="tree_genus"/>
+        <reference ref="species_taxon"/>
+    </chunk>
     <chunk id="leaf">
         <combo key="leaf_type" text="Leaf type" values="broadleaved,needleleaved,mixed,leafless" display_values="Broadleaved,Needleleaved,Mixed,Leafless" values_searchable="true"/>
         <combo key="leaf_cycle" text="Leaf cycle" values_searchable="true">
@@ -10353,7 +10365,7 @@
             </optional>
             <text key="height" text="Height (meters)" length="7" />
             <text key="circumference" text="Circumference (meters)"/>
-            <reference ref="genus_species_taxon"/>
+            <reference ref="tree_genus_species_taxon"/>
             <reference ref="leaf"/>
             <optional>
             	<text key="diameter_crown" text="Crown diameter (meters)"/>
@@ -10373,7 +10385,7 @@
             <key key="natural" value="tree_row"/>
             <text key="height" text="Height (meters)" length="7" />
             <optional>
-            	<reference ref="genus_species_taxon"/>
+                <reference ref="tree_genus_species_taxon"/>
                 <reference ref="leaf"/>
             </optional>
         </item> <!-- Tree Row -->