Changeset 4858 in josm

Timestamp:

Jan 23, 2012 3:17:45 PM (16 months ago)

Author:

bastiK

Message:

fixed remotecontrol new_layer: do not subtract download area of current layer

File:

• trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java

@@ -78 +78 @@
                 else
                 {
-
-                    // find out whether some data has already been downloaded
-                    Area present = null;
                     Area toDownload = null;
-                    DataSet ds = Main.main.getCurrentDataSet();
-                    if (ds != null) {
-                        present = ds.getDataSourceArea();
-                    }
-                    if (present != null && !present.isEmpty()) {
-                        toDownload = new Area(new Rectangle2D.Double(minlon,minlat,maxlon-minlon,maxlat-minlat));
-                        toDownload.subtract(present);
-                        if (!toDownload.isEmpty())
-                        {
-                            // the result might not be a rectangle (L shaped etc)
-                            Rectangle2D downloadBounds = toDownload.getBounds2D();
-                            minlat = downloadBounds.getMinY();
-                            minlon = downloadBounds.getMinX();
-                            maxlat = downloadBounds.getMaxY();
-                            maxlon = downloadBounds.getMaxX();
-                        }
-                    }
-                    if((toDownload != null) && toDownload.isEmpty())
+                    if (!newLayer) {
+                        // find out whether some data has already been downloaded
+                        Area present = null;
+                        DataSet ds = Main.main.getCurrentDataSet();
+                        if (ds != null) {
+                            present = ds.getDataSourceArea();
+                        }
+                        if (present != null && !present.isEmpty()) {
+                            toDownload = new Area(new Rectangle2D.Double(minlon,minlat,maxlon-minlon,maxlat-minlat));
+                            toDownload.subtract(present);
+                            if (!toDownload.isEmpty())
+                            {
+                                // the result might not be a rectangle (L shaped etc)
+                                Rectangle2D downloadBounds = toDownload.getBounds2D();
+                                minlat = downloadBounds.getMinY();
+                                minlon = downloadBounds.getMinX();
+                                maxlat = downloadBounds.getMaxY();
+                                maxlon = downloadBounds.getMaxX();
+                            }
+                        }
+                    }
+                    if (toDownload != null && toDownload.isEmpty())
                     {
                         System.out.println("RemoteControl: no download necessary");