Changeset 22411 in osm

Timestamp:

2010-07-21T19:55:15+02:00 (14 years ago)

Author:

upliner

Message:

reverter: Fix the bug with relation tags and prettify the dataset merger code

Location:

applications/editors/josm

Files:

• dist/reverter.jar (modified) ( previous)
• plugins/reverter/src/reverter/DataSetToCmd.java (modified) (8 diffs)

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

@@ -8 +8 @@
 
 import org.openstreetmap.josm.command.ChangeCommand;
-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.*;
+import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.RelationMember;
+import org.openstreetmap.josm.data.osm.Way;
 
 /**
@@ -38 +42 @@
     }
 
-    /**
-     * Merges a primitive <code>other</code> of type <P> onto my primitives.
-     *
-     * @param <P>  the type of the other primitive
-     * @param source  the other primitive
-     */
-    private void mergePrimitive(OsmPrimitive source) {
-        if (source.isIncomplete()) return;
-        if (!source.isVisible()) return;
-        OsmPrimitive target = getMergeTarget(source);
-        if (target.getVersion() == 0)
-            throw new IllegalStateException(tr("Target of type {0} with id {1} has invalid version",
-                    target.getType(), target.getUniqueId()));
-        OsmPrimitive newTarget;
-        switch(target.getType()) {
-        case NODE: newTarget = new Node((Node)target); break;
-        case WAY: newTarget = new Way((Way)target); break;
-        case RELATION: newTarget = new Relation((Relation)target); break;
-        default: throw new AssertionError();
-        }
-        newTarget.mergeFrom(source);
-        newTarget.setOsmId(target.getId(), (int)target.getVersion());
-        newTarget.setVisible(target.isVisible());
-        newTarget.setDeleted(false);
-        cmds.add(new ChangeCommand(target,newTarget));
-    }
-
     private OsmPrimitive getMergeTarget(OsmPrimitive mergeSource) {
         OsmPrimitive p = targetDataSet.getPrimitiveById(mergeSource.getId(), mergeSource.getType());
@@ -72 +49 @@
         return p;
     }
-    
-    /**
-     * Postprocess the dataset and fix all merged references to point to the actual
-     * data.
-     */
-    public void fixReferences() {
-        for (Way w : sourceDataSet.getWays()) {
-                mergeNodeList(w);
-        }
-        for (Relation r : sourceDataSet.getRelations()) {
-                mergeRelationMembers(r);
-        }
+
+    private void mergePrimitive(OsmPrimitive source, OsmPrimitive target, OsmPrimitive newTarget) {
+        newTarget.mergeFrom(source);
+        newTarget.setOsmId(target.getId(), (int)target.getVersion());
+        newTarget.setVisible(target.isVisible());
+        newTarget.setDeleted(false);
     }
 
     /**
-     * Merges the node list of a source way onto its target way.
+     * Merges the source node onto its target node.
+     *
+     * @param source the source way
+     */
+    private void mergeNode(Node source) {
+        if (source.isIncomplete()) return;
+        if (!source.isVisible()) return;
+        Node target = (Node)getMergeTarget(source);
+
+        Node newTarget = new Node(target);
+        mergePrimitive(source, target, newTarget);
+        cmds.add(new ChangeCommand(target,newTarget));
+    }
+
+    /**
+     * Merges the source way onto its target way.
      *
      * @param source the source way
@@ -94 +80 @@
      *
      */
-    private void mergeNodeList(Way source) throws IllegalStateException {
+    private void mergeWay(Way source) throws IllegalStateException {
         if (source.isIncomplete()) return;
         if (!source.isVisible()) return;
@@ -111 +97 @@
             newNodes.add(targetNode);
         }
-        cmds.add(new ChangeNodesCommand(target,newNodes));
+        Way newTarget = new Way(target);
+        mergePrimitive(source, target, newTarget);
+        newTarget.setNodes(newNodes);
+        cmds.add(new ChangeCommand(target,newTarget));
     }
 
     /**
-     * Merges the relation members of a source relation onto the corresponding target relation.
+     * Merges the source relation onto the corresponding target relation.
      * @param source the source relation
      * @throws IllegalStateException thrown if there is no corresponding target relation
@@ -121 +110 @@
      * members in source
      */
-    private void mergeRelationMembers(Relation source) throws IllegalStateException {
+    private void mergeRelation(Relation source) throws IllegalStateException {
         if (source.isIncomplete()) return;
         if (!source.isVisible()) return;
@@ -143 +132 @@
             newMembers.add(new RelationMember(sourceMember.getRole(), targetMember));
         }
-        Relation newRelation = new Relation(target); 
+        Relation newRelation = new Relation(target);
+        mergePrimitive(source, target, newRelation);
         newRelation.setMembers(newMembers);
         cmds.add(new ChangeCommand(target,newRelation));
@@ -149 +139 @@
     private void merge() {
         for (Node node: sourceDataSet.getNodes()) {
-            mergePrimitive(node);
+            mergeNode(node);
         }
         for (Way way: sourceDataSet.getWays()) {
-            mergePrimitive(way);
+            mergeWay(way);
         }
         for (Relation relation: sourceDataSet.getRelations()) {
-            mergePrimitive(relation);
+            mergeRelation(relation);
         }
-        fixReferences();
     }