Changeset 5648 in josm for trunk/src

Timestamp:

2012-12-30T17:41:20+01:00 (11 years ago)

Author:

Don-vip

Message:

fix #8307 - Do not suggest potential imagery sources on "update data"

Location:

trunk/src/org/openstreetmap/josm/actions/downloadtasks

Files:

• DownloadOsmTask.java (modified) (3 diffs)
• DownloadOsmTaskList.java (modified) (2 diffs)

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

@@ -246 +246 @@
             rememberDownloadedData(dataSet);
             int numDataLayers = getNumDataLayers();
+            boolean isUpdateData = false;
             if (newLayer || numDataLayers == 0 || (numDataLayers > 1 && getEditLayer() == null)) {
                 // the user explicitly wants a new layer, we don't have any layer at all
@@ -265 +266 @@
                     targetLayer = getFirstDataLayer();
                 }
+                isUpdateData = targetLayer.data.getDataSourceArea().contains(currentBounds.asRect());
                 targetLayer.mergeFrom(dataSet);
                 computeBboxAndCenterScale();
@@ -270 +272 @@
             }
 
-            suggestImageryLayers();
+            // Suggest potential imagery data, except if the data is downloaded after a "data update" command (see #8307)
+            if (!isUpdateData) {
+                suggestImageryLayers();
+            }
         }
         

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

@@ -50 +50 @@
      * Downloads a list of areas from the OSM Server
      * @param newLayer Set to true if all areas should be put into a single new layer
-     * @param The List of Rectangle2D to download
+     * @param rects The List of Rectangle2D to download
+     * @param progressMonitor The progress monitor 
+     * @return The Future representing the asynchronous download task
      */
     public Future<?> download(boolean newLayer, List<Rectangle2D> rects, ProgressMonitor progressMonitor) {
@@ -84 +86 @@
      * Downloads a list of areas from the OSM Server
      * @param newLayer Set to true if all areas should be put into a single new layer
-     * @param The Collection of Areas to download
+     * @param areas The Collection of Areas to download
+     * @param progressMonitor The progress monitor
+     * @return The Future representing the asynchronous download task
      */
     public Future<?> download(boolean newLayer, Collection<Area> areas, ProgressMonitor progressMonitor) {