Changeset 3053 in josm

Timestamp:

2010-02-27T15:46:00+01:00 (14 years ago)

Author:

jttt

Message:

Fix tests

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/osm/DataSetMerger.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java (modified) (2 diffs)

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

@@ -149 +149 @@
 
     /**
-     * A way in the target dataset might be incomplete because at least one of its nodes is incomplete.
-     * The nodes might have become complete because a complete node was merged into in the
-     * merge operation.
-     *
-     * This method loops over all parent ways of such nodes and turns them into complete ways
-     * if necessary.
-     *
-     * @param other
-     */
-    //TODO This method is probably useless
-    protected void fixIncompleteParentWays(Node other) {
-        Node myNode = (Node)getMergeTarget(other);
-        if (myNode == null)
-            throw new RuntimeException(tr("Missing merge target for node with id {0}", other.getUniqueId()));
-        if (myNode.isIncomplete() || myNode.isDeleted() || !myNode.isVisible()) return;
-    }
-
-    /**
      * Postprocess the dataset and fix all merged references to point to the actual
      * data.
@@ -188 +170 @@
             targetDataSet.unlinkReferencesToPrimitive(target);
         }
-        // objectsWithChildrenToMerge also includes complete nodes which have
-        // been merged into their incomplete equivalents.
-        //
-        for (PrimitiveId id: objectsWithChildrenToMerge) {
-            if (!id.getType().equals(OsmPrimitiveType.NODE)) {
-                continue;
-            }
-            Node n = (Node)sourceDataSet.getPrimitiveById(id);
-            if (!conflicts.hasConflictForTheir(n)) {
-                fixIncompleteParentWays(n);
-            }
-        }
-
     }
 

trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java

@@ -292 +292 @@
     /**
      * My and their node are new but semantically equal. My node is deleted.
-     *
-     * => create a conflict
-     *
+     * 
+     * => Ignore my node, no conflict
      */
     @Test
@@ -309 +308 @@
         visitor.merge();
 
-        assertEquals(1,visitor.getConflicts().size());
+        assertEquals(0, visitor.getConflicts().size());
         assertTrue(n.getDataSet() == my);
         assertTrue(n1.getDataSet() == their);