Changeset 7222 in josm for trunk

Timestamp:

2014-06-08T16:13:54+02:00 (10 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

Location:

trunk

Files:

• .classpath (modified) (1 diff)
• data/defaultpresets.xml (modified) (5 diffs)
• data/validator/deprecated.mapcss (modified) (1 diff)

trunk/.classpath

@@ -14 +14 @@
         <classpathentry kind="lib" path="test/lib/fest/MRJToolkitStubs-1.0.jar"/>
         <classpathentry kind="lib" path="test/lib/jfcunit.jar"/>
-        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.7.0_55"/>
+        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.7.0_60"/>
         <classpathentry exported="true" kind="con" path="GROOVY_SUPPORT"/>
         <classpathentry kind="lib" path="test/lib/unitils-core/commons-collections-3.2.jar"/>

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">

trunk/data/validator/deprecated.mapcss

@@ -217 +217 @@
 }
 
+/* see #10107, #10108 - http://wiki.openstreetmap.org/wiki/Proposed_features/leaftype#Features.2FPages_affected */
+*[wood=deciduous],
+*[type=broad_leaved],
+*[type=broad_leafed] {
+  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
+  fixRemove: "{0.key}";
+  fixAdd: "leaf_type=broadleaved";
+}
+
+*[wood=coniferous] {
+  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
+  fixRemove: "wood";
+  fixAdd: "leaf_type=needleleaved";
+}
+
+*[wood=mixed] {
+  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
+  fixRemove: "wood";
+  fixAdd: "leaf_type=mixed";
+}
+
+*[wood=evergreen],
+*[type=evergreen] {
+  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
+  fixRemove: "{0.key}";
+  fixAdd: "leaf_cycle=evergreen";
+}
+
+*[type=deciduous],
+*[type=deciduos] {
+  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
+  fixRemove: "type";
+  fixAdd: "leaf_cycle=deciduous";
+}