Changeset 18300 in osm for applications/editors/josm/plugins/waydownloader/src

Timestamp:

2009-10-27T11:11:18+01:00 (15 years ago)

Author:

guggis

Message:

Updated to JOSM r2327

File:

• applications/editors/josm/plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java (modified) (3 diffs)

applications/editors/josm/plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java

@@ -8 +8 @@
 import java.util.Collection;
 import java.util.LinkedList;
+import java.util.concurrent.Future;
 
 import javax.swing.JOptionPane;
@@ -100 +101 @@
                         double lonbuffer=0.0005;
                         DownloadOsmTask downloadTask = new DownloadOsmTask();
-                        downloadTask.download( null,
-                                               selectedNode.getCoor().lat()-latbuffer,
-                                               selectedNode.getCoor().lon()-lonbuffer,
-                                               selectedNode.getCoor().lat()+latbuffer,
-                                               selectedNode.getCoor().lon()+lonbuffer,
-                                               new PleaseWaitProgressMonitor());
-
+                        final PleaseWaitProgressMonitor monitor = new PleaseWaitProgressMonitor();
+                        final Future<?> future = downloadTask.download( 
+                                        false /* no new layer */,
+                                        new Bounds(
+                                                        selectedNode.getCoor().lat()- latbuffer, 
+                                                        selectedNode.getCoor().lon()- lonbuffer, 
+                                                        selectedNode.getCoor().lat()+ latbuffer, 
+                                                        selectedNode.getCoor().lon()+ lonbuffer
+                                        ), 
+                                        monitor
+                        );
+                        // schedule closing of the progress monitor after the download
+                        // job has finished
+                        Main.worker.submit(
+                                new Runnable() {
+                                    public void run() {
+                                        try {
+                                            future.get();
+                                        } catch(Exception e) {
+                                            e.printStackTrace();
+                                            return;
+                                        }
+                                        monitor.close();
+                                    }
+                                }
+                        );
                         //The download is scheduled to be executed.
                         //Now schedule the run() method (below) to be executed once that's completed.
@@ -238 +258 @@
             Bounds bounds = datasource.bounds;
 
-            if (node.getCoor().lat()>bounds.min.lat() &&
-                node.getCoor().lat()<bounds.max.lat() &&
-                node.getCoor().lon()>bounds.min.lon() &&
-                node.getCoor().lon()<bounds.max.lon()) {
+            if (node.getCoor().lat()>bounds.getMin().lat() &&
+                node.getCoor().lat()<bounds.getMax().lat() &&
+                node.getCoor().lon()>bounds.getMin().lon() &&
+                node.getCoor().lon()<bounds.getMax().lon()) {
                 return true;
             }