Changeset 1753 in josm

Timestamp:

2009-07-08T22:58:37+02:00 (15 years ago)

Author:

Gubaer

Message:

fixed #2245: Merge layers doesn't update the "action" tags

Location:

trunk

Files:

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

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

@@ -168 +168 @@
     }
 
+
     private void fixWay(Way w) {
         boolean replacedSomething = false;
         LinkedList<Node> newNodes = new LinkedList<Node>();
-        for (Node n : w.nodes) {
-            Node otherN = (Node) merged.get(n);
-            newNodes.add(otherN == null ? n : otherN);
-            if (otherN != null) {
-                replacedSomething = true;
+        for (Node myNode : w.nodes) {
+            Node mergedNode = (Node) merged.get(myNode);
+            if (mergedNode != null) {
+                if (!mergedNode.deleted) {
+                    newNodes.add(mergedNode);
+                }
+                replacedSomething =  true;
+            } else {
+                newNodes.add(myNode);
             }
         }
@@ -187 +192 @@
         boolean replacedSomething = false;
         LinkedList<RelationMember> newMembers = new LinkedList<RelationMember>();
-        for (RelationMember m : r.members) {
-            OsmPrimitive otherP = merged.get(m.member);
-            if (otherP == null) {
-                newMembers.add(m);
+        for (RelationMember myMember : r.members) {
+            OsmPrimitive mergedMember = merged.get(myMember.member);
+            if (mergedMember == null) {
+                newMembers.add(myMember);
             } else {
-                RelationMember mnew = new RelationMember(m);
-                mnew.member = otherP;
-                newMembers.add(mnew);
+                if (! mergedMember.deleted) {
+                    RelationMember newMember = new RelationMember(myMember);
+                    newMember.member = mergedMember;
+                    newMembers.add(newMember);
+                }
                 replacedSomething = true;
             }

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

@@ -5 +5 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
+
 
 import java.io.File;
@@ -21 +22 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.User;
 import org.openstreetmap.josm.data.osm.Way;
@@ -855 +858 @@
         assertEquals(theirWay.getTimestamp(), myWay.getTimestamp());
     }
+
+
+    /**
+     * My dataset includes a deleted node.
+     * Their dataset includes a way with three nodes, the first one being my node.
+     * 
+     * => the merged way should include two nodes only. the deleted node should still be
+     * in the data set
+     *
+     */
+    @Test
+    public void wayComplex_mergingADeletedNode() {
+
+        DataSet my = new DataSet();
+        my.version = "0.6";
+
+        Node n1 = new Node(new LatLon(0,0));
+        n1.id = 1;
+        n1.version = 1;
+        n1.delete(true);
+        my.addPrimitive(n1);
+
+        DataSet their = new DataSet();
+        their.version = "0.6";
+
+        Node n3 = new Node(new LatLon(0,0));
+        n3.id = 1;
+        n3.version = 1;
+        their.addPrimitive(n3);
+
+        Node n4 = new Node(new LatLon(1,1));
+        n4.id = 2;
+        n4.version = 1;
+        their.addPrimitive(n4);
+
+        Node n5 = new Node(new LatLon(2,2));
+        n5.id = 3;
+        n5.version = 1;
+        their.addPrimitive(n5);
+
+
+        Way theirWay = new Way();
+        theirWay.id = 4;
+        theirWay.version = 1;
+        theirWay.nodes.add(n3);
+        theirWay.nodes.add(n4);
+        theirWay.nodes.add(n5);
+        theirWay.user = User.get("their");
+        theirWay.user.uid = "1111";
+        theirWay.setTimestamp(new Date());
+        their.addPrimitive(theirWay);
+
+        MergeVisitor visitor = new MergeVisitor(my,their);
+        visitor.merge();
+
+        assertEquals(0,visitor.getConflicts().size());
+
+        Way myWay = (Way)my.getPrimitiveById(4);
+        assertEquals(2, myWay.nodes.size());
+
+        Node n = (Node)my.getPrimitiveById(1);
+        assertTrue(n != null);
+    }
+
+    /**
+     * My dataset includes a deleted node.
+     * Their dataset includes a relation with thre nodes, the first one being my node.
+     * 
+     * => the merged relation should include two nodes only. the deleted node should still be
+     * in the data set
+     *
+     */
+    @Test
+    public void relationComplex_mergingADeletedNode() {
+
+        DataSet my = new DataSet();
+        my.version = "0.6";
+
+        Node n1 = new Node(new LatLon(0,0));
+        n1.id = 1;
+        n1.version = 1;
+        n1.delete(true);
+        my.addPrimitive(n1);
+
+        DataSet their = new DataSet();
+        their.version = "0.6";
+
+        Node n3 = new Node(new LatLon(0,0));
+        n3.id = 1;
+        n3.version = 1;
+        their.addPrimitive(n3);
+
+        Node n4 = new Node(new LatLon(1,1));
+        n4.id = 2;
+        n4.version = 1;
+        their.addPrimitive(n4);
+
+        Node n5 = new Node(new LatLon(2,2));
+        n5.id = 3;
+        n5.version = 1;
+        their.addPrimitive(n5);
+
+
+        Relation theirRelation = new Relation();
+        theirRelation.id = 4;
+        theirRelation.version = 1;
+        theirRelation.members.add(new RelationMember("", n3));
+        theirRelation.members.add(new RelationMember("", n4));
+        theirRelation.members.add(new RelationMember("", n5));
+        their.addPrimitive(theirRelation);
+
+        MergeVisitor visitor = new MergeVisitor(my,their);
+        visitor.merge();
+
+        assertEquals(0,visitor.getConflicts().size());
+
+        Relation r = (Relation)my.getPrimitiveById(4);
+        assertEquals(2, r.members.size());
+
+        Node n = (Node)my.getPrimitiveById(1);
+        assertTrue(n != null);
+    }
+
+
+
+
 }