Changeset 21664 in osm for applications/editors/josm

Timestamp:

2010-06-12T01:14:01+02:00 (14 years ago)

Author:

upliner

Message:

better handling of deleted objects and its referrers

Location:

applications/editors/josm

Files:

• dist/reverter.jar (modified) ( previous)
• plugins/reverter/src/reverter/ChangesetReverter.java (modified) (4 diffs)
• plugins/reverter/src/reverter/DataSetToCmd.java (modified) (5 diffs)

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

@@ -181 +181 @@
             }
         }
-        layer.mergeFrom(rdr.parseOsm(monitor));
+        DataSet source = rdr.parseOsm(monitor); 
+        for (OsmPrimitive p : source.allPrimitives()) {
+            if (!p.isVisible() && !p.isDeleted()) {
+                p.setDeleted(true);
+                p.setModified(false);
+            }
+        }
+        layer.mergeFrom(source);
         missing.clear();
     }
@@ -205 +212 @@
         
         //////////////////////////////////////////////////////////////////////////
-        // Create commands to restore/update all affected objects 
-        LinkedList<Command> cmds = new DataSetToCmd(nds,ds).getCommandList();
+        // Create commands to restore/update all affected objects
+        DataSetToCmd merger = new DataSetToCmd(nds,ds);
+        LinkedList<Command> cmds = merger.getCommandList();
 
         //////////////////////////////////////////////////////////////////////////
@@ -230 +238 @@
         
         HashSet<OsmPrimitive> conflicted = new HashSet<OsmPrimitive>();
+        
+        for (Conflict<? extends OsmPrimitive> conflict : merger.getConflicts()) {
+            cmds.add(new ConflictAddCommand(layer,conflict));
+        }
+        
         // Check objects versions
         Iterator<ChangesetDataSetEntry> iterator = cds.iterator();
@@ -251 +264 @@
          */
         for (OsmPrimitive p : toDelete.toArray(new OsmPrimitive[0])) {
+            if (p.isDeleted()) {
+                toDelete.remove(p);
+                continue;
+            }
             for (OsmPrimitive referrer : p.getReferrers()) {
                 if (toDelete.contains(referrer)) continue; // object is going to be deleted

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

@@ -10 +10 @@
 import org.openstreetmap.josm.command.ChangeNodesCommand;
 import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.data.conflict.Conflict;
+import org.openstreetmap.josm.data.conflict.ConflictCollection;
 import org.openstreetmap.josm.data.osm.*;
 
@@ -19 +21 @@
 final class DataSetToCmd {
 
+    /** the collection of conflicts created during merging */
+    private final ConflictCollection conflicts = new ConflictCollection();
     /** the source dataset where primitives are merged from */
     private final DataSet sourceDataSet;
@@ -97 +101 @@
         for (Node sourceNode : source.getNodes()) {
             Node targetNode = (Node)getMergeTarget(sourceNode);
+            if (targetNode.isDeleted() && sourceNode.isIncomplete()
+                    && !conflicts.hasConflictForMy(targetNode)) {
+                conflicts.add(new Conflict<OsmPrimitive>(targetNode, sourceNode, true));
+                Node undeletedTargetNode = new Node(targetNode);
+                undeletedTargetNode.setDeleted(false);
+                cmds.add(new ChangeCommand(targetNode,undeletedTargetNode));
+            }
             newNodes.add(targetNode);
         }
@@ -116 +127 @@
         for (RelationMember sourceMember : source.getMembers()) {
             OsmPrimitive targetMember = getMergeTarget(sourceMember.getMember());
+            if (targetMember.isDeleted() && sourceMember.getMember().isIncomplete()
+                    && !conflicts.hasConflictForMy(targetMember)) {
+                conflicts.add(new Conflict<OsmPrimitive>(targetMember, sourceMember.getMember(), true));
+                OsmPrimitive undeletedTargetMember;
+                switch(targetMember.getType()) {
+                case NODE: undeletedTargetMember = new Node((Node)targetMember); break;
+                case WAY: undeletedTargetMember = new Way((Way)targetMember); break;
+                case RELATION: undeletedTargetMember = new Relation((Relation)targetMember); break;
+                default: throw new AssertionError();
+                }
+                undeletedTargetMember.setDeleted(false);
+                cmds.add(new ChangeCommand(targetMember,undeletedTargetMember));
+            }
             newMembers.add(new RelationMember(sourceMember.getRole(), targetMember));
         }
@@ -138 +162 @@
         return cmds;
     }
+
+    /**
+     * replies the map of conflicts
+     *
+     * @return the map of conflicts
+     */
+    public ConflictCollection getConflicts() {
+        return conflicts;
+    }
 }