Changeset 4684 in josm

Timestamp:

2011-12-21T12:58:59+01:00 (12 years ago)

Author:

Don-vip

Message:

see #7159 - Layer merging performance

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/MergeLayerAction.java (modified) (2 diffs)
• data/osm/AbstractPrimitive.java (modified) (1 diff)
• data/osm/DataSetMerger.java (modified) (4 diffs)
• data/osm/OsmPrimitive.java (modified) (1 diff)
• gui/layer/OsmDataLayer.java (modified) (3 diffs)
• gui/progress/PleaseWaitProgressMonitor.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/actions/MergeLayerAction.java

@@ -39 +39 @@
     }
 
-    public void merge(Layer sourceLayer) {
+    public void merge(final Layer sourceLayer) {
         if (sourceLayer == null)
             return;
@@ -47 +47 @@
             return;
         }
-        Layer targetLayer = askTargetLayer(targetLayers);
+        final Layer targetLayer = askTargetLayer(targetLayers);
         if (targetLayer == null)
             return;
-        targetLayer.mergeFrom(sourceLayer);
-        Main.map.mapView.removeLayer(sourceLayer);
-        Main.map.mapView.setActiveLayer(targetLayer);
+        Main.worker.submit(new Runnable() {
+            @Override
+            public void run() {
+                targetLayer.mergeFrom(sourceLayer);
+                Main.map.mapView.removeLayer(sourceLayer);
+                Main.map.mapView.setActiveLayer(targetLayer);
+            }
+        });
     }
 

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

@@ -648 +648 @@
      */
     public boolean hasSameTags(OsmPrimitive other) {
-        return getKeys().equals(other.getKeys());
+        // We cannot directly use Arrays.equals(keys, other.keys) as keys is not ordered by key
+        // but we can at least check if both arrays are null or of the same size before creating 
+        // and comparing the key maps (costly operation, see #7159)
+        return (keys == null && other.keys == null) 
+            || (keys != null && other.keys != null && keys.length == other.keys.length && (keys.length == 0 || getKeys().equals(other.getKeys())));
     }
 

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

@@ -16 +16 @@
 import org.openstreetmap.josm.data.conflict.Conflict;
 import org.openstreetmap.josm.data.conflict.ConflictCollection;
+import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 
@@ -77 +78 @@
      * @param source  the other primitive
      */
