Changeset 4530 in josm for trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java

Timestamp:

2011-10-20T04:45:57+02:00 (13 years ago)

Author:

Don-vip

Message:

see #6653 and #6960 - Allow JOSM to download osmChange files again

File:

• trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java

@@ -33 +33 @@
     protected DataSet downloadedData;
     protected DownloadTask downloadTask;
+    
+    protected OsmDataLayer targetLayer;
 
     protected void rememberDownloadedData(DataSet ds) {
@@ -79 +81 @@
     }
 
-     protected  class DownloadTask extends PleaseWaitRunnable {
+    protected class DownloadTask extends PleaseWaitRunnable {
         protected OsmServerReader reader;
         protected DataSet dataSet;
@@ -89 +91 @@
             this.newLayer = newLayer;
         }
+        
+        protected DataSet parseDataSet() throws OsmTransferException {
+            return reader.parseOsm(progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false));
+        }
 
         @Override public void realRun() throws IOException, SAXException, OsmTransferException {
@@ -94 +100 @@
                 if (isCanceled())
                     return;
-                dataSet = reader.parseOsm(progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false));
+                dataSet = parseDataSet();
             } catch(Exception e) {
                 if (isCanceled()) {
@@ -161 +167 @@
                 // or it is not clear which layer to merge to
                 //
-                OsmDataLayer layer = createNewLayer();
+                targetLayer = createNewLayer();
                 final boolean isDisplayingMapView = Main.isDisplayingMapView();
 
-                Main.main.addLayer(layer);
+                Main.main.addLayer(targetLayer);
 
                 // If the mapView is not there yet, we cannot calculate the bounds (see constructor of MapView).
                 // Otherwise jump to the current download.
                 if (isDisplayingMapView) {
-                    BoundingXYVisitor v = new BoundingXYVisitor();
-                    if (currentBounds != null) {
-                        v.visit(currentBounds);
-                    } else {
-                        v.computeBoundingBox(dataSet.getNodes());
-                    }
-                    Main.map.mapView.recalculateCenterScale(v);
+                    computeBboxAndCenterScale();
                 }
             } else {
-                OsmDataLayer target;
-                target = getEditLayer();
-                if (target == null) {
-                    target = getFirstDataLayer();
-                }
-                target.mergeFrom(dataSet);
-                BoundingXYVisitor v = new BoundingXYVisitor();
-                if (currentBounds != null) {
-                    v.visit(currentBounds);
-                } else {
-                    v.computeBoundingBox(dataSet.getNodes());
-                }
-                Main.map.mapView.recalculateCenterScale(v);
-                target.onPostDownloadFromServer();
-            }
+                targetLayer = getEditLayer();
+                if (targetLayer == null) {
+                    targetLayer = getFirstDataLayer();
+                }
+                targetLayer.mergeFrom(dataSet);
+                computeBboxAndCenterScale();
+                targetLayer.onPostDownloadFromServer();
+            }
+        }
+        
+        protected void computeBboxAndCenterScale() {
+            BoundingXYVisitor v = new BoundingXYVisitor();
+            if (currentBounds != null) {
+                v.visit(currentBounds);
+            } else {
+                v.computeBoundingBox(dataSet.getNodes());
+            }
+            Main.map.mapView.recalculateCenterScale(v);
         }