Changeset 9979 in josm

Timestamp:

2016-03-13T01:17:21+01:00 (8 years ago)

Author:

Don-vip

Message:

see #12599, fix #12616 - Random repositioning of nodes (incomplete fix from r9961)

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/osm/Node.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/osm/Relation.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/osm/Way.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java (modified) (1 diff)

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

@@ -281 +281 @@
 
     @Override
-    public boolean hasEqualSemanticAttributes(OsmPrimitive other) {
+    public boolean hasEqualSemanticAttributes(OsmPrimitive other, boolean testInterestingTagsOnly) {
         if (!(other instanceof Node))
             return false;
-        if (!super.hasEqualSemanticAttributes(other))
+        if (!super.hasEqualSemanticAttributes(other, testInterestingTagsOnly))
             return false;
         Node n = (Node) other;

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

@@ -1237 +1237 @@
      * @return true if this primitive and other are equal with respect to their semantic attributes.
      */
-    public boolean hasEqualSemanticAttributes(OsmPrimitive other) {
+    public final boolean hasEqualSemanticAttributes(OsmPrimitive other) {
         return hasEqualSemanticAttributes(other, true);
     }

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

@@ -287 +287 @@
 
     @Override
-    public boolean hasEqualSemanticAttributes(OsmPrimitive other) {
+    public boolean hasEqualSemanticAttributes(OsmPrimitive other, boolean testInterestingTagsOnly) {
         if (!(other instanceof Relation))
             return false;
-        if (!super.hasEqualSemanticAttributes(other))
+        if (!super.hasEqualSemanticAttributes(other, testInterestingTagsOnly))
             return false;
         Relation r = (Relation) other;

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

@@ -331 +331 @@
 
     @Override
-    public boolean hasEqualSemanticAttributes(OsmPrimitive other) {
+    public boolean hasEqualSemanticAttributes(OsmPrimitive other, boolean testInterestingTagsOnly) {
         if (!(other instanceof Way))
             return false;
-        if (!super.hasEqualSemanticAttributes(other))
+        if (!super.hasEqualSemanticAttributes(other, testInterestingTagsOnly))
             return false;
         Way w = (Way) other;

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

@@ -1034 +1034 @@
     }
 
+
+    /**
+     * Non-regression test for <a href="https://josm.openstreetmap.de/ticket/12616">Bug #12616</a>.
+     */
+    @Test
+    public void testTicket12616() {
+        // Server node: no modifications
+        Node n1 = new Node(1, 1);
+        n1.setCoor(LatLon.ZERO);
+        assertFalse(n1.isModified());
+        their.addPrimitive(n1);
+
+        // Local node: one modification: move
+        Node n1b = new Node(n1);
+        n1b.setCoor(new LatLon(1, 1));
+        n1b.setModified(true);
+        assertTrue(n1b.isModified());
+        assertEquals(new LatLon(1, 1), n1b.getCoor());
+        my.addPrimitive(n1b);
+
+        // Merge
+        DataSetMerger visitor = new DataSetMerger(my, their);
+        visitor.merge();
+
+        // Check that modification is still here
+        Node n = (Node) my.getPrimitiveById(1, OsmPrimitiveType.NODE);
+        assertNotNull(n);
+        assertEquals(new LatLon(1, 1), n.getCoor());
+        assertTrue(n.isModified());
+
+        // Merge again
+        visitor = new DataSetMerger(my, their);
+        visitor.merge();
+
+        // Check that modification is still here
+        n = (Node) my.getPrimitiveById(1, OsmPrimitiveType.NODE);
+        assertNotNull(n);
+        assertEquals(new LatLon(1, 1), n.getCoor());
+        assertTrue(n.isModified());
+    }
 }