Changeset 366 in josm

Timestamp:

2007-10-11T23:28:26+02:00 (17 years ago)

Author:

gebner

Message:

Handle merging of incomplete ways. Fixes #392.

File:

• trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java (modified) (14 diffs)

trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java

@@ -26 +26 @@
         /**
          * Map from primitives in the database to visited primitives. (Attention: The other way 
-         * round than mergedNodes)
+         * round than mergedPrims)
          */
         public Map<OsmPrimitive, OsmPrimitive> conflicts = new HashMap<OsmPrimitive, OsmPrimitive>();
@@ -38 +38 @@
          * in ds.nodes instead.
          */
-        private final Map<Node, Node> mergedNodes = new HashMap<Node, Node>();
+        private final Map<OsmPrimitive, OsmPrimitive> mergedPrims
+                = new HashMap<OsmPrimitive, OsmPrimitive>();
 
         public MergeVisitor(DataSet ds, DataSet mergeds) {
@@ -50 +51 @@
          */
         public void visit(Node other) {
-                if (mergeAfterId(mergedNodes, ds.nodes, other))
+                if (mergeAfterId(mergedPrims, ds.nodes, other))
                         return;
 
@@ -63 +64 @@
                         ds.nodes.add(other);
                 else {
-                        mergedNodes.put(other, my);
+                        mergedPrims.put(other, my);
                         mergeCommon(my, other);
                         if (my.modified && !other.modified)
@@ -75 +76 @@
         }
 
-        /**
-         * Simply calls cloneFrom() for now.
-         * Might be useful to keep around to facilitate merge with the relations
-         * branch.
-         */
         private <T extends OsmPrimitive> void cloneFromExceptIncomplete(T myOsm, T otherOsm) {
-                myOsm.cloneFrom(otherOsm);
+                if (!otherOsm.incomplete) {
+                        myOsm.cloneFrom(otherOsm);
+                }
     }
 
@@ -89 +87 @@
          */
         public void visit(Way other) {
-                if (mergeAfterId(null, ds.ways, other))
+                if (mergeAfterId(mergedPrims, ds.ways, other))
                         return;
 
@@ -102 +100 @@
                         ds.ways.add(other);
                 } else {
+                        mergedPrims.put(other, my);
                         mergeCommon(my, other);
                         if (my.modified && !other.modified)
@@ -151 +150 @@
                         }*/
                 } else {
+                        mergedPrims.put(other, my);
                         mergeCommon(my, other);
                         if (my.modified && !other.modified)
@@ -191 +191 @@
          */
         public void fixReferences() {
-                for (Way w : ds.ways)
-                        fixWay(w);
+                for (Way w : ds.ways) fixWay(w);
+                for (Relation r : ds.relations) fixRelation(r);
                 for (OsmPrimitive osm : conflicts.values())
                         if (osm instanceof Way)
                                 fixWay((Way)osm);
+                        else if (osm instanceof Relation)
+                                fixRelation((Relation) osm);
         }
 
@@ -202 +204 @@
             LinkedList<Node> newNodes = new LinkedList<Node>();
             for (Node n : w.nodes) {
-                Node otherN = mergedNodes.get(n);
+                Node otherN = (Node) mergedPrims.get(n);
                 newNodes.add(otherN == null ? n : otherN);
                 if (otherN != null)
@@ -210 +212 @@
                 w.nodes.clear();
                 w.nodes.addAll(newNodes);
+                }
     }
-    }
+
+        private void fixRelation(Relation r) {
+            boolean replacedSomething = false;
+            LinkedList<RelationMember> newMembers = new LinkedList<RelationMember>();
+            for (RelationMember m : r.members) {
+                OsmPrimitive otherP = mergedPrims.get(m.member);
+                        if (otherP == null) {
+                                newMembers.add(m);
+                        } else {
+                                RelationMember mnew = new RelationMember(m);
+                                mnew.member = otherP;
+                                newMembers.add(mnew);
+                        replacedSomething = true;
+                        }
+            }
+            if (replacedSomething) {
+                r.members.clear();
+                r.members.addAll(newMembers);
+                }
+        }
 
         /**
@@ -286 +308 @@
          * @return <code>true</code>, if no merge is needed or merge is performed already.
          */
-        private <P extends OsmPrimitive> boolean mergeAfterId(Map<P,P> merged, Collection<P> primitives, P other) {
+        private <P extends OsmPrimitive> boolean mergeAfterId(Map<OsmPrimitive,OsmPrimitive> merged, Collection<P> primitives, P other) {
                 for (P my : primitives) {
+                        Date myd = my.timestamp == null ? new Date(0) : my.getTimestamp();
+                        Date otherd = other.timestamp == null ? new Date(0) : other.getTimestamp();
                         if (my.realEqual(other, false)) {
                                 if (merged != null)
@@ -297 +321 @@
                                 if (merged != null)
                                         merged.put(other, my);
-                                if (my.getTimestamp().before(other.getTimestamp())) {
+                                if (myd.before(otherd)) {
                                         my.modified = other.modified;
                                         my.timestamp = other.timestamp;
@@ -304 +328 @@
                         }
                         if (my.id == other.id && my.id != 0) {
-                                if (my.modified && other.modified) {
+                                if (my.incomplete) {
+                                        return false;
+                                } else if (my.modified && other.modified) {
                                         conflicts.put(my, other);
-                                        if (merged != null)
-                                                merged.put(other, my);
                                 } else if (!my.modified && !other.modified) {
-                                        if (my.getTimestamp().before(other.getTimestamp())) {
+                                        if (myd.before(otherd)) {
                                                 cloneFromExceptIncomplete(my, other);
-                                                if (merged != null)
-                                                        merged.put(other, my);
                                         }
                                 } else if (other.modified) {
-                                        if (my.getTimestamp().after(other.getTimestamp())) {
+                                        if (myd.after(otherd)) {
                                                 conflicts.put(my, other);
-                                                if (merged != null)
-                                                        merged.put(other, my);
                                         } else {
                                                 cloneFromExceptIncomplete(my, other);
-                                                if (merged != null)
-                                                        merged.put(other, my);
                                         }
                                 } else if (my.modified) {
-                                        if (my.getTimestamp().before(other.getTimestamp())) {
+                                        if (myd.before(otherd)) {
                                                 conflicts.put(my, other);
-                                                if (merged != null)
-                                                        merged.put(other, my);
-                                        }
-                                }
+                                        }
+                                }
+                                if (merged != null)
+                                        merged.put(other, my);
                                 return true;
                         }