Changeset 7165 in josm for trunk

Timestamp:

2014-05-22T11:24:54+02:00 (11 years ago)

Author:

simon04

Message:

see #10063 - MapCSS: add min() and max() according to standard

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParserTest.groovy (modified) (1 diff)

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

@@ -209 +209 @@
 
         /**
+         * Returns the minimum of the given numbers, or NaN if no number is given.
+         * @see Math#min(float, float)
+         */
+        public static float min(float... args) {
+            if (args.length == 0) {
+                return Float.NaN;
+            } else if (args.length == 1) {
+                return args[0];
+            } else {
+                float min = Math.min(args[0], args[1]);
+                for (int i = 2; i < args.length; i++) {
+                    min = Math.min(min, args[i]);
+                }
+                return min;
+            }
+        }
+
+        /**
+         * Returns the maximum of the given numbers, or NaN if no number is given.
+         * @see Math#max(float, float)
+         */
+        public static float max(float... args) {
+            if (args.length == 0) {
+                return Float.NaN;
+            } else if (args.length == 1) {
+                return args[0];
+            } else {
+                float max = Math.max(args[0], args[1]);
+                for (int i = 2; i < args.length; i++) {
+                    max = Math.max(max, args[i]);
+                }
+                return max;
+            }
+        }
+
+        /**
          * Splits string {@code toSplit} at occurrences of the separator string {@code sep} and returns a list of matches.
          * @see String#split(String)

trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParserTest.groovy

@@ -318 +318 @@
         assert css.getErrors().iterator().next().toString().contains("Unknown MapCSS base selector invalid_base")
     }
+
+    @Test
+    public void testMinMaxFunctions() throws Exception {
+        def sheet = new MapCSSStyleSource("* {" +
+                "min_value: min(tag(x), tag(y), tag(z)); " +
+                "max_value: max(tag(x), tag(y), tag(z)); " +
+                "}")
+        sheet.loadStyleSource()
+        def mc = new MultiCascade()
+
+        sheet.apply(mc, TestUtils.createPrimitive("way x=4 y=6 z=8 u=100"), 20, null, false)
+        assert mc.getCascade(Environment.DEFAULT_LAYER).get("min_value", Float.NaN, Float.class) == 4.0f
+        assert mc.getCascade(Environment.DEFAULT_LAYER).get("max_value", Float.NaN, Float.class) == 8.0f
+
+        sheet.apply(mc, TestUtils.createPrimitive("way x=4 y=6"), 20, null, false)
+        assert mc.getCascade(Environment.DEFAULT_LAYER).get("min_value", -777f, Float.class) == -777f
+        assert mc.getCascade(Environment.DEFAULT_LAYER).get("max_value", -777f, Float.class) == -777f
+    }
 }