Changeset 3980 in josm for trunk/src

Timestamp:

2011-03-12T19:43:02+01:00 (14 years ago)

Author:

bastiK

Message:

mapcss: fix conditions

Location:

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

Files:

• Condition.java (modified) (1 diff)
• Expression.java (modified) (1 diff)

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

@@ -150 +150 @@
             } else if (equal(id, "connection") && (e.osm instanceof Node)) {
                 return ((Node) e.osm).isConnectionNode();
+            } else if (equal(id, "tagged")) {
+                return e.osm.isTagged();
             }
             return true;

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

@@ -235 +235 @@
                 if (b == null)
                     return null;
-                return args.get(b ? 0 : 1).evaluate(env);
+                return args.get(b ? 1 : 2).evaluate(env);
             }
             if (equal(name, "and")) {