-    protected void mergePrimitive(OsmPrimitive source) {
+    protected void mergePrimitive(OsmPrimitive source, Collection<? extends OsmPrimitive> candidates) {
         if (!source.isNew() ) {
             // try to merge onto a matching primitive with the same
@@ -94 +95 @@
             // yet but which is equal in its semantic attributes
             //
-            Collection<? extends OsmPrimitive> candidates = null;
-            switch (source.getType()) {
-            case NODE: candidates = targetDataSet.getNodes(); break;
-            case WAY: candidates  = targetDataSet.getWays(); break;
-            case RELATION: candidates = targetDataSet.getRelations(); break;
-            default: throw new AssertionError();
-            }
             for (OsmPrimitive target : candidates) {
                 if (!target.isNew() || target.isDeleted()) {
@@ -382 +376 @@
      */
     public void merge() {
+        merge(null);
+    }
+
+    /**
+     * Runs the merge operation. Successfully merged {@see OsmPrimitive}s are in
+     * {@see #getMyDataSet()}.
+     *
+     * See {@see #getConflicts()} for a map of conflicts after the merge operation.
+     */
+    public void merge(ProgressMonitor progressMonitor) {
         if (sourceDataSet == null)
             return;
+        if (progressMonitor != null) {
+            progressMonitor.beginTask(tr("Merging data..."), sourceDataSet.allPrimitives().size());
+        }
         targetDataSet.beginUpdate();
         try {
+                ArrayList<? extends OsmPrimitive> candidates = new ArrayList<Node>(targetDataSet.getNodes());
             for (Node node: sourceDataSet.getNodes()) {
-                mergePrimitive(node);
-            }
+                mergePrimitive(node, candidates);
+                if (progressMonitor != null) {
+                    progressMonitor.worked(1);
+                }
+            }
+            candidates.clear();
+            candidates = new ArrayList<Way>(targetDataSet.getWays());
             for (Way way: sourceDataSet.getWays()) {
-                mergePrimitive(way);
-            }
+                mergePrimitive(way, candidates);
+                if (progressMonitor != null) {
+                    progressMonitor.worked(1);
+                }
+            }
+            candidates.clear();
+            candidates = new ArrayList<Relation>(targetDataSet.getRelations());
             for (Relation relation: sourceDataSet.getRelations()) {
-                mergePrimitive(relation);
-            }
+                mergePrimitive(relation, candidates);
+                if (progressMonitor != null) {
+                    progressMonitor.worked(1);
+                }
+            }
+            candidates.clear();
             fixReferences();
         } finally {
             targetDataSet.endUpdate();
         }
+        if (progressMonitor != null) {
+            progressMonitor.finishTask();
+        }
     }
 

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

@@ -966 +966 @@
         if (!isNew() &&  id != other.id)
             return false;
-        if (isIncomplete() && ! other.isIncomplete() || !isIncomplete()  && other.isIncomplete())
+//        if (isIncomplete() && ! other.isIncomplete() || !isIncomplete()  && other.isIncomplete())
+        if (isIncomplete() ^ other.isIncomplete()) // exclusive or operator for performance (see #7159)
             return false;
         // can't do an equals check on the internal keys array because it is not ordered

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -71 +71 @@
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
 import org.openstreetmap.josm.gui.dialogs.LayerListPopup;
+import org.openstreetmap.josm.gui.progress.PleaseWaitProgressMonitor;
+import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.tools.DateUtils;
 import org.openstreetmap.josm.tools.FilteredCollection;
@@ -282 +284 @@
 
     @Override public void mergeFrom(final Layer from) {
-        mergeFrom(((OsmDataLayer)from).data);
+        final PleaseWaitProgressMonitor monitor = new PleaseWaitProgressMonitor(tr("Merging layers"));
+        monitor.setCancelable(false);
+        mergeFrom(((OsmDataLayer)from).data, monitor);
+        monitor.close();
     }
 
@@ -292 +297 @@
      */
     public void mergeFrom(final DataSet from) {
+        mergeFrom(from, null);
+    }
+    
+    /**
+     * merges the primitives in dataset <code>from</code> into the dataset of
+     * this layer
+     *
+     * @param from  the source data set
+     */
+    public void mergeFrom(final DataSet from, ProgressMonitor progressMonitor) {
         final DataSetMerger visitor = new DataSetMerger(data,from);
         try {
-            visitor.merge();
+            visitor.merge(progressMonitor);
         } catch (DataIntegrityProblemException e) {
             JOptionPane.showMessageDialog(

trunk/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java

@@ -26 +26 @@
     private PleaseWaitDialog dialog;
     private String windowTitle;
+    
+    private boolean cancelable;
 
     public PleaseWaitProgressMonitor() {
@@ -39 +41 @@
         super(new CancelHandler());
         this.dialogParent = JOptionPane.getFrameForComponent(dialogParent);
+        this.cancelable = true;
     }
 
@@ -58 +61 @@
     };
 
+    public final boolean isCancelable() {
+        return cancelable;
+    }
+
+    public final void setCancelable(boolean cancelable) {
+        this.cancelable = cancelable;
+    }
+
     private void doInEDT(Runnable runnable) {
         EventQueue.invokeLater(runnable);
@@ -76 +87 @@
                     dialog.setTitle(windowTitle);
                 }
-                dialog.setCancelEnabled(true);
+                dialog.setCancelEnabled(cancelable);
                 dialog.setCancelCallback(cancelListener);
                 dialog.setCustomText("");