Changeset 226 in josm

Timestamp:

2007-05-06T16:28:53+02:00 (17 years ago)

Author:

imi

Message:

• fixed MergeVisitor to not merge two segments with different id's

Files:

• src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java (modified) (2 diffs)
• test/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java (modified) (1 diff)

src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java

@@ -250 +250 @@
                 if (ls1.id == ls2.id && ls1.id != 0)
                         return true;
+                //if (ls1.id != 0 && ls2.id != 0)
+                //      return false;
                 if (ls1.incomplete || ls2.incomplete)
                         return false;
@@ -288 +290 @@
                 if (other.keys == null)
                         return;
-                if (my.keySet().containsAll(other.keys.entrySet()))
+                if (my.keySet().containsAll(other.keys.keySet()))
                         return;
                 if (my.keys == null)

test/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java

@@ -350 +350 @@
                 assertEquals(23, ds.segments.iterator().next().id);
         }
+        
+        public void testDoNotMergeEqualObjectsWithDifferentNonZeroId() throws Exception {
+                DataSet ds = new DataSet();
+                Segment s1 = createSegment(ds, false, false, 23);
+                Segment s2 = new Segment(s1);
+                s2.id = 42;
+                MergeVisitor v = new MergeVisitor(ds);
+                v.visit(s2);
+                assertEquals(2, ds.segments.size());
+        }
 }