Changeset 6629 in josm

Timestamp:

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

Author:

simon04

Message:

Replace NodesDuplicatingWayTags test by a corresponding MapCSS test

Location:

trunk

Files:

• data/validator/unnecessary.mapcss (modified) (1 diff)
• src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (modified) (4 diffs)
• src/org/openstreetmap/josm/data/validation/OsmValidator.java (modified) (2 diffs)
• src/org/openstreetmap/josm/data/validation/tests/NodesDuplicatingWayTags.java (deleted)
• src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java (modified) (5 diffs)

trunk/data/validator/unnecessary.mapcss

@@ -16 +16 @@
   assertNoMatch: "way emergency=designated";
 }
+
+/* see ticket #7639 -- Warn when a node has the same tags as its parent way. */
+way >:sameTags node:tagged {
+  throwWarning: tr("Nodes duplicating parent way tags");
+}

trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java

@@ -671 +671 @@
 
     /**
-     * Replies true if other isn't null and has the same tags (key/value-pairs) as this.
-     *
-     * @param other the other object primitive
-     * @return true if other isn't null and has the same tags (key/value-pairs) as this.
-     */
-    public boolean hasSameTags(OsmPrimitive other) {
-        // We cannot directly use Arrays.equals(keys, other.keys) as keys is not ordered by key
-        // but we can at least check if both arrays are null or of the same size before creating
-        // and comparing the key maps (costly operation, see #7159)
-        return (keys == null && other.keys == null)
-            || (keys != null && other.keys != null && keys.length == other.keys.length && (keys.length == 0 || getKeys().equals(other.getKeys())));
-    }
-
-    /**
      * What to do, when the tags have changed by one of the tag-changing methods.
      */

trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

@@ -10 +10 @@
 import java.util.Collections;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashSet;
@@ -726 +727 @@
     }
 
+    /**
+     * Returns {@link #getKeys()} for which {@code key} does not fulfill {@link #isUninterestingKey}.
+     */
+    public Map<String, String> getInterestingTags() {
+        Map<String, String> result = new HashMap<String, String>();
+        String[] keys = this.keys;
+        if (keys != null) {
+            for (int i = 0; i < keys.length; i += 2) {
+                if (!isUninterestingKey(keys[i])) {
+                    result.put(keys[i], keys[i + 1]);
+                }
+            }
+        }
+        return result;
+    }
+
     private static volatile Match directionKeys = null;
     private static volatile Match reversedDirectionKeys = null;
@@ -1115 +1132 @@
 
     /**
+     * Replies true if other isn't null and has the same interesting tags (key/value-pairs) as this.
+     *
+     * @param other the other object primitive
+     * @return true if other isn't null and has the same interesting tags (key/value-pairs) as this.
+     */
+    public boolean hasSameInterestingTags(OsmPrimitive other) {
+        // We cannot directly use Arrays.equals(keys, other.keys) as keys is not ordered by key
+        // but we can at least check if both arrays are null or of the same size before creating
+        // and comparing the key maps (costly operation, see #7159)
+        return (keys == null && other.keys == null)
+                || (keys != null && other.keys != null && keys.length == other.keys.length
+                        && (keys.length == 0 || getInterestingTags().equals(other.getInterestingTags())));
+    }
+
+    /**
      * Replies true if this primitive and other are equal with respect to their
      * semantic attributes.
@@ -1133 +1165 @@
         // can't do an equals check on the internal keys array because it is not ordered
         //
-        return hasSameTags(other);
+        return hasSameInterestingTags(other);
     }
 

trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java

@@ -36 +36 @@
 import org.openstreetmap.josm.data.validation.tests.MultipolygonTest;
 import org.openstreetmap.josm.data.validation.tests.NameMismatch;
-import org.openstreetmap.josm.data.validation.tests.NodesDuplicatingWayTags;
 import org.openstreetmap.josm.data.validation.tests.OpeningHourTest;
 import org.openstreetmap.josm.data.validation.tests.OverlappingWays;
@@ -110 +109 @@
         DuplicateRelation.class, // ID 1901 .. 1999
         WayConnectedToArea.class, // ID 2301 .. 2399
-        NodesDuplicatingWayTags.class, // ID 2401 .. 2499
         PowerLines.class, // ID 2501 .. 2599
         Addresses.class, // ID 2601 .. 2699

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;
         }