Changeset 6780 in osm for applications/editors/josm

Timestamp:

2008-02-06T16:45:02+01:00 (17 years ago)

Author:

gabriel

Message:

wmsplugin: Move graber chooser out of WMSDownloadAction.

Location:

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

Files:

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

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

@@ -35 +35 @@
         @Override protected void finish() {}
 
-        public static void download(String name, String wmsurl,
-                        Bounds b, double pixelPerDegree) {
-                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;
-                        }
-                }
-
-                // FIXME: move this to WMSPlugin/WMSInfo/preferences.
-                if (wmsLayer == null) {
-                        if (wmsurl.matches("(?i).*layers=npeoocmap.*") || wmsurl.matches("(?i).*layers=npe.*") ){
-                                wmsLayer = new WMSLayer(name, new OSGBGrabber(wmsurl));
-                        } else {
-                                wmsLayer = new WMSLayer(name, new WMSGrabber(wmsurl));
-                        }
-                        Main.main.addLayer(wmsLayer);
-                } 
-
-                Main.worker.execute(new DownloadWMSTask(wmsLayer, b, pixelPerDegree));
-        }
-
-        public static void download(String name, String wmsurl) {
+        public static void download(WMSLayer wmsLayer) {
                 MapView mv = Main.map.mapView;
 
@@ -66 +42 @@
                         mv.getLatLon(mv.getWidth(), 0));
 
-                download(name, wmsurl, b, mv.getWidth() / (b.max.lon() - b.min.lon()));
+                Main.worker.execute(new DownloadWMSTask(wmsLayer, b,
+                        mv.getWidth() / (b.max.lon() - b.min.lon())));
         }
 }

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

@@ -6 +6 @@
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.gui.MapView;
+import org.openstreetmap.josm.gui.layer.Layer;
 
 public class WMSDownloadAction extends JosmAction {
@@ -19 +20 @@
                 System.out.println(info.url);
                 
-                MapView mv = Main.map.mapView;
-                
-                DownloadWMSTask.download(info.name, info.url);
+                DownloadWMSTask.download(getLayer(info));
+        }
+
+        public static WMSLayer getLayer(WMSInfo info) {
+                // 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(info.name)) {
+                                return (WMSLayer) l;
+                        }
+                }
+
+                // FIXME: move this to WMSPlugin/WMSInfo/preferences.
+                WMSLayer wmsLayer = new WMSLayer(info.name, info.grabber);
+                Main.main.addLayer(wmsLayer);
+                return wmsLayer;
         }
 };

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

@@ -12 +12 @@
         String name;
         String url;
+        Grabber grabber;
         int prefid;
         
+        public WMSInfo(String name, String url, Grabber grabber, int prefid) {
+                this.name=name; this.url=url; this.prefid=prefid;
+                this.grabber = grabber;
+        }
+
         public WMSInfo(String name, String url, int prefid) {
-                this.name=name; this.url=url; this.prefid=prefid;
+                this(name, url, WMSPlugin.getGrabber(url), prefid);
         }
         

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

@@ -120 +120 @@
                 setEnabledAll(false);
         }
+
+        public static Grabber getGrabber(String wmsurl) {
+                if (wmsurl.matches("(?i).*layers=npeoocmap.*") || wmsurl.matches("(?i).*layers=npe.*") ){
+                        return new OSGBGrabber(wmsurl);
+                } else {
+                        return new WMSGrabber(wmsurl);
+                }
+        }
         
         private static void setEnabledAll(boolean isEnabled) {