Changeset 10451 in josm for trunk

Timestamp:

2016-06-21T20:24:39+02:00 (8 years ago)

Author:

Klumbumbus

Message:

fix #13008 - deprecate name:botanical in favor of species; remove empty node icons in mapview for barrier=fence|portcullis|drawbridge

Location:

trunk

Files:

• data/defaultpresets.xml (modified) (1 diff)
• data/validator/deprecated.mapcss (modified) (1 diff)
• styles/standard/elemstyles.mapcss (modified) (1 diff)

trunk/data/defaultpresets.xml

@@ -8999 +8999 @@
             <text key="name" text="Name" />
             <text key="height" text="Height (meters)" />
-            <text key="name:botanical" text="Botanical Name" />
-            <optional>
-                <text key="genus" text="Genus" />
-                <text key="species" text="Species" />
-                <text key="taxon" text="Taxon" />
-                <reference ref="leaf" />
-            </optional>
+            <text key="genus" text="Genus" />
+            <text key="species" text="Species" />
+            <text key="taxon" text="Taxon" />
+            <reference ref="leaf" />
         </item> <!-- Tree -->
         <item name="Tree Row" icon="styles/standard/misc/landmark/tree_row.svg" type="way" preset_name_label="true">

trunk/data/validator/deprecated.mapcss

@@ -849 +849 @@
   throwWarning: tr("The key {0} has an uncommon value.", "{1.key}");
 }
+
+/* #13008 */
+*[name:botanical] {
+  throwWarning: tr("{0} is deprecated", "{0.key}");
+  suggestAlternative: "species";
+}

trunk/styles/standard/elemstyles.mapcss

@@ -452 +452 @@
     set icon_z17;
 }
-node[barrier=fence][!is_prop_set(icon-image)],
 node[barrier=kissing_gate][!is_prop_set(icon-image)],
 node[barrier=bump_gate][!is_prop_set(icon-image)],
-node[barrier=portcullis][!is_prop_set(icon-image)],
 node[barrier=bus_trap][!is_prop_set(icon-image)],
-node[barrier=drawbridge][!is_prop_set(icon-image)],
 node[barrier=jersey_barrier][!is_prop_set(icon-image)],
 node[barrier=hampshire_gate][!is_prop_set(icon-image)] {