Changeset 6629 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java

Timestamp:

2014-01-05T12:03:37+01:00 (10 years ago)

Author:

simon04

Message:

Replace NodesDuplicatingWayTags test by a corresponding MapCSS test

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java (modified) (5 diffs)

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

@@ -9 +9 @@
 
 import org.openstreetmap.josm.data.osm.Node;
-import org.openstreetmap.josm.data.osm.OsmUtils;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Tag;
@@ -15 +14 @@
 import org.openstreetmap.josm.gui.mappaint.Cascade;
 import org.openstreetmap.josm.gui.mappaint.Environment;
+import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.Predicates;
 import org.openstreetmap.josm.tools.Utils;
@@ -58 +58 @@
 
     public static Condition createPseudoClassCondition(String id, boolean not, Context context) {
-        return new PseudoClassCondition(id, not);
+        return new PseudoClassCondition(id, not, context);
     }
 
@@ -305 +305 @@
         public final boolean not;
 
-        public PseudoClassCondition(String id, boolean not) {
+        public PseudoClassCondition(String id, boolean not, Context context) {
             this.id = id;
             this.not = not;
+            CheckParameterUtil.ensureThat(!"sameTags".equals(id) || Context.LINK.equals(context), "sameTags only supported in LINK context");
         }
 
@@ -322 +323 @@
                     return true;
                 return false;
-            } else if (equal(id, "modified"))
+            } else if (equal(id, "modified")) {
                 return e.osm.isModified() || e.osm.isNewOrUndeleted();
-            else if (equal(id, "new"))
+            } else if (equal(id, "new")) {
                 return e.osm.isNew();
-            else if (equal(id, "connection") && (e.osm instanceof Node))
+            } else if (equal(id, "connection") && (e.osm instanceof Node)) {
                 return ((Node) e.osm).isConnectionNode();
-            else if (equal(id, "tagged"))
+            } else if (equal(id, "tagged")) {
                 return e.osm.isTagged();
+            } else if ("sameTags".equals(id)) {
+                return e.osm.hasSameInterestingTags(Utils.firstNonNull(e.child, e.parent));
+            }
             return true;
         }