Changeset 4051 in josm for trunk/src/org

Timestamp:

2011-04-20T19:09:23+02:00 (13 years ago)

Author:

stoecker

Message:

fix #5642 - patch by bilbo - improve validator checks

Location:

trunk/src/org/openstreetmap/josm/data/validation

Files:

• OsmValidator.java (modified) (2 diffs)
• tests/DuplicateRelation.java (added)
• tests/DuplicateWay.java (modified) (7 diffs)

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

@@ -31 +31 @@
 import org.openstreetmap.josm.data.validation.tests.DuplicateNode;
 import org.openstreetmap.josm.data.validation.tests.DuplicateWay;
+import org.openstreetmap.josm.data.validation.tests.DuplicateRelation;
 import org.openstreetmap.josm.data.validation.tests.DuplicatedWayNodes;
 import org.openstreetmap.josm.data.validation.tests.MultipolygonTest;
@@ -95 +96 @@
             RelationChecker.class, // ID  1701 ..  1799
             TurnrestrictionTest.class, // ID  1801 ..  1899
+            DuplicateRelation.class, // ID 1901 .. 1999
     };
 

trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateWay.java

@@ -34 +34 @@
 {
 
-    private static class WayPair {
+    private class WayPair {
         public List<LatLon> coor;
         public Map<String, String> keys;
@@ -56 +56 @@
     }
 
+    private class WayPairNoTags {
+        public List<LatLon> coor;
+        public WayPairNoTags(List<LatLon> _coor) {
+            coor=_coor;
+        }
+        @Override
+        public int hashCode() {
+            return coor.hashCode();
+        }
+        @Override
+        public boolean equals(Object obj) {
+            if (!(obj instanceof WayPairNoTags)) return false;
+            WayPairNoTags wp = (WayPairNoTags) obj;
+            return wp.coor.equals(coor);
+        }
+    }
+
     protected static int DUPLICATE_WAY = 1401;
+    protected static int SAME_WAY = 1402;
 
     /** Bag of all ways */
     MultiMap<WayPair, OsmPrimitive> ways;
+
+    /** Bag of all ways, regardless of tags */
+    MultiMap<WayPairNoTags, OsmPrimitive> waysNoTags;
 
     /**
@@ -66 +87 @@
     public DuplicateWay() {
         super(tr("Duplicated ways."),
-                tr("This test checks that there are no ways with same tags and same node coordinates."));
+              tr("This test checks that there are no ways with same node coordinates and optionally also same tags."));
     }
 
@@ -74 +95 @@
         super.startTest(monitor);
         ways = new MultiMap<WayPair, OsmPrimitive>(1000);
+        waysNoTags = new MultiMap<WayPairNoTags, OsmPrimitive>(1000);
     }
 
@@ -85 +107 @@
             }
         }
+
+        for(Set<OsmPrimitive> sameway : waysNoTags.values()) {
+            if( sameway.size() > 1) {
+                //Report error only if at least some tags are different, as otherwise the error was already reported as duplicated ways
+                Map<String, String> tags0=null;
+                boolean skip=true;
+
+                for(OsmPrimitive o : sameway) {
+                    if (tags0==null) {
+                        tags0=o.getKeys();
+                        removeUninterestingKeys(tags0);
+                    } else {
+                        Map<String, String> tagsCmp=o.getKeys();
+                        removeUninterestingKeys(tagsCmp);
+                        if (!tagsCmp.equals(tags0)) {
+                            skip=false;
+                            break;
+                        }
+                    }
+                }
+                if (skip) continue;
+                TestError testError = new TestError(this, Severity.WARNING, tr("Ways with same position"), SAME_WAY, sameway);
+                errors.add(testError);
+            }
+        }
         ways = null;
+        waysNoTags = null;
+    }
+
+    /**
+     * Remove uninteresting keys, like created_by to normalize the tags 
+     */
+    public void removeUninterestingKeys(Map<String, String> wkeys) {
+        wkeys.remove("created_by");
     }
 
@@ -98 +153 @@
         }
         Map<String, String> wkeys = w.getKeys();
-        wkeys.remove("created_by");
+        removeUninterestingKeys(wkeys);
         WayPair wKey = new WayPair(wLat, wkeys);
         ways.put(wKey, w);
+        WayPairNoTags wKeyN = new WayPairNoTags(wLat);
+        waysNoTags.put(wKeyN, w);
     }
 
@@ -174 +231 @@
             return false;
 
+        //Do not automatically fix same ways with different tags
+        if (testError.getCode()!=DUPLICATE_WAY) return false;
+
         // We fix it only if there is no more than one way that is relation member.
         Collection<? extends OsmPrimitive> sel = testError.getPrimitives();