Changeset 6776 in osm for applications/editors/josm/plugins

Timestamp:

2008-02-04T15:50:57+01:00 (17 years ago)

Author:

gabriel

Message:

wmsplugin: Fix downloading after canceling.

Location:

applications/editors/josm/plugins/wmsplugin/src/wmsplugin

Files:

• DownloadWMSTask.java (modified) (1 diff)
• Map_Rectifier_WMSmenuAction.java (modified) (2 diffs)
• NPE_WMSmenuAction.java (deleted)
• WMSDownloadAction.java (modified) (1 diff)
• WMSInfo.java (modified) (1 diff)
• WMSPlugin.java (modified) (1 diff)

applications/editors/josm/plugins/wmsplugin/src/wmsplugin/DownloadWMSTask.java

@@ -8 +8 @@
 import org.openstreetmap.josm.actions.DownloadAction;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
-
- 
+import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.gui.layer.Layer;
 
 public class DownloadWMSTask extends PleaseWaitRunnable {
 
         private WMSLayer wmsLayer;
-        private double minlat, minlon, maxlat, maxlon;
+        private Bounds bounds;
         
-        /* whether our layer was already added. */
-        private boolean layerAdded = false;
-        
-        
-        public DownloadWMSTask(String name, String wmsurl) {
-                super(tr("Downloading " + name));
+        public DownloadWMSTask(WMSLayer wmsLayer, Bounds bounds) {
+                super(tr("Downloading " + wmsLayer.name));
 
-                // simply check if we already have a layer created. if not, create; if yes, reuse.
-                if (wmsLayer == null) {
-                        if (wmsurl.matches("(?i).*layers=npeoocmap.*") || wmsurl.matches("(?i).*layers=npe.*") ){
-                                //then we use the OSGBLayer
-                                this.wmsLayer= new OSGBLayer(name, wmsurl);
-                        } else {
-                                this.wmsLayer = new WMSLayer(name, wmsurl); 
-                        } 
-                } 
-        
+                this.wmsLayer = wmsLayer;
+                this.bounds = bounds;
         }
         
         @Override public void realRun() throws IOException {
                 Main.pleaseWaitDlg.currentAction.setText(tr("Contacting WMS Server..."));
-                wmsLayer.grab(minlat,minlon,maxlat,maxlon);
+                wmsLayer.grab(
+                        bounds.min.lat(), bounds.min.lon(),
+                        bounds.max.lat(), bounds.max.lon());
         }
 
-        @Override protected void finish() {
+        @Override protected void cancel() {}
+        @Override protected void finish() {}
 
-                // BUG if layer is deleted, wmsLayer is not null and layerAdded remains true!
-                // FIXED, see below
-                
-                layerAdded = false;
-                for (Iterator it = Main.map.mapView.getAllLayers().iterator(); it.hasNext(); ) {
-                        Object  element = it.next();
-                        if (element.equals(wmsLayer)) layerAdded = true;
+        public static void download(String name, String wmsurl,
+                        double minlat, double minlon, double maxlat, double maxlon) {
+                WMSLayer wmsLayer = null;
+
+                // simply check if we already have a layer created. if not, create; if yes, reuse.
+                for (Layer l : Main.main.map.mapView.getAllLayers()) {
+                        if (l instanceof WMSLayer && l.name.equals(name)) {
+                                wmsLayer = (WMSLayer) l;
+                        }
                 }
-                                
-                if ((wmsLayer != null) && (!layerAdded))
-                {
+
+                if (wmsLayer == null) {
+                        if (wmsurl.matches("(?i).*layers=npeoocmap.*") || wmsurl.matches("(?i).*layers=npe.*") ){
+                                //then we use the OSGBLayer
+                                wmsLayer= new OSGBLayer(name, wmsurl);
+                        } else {
+                                wmsLayer = new WMSLayer(name, wmsurl); 
+                        }
                         Main.main.addLayer(wmsLayer);
-                        layerAdded = true;
-                }
-        }
+                } 
 
-        @Override protected void cancel() {
-        }
-
-        public void download(DownloadAction action, double minlat, double minlon, double maxlat, double maxlon) {
-                this.minlat=minlat;
-                this.minlon=minlon;
-                this.maxlat=maxlat;
-                this.maxlon=maxlon;
-                Main.worker.execute(this);
+                Main.worker.execute(new DownloadWMSTask(wmsLayer,
+                        new Bounds(new LatLon(minlat, minlon), new LatLon(maxlat, maxlon))));
         }
 }

applications/editors/josm/plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java

@@ -21 +21 @@
 
         }
-        DownloadWMSTask downloadTask;
 
         public void actionPerformed(ActionEvent e) {
@@ -42 +41 @@
                                 //System.out.println(newURL);
 
-                        //      if (downloadTask == null){
-                                        //System.out.println("new download task!");
-                                        downloadTask = new DownloadWMSTask("rectifier id="+newid, newURL);
-                        //      }
                                 MapView mv = Main.map.mapView;
 
-                                downloadTask.download(null,
+                                DownloadWMSTask.download("rectifier id="+newid, newURL,
                                                 mv.getLatLon(0, mv.getHeight()).lat(),
                                                 mv.getLatLon(0, mv.getHeight()).lon(),

applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSDownloadAction.java

@@ -17 +17 @@
         
         public void actionPerformed(ActionEvent e) {
-                
-                // store the download task with the "info" object. if we create a new
-                // download task here every time, then different layers are displayed even
-                // for images from the same server, and we don't want that.
                 System.out.println(info.url);
-                if (info.downloadTask == null)
-                        info.downloadTask = new DownloadWMSTask(info.name, info.url);
                 
                 MapView mv = Main.map.mapView;
                 
-                info.downloadTask.download(null,
+                DownloadWMSTask.download(info.name, info.url,
                                 mv.getLatLon(0, mv.getHeight()).lat(),
                                 mv.getLatLon(0, mv.getHeight()).lon(),

applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSInfo.java

@@ -13 +13 @@
         String url;
         int prefid;
-        DownloadWMSTask downloadTask;
         
         public WMSInfo(String name, String url, int prefid) {
                 this.name=name; this.url=url; this.prefid=prefid;
-                downloadTask = null;
         }
         

applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSPlugin.java

@@ -30 +30 @@
         static String VERSION = "2.4";
         
-        DownloadWMSTask task;
         WMSLayer wmsLayer;
         static JMenu wmsJMenu;