Changeset 7164 in josm

Timestamp:

2014-05-22T11:14:47+02:00 (11 years ago)

Author:

simon04

Message:

fix #10062 - MapCSS: add any() according to MapCSS standard, deprecate coalesce()

Location:

trunk

Files:

• data/validator/geometry.mapcss (modified) (1 diff)
• src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java (modified) (1 diff)

trunk/data/validator/geometry.mapcss

@@ -13 +13 @@
 
 /* Building inside building (spatial test) */
-*[building][building!~/no|entrance/][coalesce(tag("layer"),"0") = coalesce(parent_tag("layer"),"0")] ∈
+*[building][building!~/no|entrance/][any(tag("layer"),"0") = any(parent_tag("layer"),"0")] ∈
 *[building][building!~/no|entrance/] {
   throwWarning: tr("Building inside building");

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java

@@ -178 +178 @@
         /**
          * Returns the first non-null object. The name originates from the {@code COALESCE} SQL function.
-         * @see Utils#firstNonNull(Object[])
+         * @deprecated Deprecated in favour of {@link #any(Object...)} from the MapCSS standard.
          */
         @NullableArguments
         public static Object coalesce(Object... args) {
+            return Utils.firstNonNull(args);
+        }
+
+        /**
+         * Returns the first non-null object.
+         * The name originates from <a href="http://wiki.openstreetmap.org/wiki/MapCSS/0.2/eval">MapCSS standard</a>.
+         * @see #coalesce(Object...)
+         * @see Utils#firstNonNull(Object[])
+         */
+        @NullableArguments
+        public static Object any(Object... args) {
             return Utils.firstNonNull(args);
         }