Changeset 6611 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2014-01-03T17:14:36+01:00 (10 years ago)

Author:

simon04

Message:

see #9516 - Replace BuildingInBuilding by a corresponding MapCSS test

Location:

trunk/src/org/openstreetmap/josm/gui/mappaint

Files:

• Environment.java (modified) (1 diff)
• mapcss/Condition.java (modified) (1 diff)
• mapcss/ExpressionFactory.java (modified) (8 diffs)
• mapcss/Instruction.java (modified) (1 diff)
• mapcss/MapCSSParser.jj (modified) (3 diffs)
• mapcss/Selector.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/Environment.java

@@ -215 +215 @@
         index = null;
     }
+
+    public Cascade getCascade(String layer) {
+        return mc == null ? null : mc.getCascade(layer == null ? this.layer : layer);
+    }
 }

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

@@ -291 +291 @@
         @Override
         public boolean applies(Environment env) {
-            return env != null && env.mc != null && env.mc.getCascade(env.layer) != null && not ^ env.mc.getCascade(env.layer).containsKey(id);
+            return env != null && env.getCascade(env.layer) != null && not ^ env.getCascade(env.layer).containsKey(id);
         }
 

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

@@ -5 +5 @@
 
 import java.awt.Color;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 import java.lang.reflect.Array;
 import java.lang.reflect.InvocationTargetException;
