Changeset 29559 in osm for applications

Timestamp:

2013-05-06T01:26:22+02:00 (12 years ago)

Author:

donvip

Message:

[josm_reverter] fix #josm8676 - Nodes unnecessary reverted because of recent handling of nodes without coordinates

Location:

applications/editors/josm/plugins/reverter/src/reverter

Files:

• ChangesetReverter.java (modified) (1 diff)
• DataSetCommandMerger.java (modified) (6 diffs)

applications/editors/josm/plugins/reverter/src/reverter/ChangesetReverter.java

@@ -423 +423 @@
                 OsmPrimitive p = ds.getPrimitiveById(id);
                 if (p instanceof Node && p.getVersion() > 1) {
-                    final OsmServerMultiObjectReader rdr = new OsmServerMultiObjectReader();
-                    readObjectVersion(rdr, id, p.getVersion()-1, progressMonitor);
-                    Collection<OsmPrimitive> result = rdr.parseOsm(progressMonitor.createSubTaskMonitor(1, true)).allPrimitives();
-                    if (!result.isEmpty()) {
-                        n.setCoor(((Node)result.iterator().next()).getCoor());
+                    LatLon coor = ((Node)p).getCoor();
+                    if (coor == null) {
+                        final OsmServerMultiObjectReader rdr = new OsmServerMultiObjectReader();
+                        readObjectVersion(rdr, id, p.getVersion()-1, progressMonitor);
+                        Collection<OsmPrimitive> result = rdr.parseOsm(progressMonitor.createSubTaskMonitor(1, true)).allPrimitives();
+                        if (!result.isEmpty()) {
+                            coor = ((Node)result.iterator().next()).getCoor();
+                        }
                     }
+                    if (coor != null) {
+                        n.setCoor(coor);
+                    }
                 }
             }

applications/editors/josm/plugins/reverter/src/reverter/DataSetCommandMerger.java

@@ -41 +41 @@
         merge();
     }
+    
+    private void addChangeCommandIfNotEquals(OsmPrimitive target, OsmPrimitive newTarget) {
+        if (!target.hasEqualSemanticAttributes(newTarget)) {
+            cmds.add(new ChangeCommand(target,newTarget));
+        }
+    }
 
     private OsmPrimitive getMergeTarget(OsmPrimitive mergeSource) {
@@ -69 +75 @@
         Node newTarget = new Node(target);
         mergePrimitive(source, target, newTarget);
-        cmds.add(new ChangeCommand(target,newTarget));
+        addChangeCommandIfNotEquals(target,newTarget);
     }
 
@@ -93 +99 @@
                 Node undeletedTargetNode = new Node(targetNode);
                 undeletedTargetNode.setDeleted(false);
-                cmds.add(new ChangeCommand(targetNode,undeletedTargetNode));
+                addChangeCommandIfNotEquals(targetNode,undeletedTargetNode);
             }
             newNodes.add(targetNode);
@@ -100 +106 @@
         mergePrimitive(source, target, newTarget);
         newTarget.setNodes(newNodes);
-        cmds.add(new ChangeCommand(target,newTarget));
+        addChangeCommandIfNotEquals(target,newTarget);
     }
 
@@ -128 +134 @@
                 }
                 undeletedTargetMember.setDeleted(false);
-                cmds.add(new ChangeCommand(targetMember,undeletedTargetMember));
+                addChangeCommandIfNotEquals(targetMember,undeletedTargetMember);
             }
             newMembers.add(new RelationMember(sourceMember.getRole(), targetMember));
@@ -135 +141 @@
         mergePrimitive(source, target, newRelation);
         newRelation.setMembers(newMembers);
-        cmds.add(new ChangeCommand(target,newRelation));
+        addChangeCommandIfNotEquals(target,newRelation);
     }
+    
     private void merge() {
         for (Node node: sourceDataSet.getNodes()) {