Changeset 7222 in josm for trunk/data/defaultpresets.xml

Timestamp:

2014-06-08T16:13:54+02:00 (12 years ago)

Author:

Don-vip

Message:

fix #10107, fix #10108 - use of new leaf_type and leaf_cycle keys in presets, deprecate old wood and type values in validator

File:

• trunk/data/defaultpresets.xml (modified) (5 diffs)

trunk/data/defaultpresets.xml

@@ -355 +355 @@
         <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 +6287 @@
                 <text key="species" text="Species" />
                 <text key="taxon" text="Taxon" />
+                <reference ref="leaf" />
             </optional>
         </item>
@@ -6294 +6299 @@
                   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 +6313 @@
             <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 +6326 @@
             <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">