Changeset 187 in josm

Timestamp:

2007-01-04T23:30:59+01:00 (18 years ago)

Author:

imi

Message:

• fixed bug when merging unchanged segments over new ones

Files:

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

src/org/openstreetmap/josm/data/osm/Segment.java

@@ -84 +84 @@
                 if (incomplete)
                         return ((Segment)osm).incomplete;
-                return from.equals(((Segment)osm).from) && to.equals(((Segment)osm).to);
+                return super.realEqual(osm) && from.equals(((Segment)osm).from) && to.equals(((Segment)osm).to);
         }
 

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

@@ -28 +28 @@
                 n = DataSetTestCaseHelper.createNode(null);
         }
+
+
+        private Segment createSegment(DataSet ds, boolean incomplete, boolean deleted, int id) {
+        Node n1 = DataSetTestCaseHelper.createNode(ds);
+        Node n2 = DataSetTestCaseHelper.createNode(ds);
+        Segment s = DataSetTestCaseHelper.createSegment(ds, n1, n2);
+        s.incomplete = incomplete;
+        s.id = id;
+        s.deleted = deleted;
+        s.timestamp = new Date();
+        return s;
+    }
+
+
+        /**
+     * Create that amount of nodes and add them to the dataset. The id will be 1,2,3,4...
+     * @param amount Number of nodes to create.
+     * @return The created nodes.
+     */
+    private Node[] createNodes(DataSet ds, int amount) {
+        Node[] nodes = new Node[amount];
+        for (int i = 0; i < amount; ++i) {
+                nodes[i] = DataSetTestCaseHelper.createNode(ds);
+                nodes[i].id = i+1;
+        }
+        return nodes;
+    }
 
 
@@ -279 +306 @@
                 assertEquals(1, v.conflicts.size());
         }
-
-
-        private Segment createSegment(DataSet ds, boolean incomplete, boolean deleted, int id) {
-                Node n1 = DataSetTestCaseHelper.createNode(ds);
-                Node n2 = DataSetTestCaseHelper.createNode(ds);
-                Segment s = DataSetTestCaseHelper.createSegment(ds, n1, n2);
-                s.incomplete = incomplete;
-                s.id = id;
-                s.deleted = deleted;
-                s.timestamp = new Date();
-                return s;
-        }
         
-        /**
-         * Create that amount of nodes and add them to the dataset. The id will be 1,2,3,4...
-         * @param amount Number of nodes to create.
-         * @return The created nodes.
-         */
-        private Node[] createNodes(DataSet ds, int amount) {
-                Node[] nodes = new Node[amount];
-                for (int i = 0; i < amount; ++i) {
-                        nodes[i] = DataSetTestCaseHelper.createNode(ds);
-                        nodes[i].id = i+1;
-                }
-                return nodes;
-        }
 }