Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 7210)
+++ trunk/data/defaultpresets.xml	(revision 7222)
@@ -355,4 +355,8 @@
         <text key="description" text="Description"/>
     </chunk>
+    <chunk id="leaf">
+        <combo key="leaf_type" text="Type" values="broadleaved,needleleaved,mixed,leafless" />
+        <combo key="leaf_cycle" text="Cycle" values="deciduous,evergreen,semi_deciduous,semi_evergreen,mixed" />
+    </chunk>
   <!-- Link chunks -->
   <chunk id="link_contact">
@@ -6283,4 +6287,5 @@
                 <text key="species" text="Species" />
                 <text key="taxon" text="Taxon" />
+                <reference ref="leaf" />
             </optional>
         </item>
@@ -6294,4 +6299,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=tree_row" />
             <key key="natural" value="tree_row" />
+            <optional>
+                <reference ref="leaf" />
+            </optional>
         </item>
         <item name="Wood" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
@@ -6305,5 +6313,5 @@
             <key key="natural" value="wood" />
             <text key="name" text="Name" />
-            <combo key="wood" text="Type" values="coniferous,deciduous,mixed" />
+            <reference ref="leaf" />
         </item>
         <item name="Forest" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
@@ -6318,5 +6326,5 @@
             <key key="landuse" value="forest" />
             <text key="name" text="Name" />
-            <combo key="wood" text="Type" values="coniferous,deciduous,mixed" />
+            <reference ref="leaf" />
         </item>
         <item name="Grassland" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">