Changeset 2563 in josm for trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java

Timestamp:

03.12.2009 19:02:25 (2 years ago)

Author:

Gubaer

Message:

fixed #3400: relation editor: improvement to highlight an element
fixed #3873: Feature request: download selected elements in relation editor
New: Dbl-Click in member table to set the map selection to this member
New: Ctrl-Dbl-Clik in member table to add the member to the the map selection
New: Download selected incomplete members only

File:

• trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java (modified) (15 diffs)

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

@@ -38 +38 @@
      * to relation members) after the first phase of merging
      */
-    private Set<Long> childrenToMerge;
+    private Set<PrimitiveId> objectsWithChildrenToMerge;
     private Set<OsmPrimitive> deletedObjectsToUnlink;
 
@@ -57 +57 @@
         conflicts = new ConflictCollection();
         mergedMap = new HashMap<Long, Long>();
-        childrenToMerge = new HashSet<Long>();
+        objectsWithChildrenToMerge = new HashSet<PrimitiveId>();
         deletedObjectsToUnlink = new HashSet<OsmPrimitive>();
     }
@@ -75 +75 @@
      * @param source  the other primitive
      */
-    protected <P extends OsmPrimitive> void mergePrimitive(P source) {
+    protected void mergePrimitive(OsmPrimitive source) {
         if (!source.isNew() ) {
             // try to merge onto a matching primitive with the same
@@ -112 +112 @@
                         target.setTimestamp(source.getTimestamp());
                         target.setModified(source.isModified());
-                        childrenToMerge.add(source.getUniqueId());
+                        objectsWithChildrenToMerge.add(source.getPrimitiveId());
                     }
                     return;
@@ -131 +131 @@
         targetDataSet.addPrimitive(target);
         mergedMap.put(source.getUniqueId(), target.getUniqueId());
-        childrenToMerge.add(source.getUniqueId());
+        objectsWithChildrenToMerge.add(source.getPrimitiveId());
     }
 
@@ -154 +154 @@
 
     /**
+     * A way in the target dataset might be incomplete because at least of of its nodes is incomplete.
+     * The nodes might have become complete because a complete node was merged onto into in the
+     * merge operation.
+     * 
+     * This method loops over all parent ways of such nodes and turns them into complete ways
+     * if necessary.
+     * 
+     * @param other
+     */
+    protected void fixIncompleteParentWays(Node other) {
+        Node myNode = (Node)getMergeTarget(other);
+        if (myNode == null)
+            throw new RuntimeException(tr("Missing merge target for node with id {0}", other.getUniqueId()));
+        if (myNode.incomplete || myNode.isDeleted() || !myNode.isVisible()) return;
+        wayloop: for (Way w: OsmPrimitive.getFilteredList(myNode.getReferrers(), Way.class)) {
+            if (w.isDeleted() || ! w.isVisible() || ! w.incomplete) {
+                continue;
+            }
+            for (Node n: w.getNodes()) {
+                if (n.incomplete) {
+                    continue wayloop;
+                }
+            }
+            // all nodes are complete - set the way complete too
+            w.incomplete = false;
+        }
+    }
+
+    /**
      * Postprocess the dataset and fix all merged references to point to the actual
      * data.
@@ -159 +188 @@
     public void fixReferences() {
         for (Way w : sourceDataSet.getWays()) {
-            if (!conflicts.hasConflictForTheir(w) && childrenToMerge.contains(w.getUniqueId())) {
+            if (!conflicts.hasConflictForTheir(w) && objectsWithChildrenToMerge.contains(w.getPrimitiveId())) {
                 mergeNodeList(w);
                 fixIncomplete(w);
@@ -165 +194 @@
         }
         for (Relation r : sourceDataSet.getRelations()) {
-            if (!conflicts.hasConflictForTheir(r) && childrenToMerge.contains(r.getUniqueId())) {
+            if (!conflicts.hasConflictForTheir(r) && objectsWithChildrenToMerge.contains(r.getPrimitiveId())) {
                 mergeRelationMembers(r);
             }
@@ -175 +204 @@
             targetDataSet.unlinkReferencesToPrimitive(target);
         }
+        // objectsWithChildrenToMerge also includes complete nodes which have
+        // been merged into their incomplete equivalents.
+        //
+        for (PrimitiveId id: objectsWithChildrenToMerge) {
+            if (!id.getType().equals(OsmPrimitiveType.NODE)) {
+                continue;
+            }
+            Node n = (Node)sourceDataSet.getPrimitiveById(id);
+            if (!conflicts.hasConflictForTheir(n)) {
+                fixIncompleteParentWays(n);
+            }
+        }
+
     }
 
@@ -269 +311 @@
             //
             target.mergeFrom(source);
-            childrenToMerge.add(source.getUniqueId());
+            objectsWithChildrenToMerge.add(source.getPrimitiveId());
         } else if (!target.incomplete && source.incomplete) {
             // target is complete and source is incomplete
@@ -282 +324 @@
             // otherwise too many conflicts when refreshing from the server
         } else if (target.isDeleted() != source.isDeleted()) {
-            // differences in deleted state have to be resolved manually
+            // differences in deleted state have to be resolved manually. This can
+            // happen if one layer is merged onto another layer
             //
             conflicts.add(target,source);
@@ -288 +331 @@
             // target not modified. We can assume that source is the most recent version.
             // clone it into target. But check first, whether source is deleted. if so,
-            // make sure that target is not referenced anymore in myDataSet.
+            // make sure that target is not referenced any more in myDataSet.
             //
             if (source.isDeleted()) {
@@ -294 +337 @@
             }
             target.mergeFrom(source);
-            childrenToMerge.add(source.getUniqueId());
+            objectsWithChildrenToMerge.add(source.getPrimitiveId());
         } else if (! target.isModified() && !source.isModified() && target.getVersion() == source.getVersion()) {
             // both not modified. Keep mine
@@ -302 +345 @@
             //
             target.mergeFrom(source);
-            childrenToMerge.add(source.getUniqueId());
+            objectsWithChildrenToMerge.add(source.getPrimitiveId());
         } else if (target.isModified() && ! source.isModified() && target.getVersion() == source.getVersion()) {
             // target is same as source but target is modified
@@ -318 +361 @@
             target.mergeFrom(source);
             target.setModified(true);
-            childrenToMerge.add(source.getUniqueId());
+            objectsWithChildrenToMerge.add(source.getPrimitiveId());
         }
         return true;