@@ -30 +34 @@
  */
 public final class ExpressionFactory {
+
+    /**
+     * Marks functions which should be executed also when one or more arguments are null.
+     */
+    @Target(ElementType.METHOD)
+    @Retention(RetentionPolicy.RUNTIME)
+    static @interface NullableArguments {}
 
     private static final List<Method> arrayFunctions;
@@ -146 +157 @@
 
         /**
+         * Returns the first non-null object. The name originates from the {@code COALESCE} SQL function.
+         * @see Utils#firstNonNull(Object[])
+         */
+        @NullableArguments
+        public static Object coalesce(Object... args) {
+            return Utils.firstNonNull(args);
+        }
+
+        /**
          * Get the {@code n}th element of the list {@code lst} (counting starts at 0).
          * @since 5699
@@ -221 +241 @@
          * Assembles the strings to one.
          */
+        @NullableArguments
         public static String concat(Object... args) {
             StringBuilder res = new StringBuilder();
             for (Object f : args) {
-                res.append(f.toString());
+                res.append(String.valueOf(f));
             }
             return res.toString();
@@ -240 +261 @@
          */
         public Object prop(String key, String layer) {
-            Cascade c;
-            if (layer == null) {
-                c = env.mc.getCascade(env.layer);
-            } else {
-                c = env.mc.getCascade(layer);
-            }
-            return c.get(key);
+            return env.getCascade(layer).get(key);
         }
 
@@ -260 +275 @@
          */
         public Boolean is_prop_set(String key, String layer) {
-            Cascade c;
-            if (layer == null) {
-                // env.layer is null if expression is evaluated
-                // in ExpressionCondition, but MultiCascade.getCascade
-                // handles this
-                c = env.mc.getCascade(env.layer);
-            } else {
-                c = env.mc.getCascade(layer);
-            }
-            return c.containsKey(key);
+            return env.getCascade(layer).containsKey(key);
         }
 
@@ -650 +656 @@
             for (int i = 0; i < args.size(); ++i) {
                 convertedArgs[i] = Cascade.convertTo(args.get(i).evaluate(env), expectedParameterTypes[i]);
-                if (convertedArgs[i] == null) {
+                if (convertedArgs[i] == null && m.getAnnotation(NullableArguments.class) == null) {
                     return null;
                 }
@@ -696 +702 @@
             for (int i = 0; i < args.size(); ++i) {
                 Object o = Cascade.convertTo(args.get(i).evaluate(env), arrayComponentType);
-                if (o == null) {
+                if (o == null && m.getAnnotation(NullableArguments.class) == null) {
                     return null;
                 }

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

@@ -31 +31 @@
         public final String key;
         public final Object val;
+        public final boolean isSetInstruction;
 
-        public AssignmentInstruction(String key, Object val) {
+        public AssignmentInstruction(String key, Object val, boolean isSetInstruction) {
             this.key = key;
+            this.isSetInstruction = isSetInstruction;
             if (val instanceof LiteralExpression) {
                 Object litValue = ((LiteralExpression) val).evaluate(null);

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj

@@ -472 +472 @@
             key=<IDENT> w()
             ( <EQUAL> val=expression() )?
-            { ins.add(new Instruction.AssignmentInstruction(key.image, val == null ? true : val)); }
+            { ins.add(new Instruction.AssignmentInstruction(key.image, val == null ? true : val, true)); }
             ( <RBRACE> { return ins; } | <SEMICOLON> w() )
         )
@@ -480 +480 @@
             LOOKAHEAD( float_array() w() ( <SEMICOLON> | <RBRACE> ) )
                 val=float_array()
-                { ins.add(new Instruction.AssignmentInstruction(key.image, val)); }
+                { ins.add(new Instruction.AssignmentInstruction(key.image, val, false)); }
                 w()
                 ( <RBRACE> { return ins; } | <SEMICOLON> w() )
@@ -486 +486 @@
             LOOKAHEAD( expression() ( <SEMICOLON> | <RBRACE> ) )
                 val=expression()
-                { ins.add(new Instruction.AssignmentInstruction(key.image, val)); }
+                { ins.add(new Instruction.AssignmentInstruction(key.image, val, false)); }
                 ( <RBRACE> { return ins; } | <SEMICOLON> w() )
             |
-                val=readRaw() w() { ins.add(new Instruction.AssignmentInstruction(key.image, val)); }
+                val=readRaw() w() { ins.add(new Instruction.AssignmentInstruction(key.image, val, false)); }
         )
     )*

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

@@ -160 +160 @@
             @Override
             public void visit(Node n) {
-                if (e.parent == null && right.matches(e.withPrimitive(n))) {
+                if (e.child == null && left.matches(e.withPrimitive(n))) {
                     if (e.osm instanceof Way && Geometry.nodeInsidePolygon(n, ((Way) e.osm).getNodes())
                             || e.osm instanceof Relation && ((Relation) e.osm).isMultipolygon() && Geometry.isNodeInsideMultiPolygon(n, (Relation) e.osm, null)) {
-                        e.parent = n;
+                        e.child = n;
                     }
                 }
@@ -170 +170 @@
             @Override
             public void visit(Way w) {
-                if (e.parent == null && right.matches(e.withPrimitive(w))) {
+                if (e.child == null && left.matches(e.withPrimitive(w))) {
                     if (e.osm instanceof Way && Geometry.PolygonIntersection.FIRST_INSIDE_SECOND.equals(Geometry.polygonIntersection(w.getNodes(), ((Way) e.osm).getNodes()))
                             || e.osm instanceof Relation && ((Relation) e.osm).isMultipolygon() && Geometry.isPolygonInsideMultiPolygon(w.getNodes(), (Relation) e.osm, null)) {
-                        e.parent = w;
+                        e.child = w;
                     }
                 }
@@ -184 +184 @@
             public void visit(Collection<? extends OsmPrimitive> primitives) {
                 for (OsmPrimitive p : primitives) {
-                    if (e.parent != null) {
+                    if (e.child != null) {
                         // abort if first match has been found
                         break;
@@ -206 +206 @@
                     return false;
                 }
-                e.child = e.osm;
+                e.parent = e.osm;
 
                 final ContainsFinder containsFinder = new ContainsFinder(e);
@@ -221 +221 @@
                 }
 
-                return e.parent != null;
+                return e.child != null;
 
             } else if (ChildOrParentSelectorType.CHILD.equals(type)) {
@@ -374 +374 @@
 
         public boolean matchesBase(OsmPrimitiveType type) {
-            if (OsmPrimitiveType.NODE.equals(type)) {
-                return base.equals("node") || base.equals("*");
+            if (base.equals("*")) {
+                return true;
+            } else if (OsmPrimitiveType.NODE.equals(type)) {
+                return base.equals("node");
             } else if (OsmPrimitiveType.WAY.equals(type)) {
-                return base.equals("way") || base.equals("area") || base.equals("*");
+                return base.equals("way") || base.equals("area");
             } else if (OsmPrimitiveType.RELATION.equals(type)) {
                 return base.equals("area") || base.equals("relation") || base.equals("canvas");