Changeset 6777 in osm for applications/editors/josm/plugins/wmsplugin/src

Timestamp:

2008-02-04T18:49:57+01:00 (17 years ago)

Author:

gabriel

Message:

wmsplugin: Rework the code.

Location:

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

Files:

• DownloadWMSTask.java (modified) (4 diffs)
• GeorefImage.java (added)
• Grabber.java (added)
• Map_Rectifier_WMSmenuAction.java (modified) (2 diffs)
• OSGBGrabber.java (added)
• OSGBImage.java (deleted)
• OSGBLayer.java (deleted)
• WMSAdjustAction.java (modified) (2 diffs)
• WMSDownloadAction.java (modified) (1 diff)
• WMSGrabber.java (added)
• WMSImage.java (deleted)
• WMSLayer.java (modified) (8 diffs)

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.gui.MapView;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -16 +17 @@
         private WMSLayer wmsLayer;
         private Bounds bounds;
+        private double pixelPerDegree;
         
-        public DownloadWMSTask(WMSLayer wmsLayer, Bounds bounds) {
+        public DownloadWMSTask(WMSLayer wmsLayer, Bounds bounds, double pixelPerDegree) {
                 super(tr("Downloading " + wmsLayer.name));
 
                 this.wmsLayer = wmsLayer;
                 this.bounds = bounds;
+                this.pixelPerDegree = pixelPerDegree;
         }
         
         @Override public void realRun() throws IOException {
                 Main.pleaseWaitDlg.currentAction.setText(tr("Contacting WMS Server..."));
-                wmsLayer.grab(
-                        bounds.min.lat(), bounds.min.lon(),
-                        bounds.max.lat(), bounds.max.lon());
+                wmsLayer.grab(bounds, pixelPerDegree);
         }
 
@@ -35 +36 @@
 
         public static void download(String name, String wmsurl,
-                        double minlat, double minlon, double maxlat, double maxlon) {
+                        Bounds b, double pixelPerDegree) {
                 WMSLayer wmsLayer = null;
 
@@ -45 +46 @@
                 }
 
+                // FIXME: move this to WMSPlugin/WMSInfo/preferences.
                 if (wmsLayer == null) {
                         if (wmsurl.matches("(?i).*layers=npeoocmap.*") || wmsurl.matches("(?i).*layers=npe.*") ){
-                                //then we use the OSGBLayer
-                                wmsLayer= new OSGBLayer(name, wmsurl);
+                                wmsLayer = new WMSLayer(name, new OSGBGrabber(wmsurl));
                         } else {
-                                wmsLayer = new WMSLayer(name, wmsurl); 
+                                wmsLayer = new WMSLayer(name, new WMSGrabber(wmsurl));
                         }
                         Main.main.addLayer(wmsLayer);
                 } 
 
-                Main.worker.execute(new DownloadWMSTask(wmsLayer,
-                        new Bounds(new LatLon(minlat, minlon), new LatLon(maxlat, maxlon))));
+                Main.worker.execute(new DownloadWMSTask(wmsLayer, b, pixelPerDegree));
+        }
+
+        public static void download(String name, String wmsurl) {
+                MapView mv = Main.map.mapView;
+
+                Bounds b = new Bounds(
+                        mv.getLatLon(0, mv.getHeight()),
+                        mv.getLatLon(mv.getWidth(), 0));
+
+                download(name, wmsurl, b, mv.getWidth() / (b.max.lon() - b.min.lon()));
         }
 }

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

@@ -7 +7 @@
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.gui.MapView;
-
 
 public class Map_Rectifier_WMSmenuAction extends JosmAction {
@@ -18 +17 @@
         public Map_Rectifier_WMSmenuAction() {
                 super("Rectified Image ...", "OLmarker", "Download Rectified Image from Metacarta's Map Rectifer WMS", 0, 0, false);
-
-
         }
 
         public void actionPerformed(ActionEvent e) {
+                String newid = JOptionPane.showInputDialog(Main.parent, "Metacarta Map Rectifier image id");
 
-                //String newid;
-                String newURL = "";
-                String newid = "";
+                if (newid != null && !newid.equals("")) {
+                        String newURL = "http://labs.metacarta.com/rectifier/wms.cgi?id="+newid+
+                        "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png";
 
-                newid = JOptionPane.showInputDialog(Main.parent, "Metacarta Map Rectifier image id ");
-        //      System.out.println("newid= " +newid);
-                if (newid != null){
-
-
-                        if (newid.compareTo("") != 0) 
-                        {
-                                newURL = "http://labs.metacarta.com/rectifier/wms.cgi?id="+newid+
-                                "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png";
-
-
-                                //System.out.println(newURL);
-
-                                MapView mv = Main.map.mapView;
-
-                                DownloadWMSTask.download("rectifier id="+newid, newURL,
-                                                mv.getLatLon(0, mv.getHeight()).lat(),
-                                                mv.getLatLon(0, mv.getHeight()).lon(),
-                                                mv.getLatLon(mv.getWidth(), 0).lat(),
-                                                mv.getLatLon(mv.getWidth(), 0).lon());                  
-
-
-                        }
+                        DownloadWMSTask.download("rectifier id="+newid, newURL);
                 }
-                //else do nuffink
-
         }
-
-
-
 }
-

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

@@ -19 +19 @@
                 MouseListener, MouseMotionListener{
 
-        WMSImage selectedImage; 
+        GeorefImage selectedImage;
         boolean mouseDown;
         EastNorth prevEastNorth;
@@ -46 +46 @@
 
                  for(Layer layer:Main.map.mapView.getAllLayers()) {
-                        if (layer instanceof WMSLayer) {
+                        if (layer.visible && layer instanceof WMSLayer) {
                                 prevEastNorth=Main.map.mapView.getEastNorth(e.getX(),e.getY());
                                 selectedImage = ((WMSLayer)layer).findImage(prevEastNorth);

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

@@ -21 +21 @@
                 MapView mv = Main.map.mapView;
                 
-                DownloadWMSTask.download(info.name, info.url,
-                                mv.getLatLon(0, mv.getHeight()).lat(),
-                                mv.getLatLon(0, mv.getHeight()).lon(),
-                                mv.getLatLon(mv.getWidth(), 0).lat(),
-                                mv.getLatLon(mv.getWidth(), 0).lon());                  
+                DownloadWMSTask.download(info.name, info.url);
         }
 };

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

@@ -29 +29 @@
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
 import org.openstreetmap.josm.data.projection.Projection;
+import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
@@ -42 +43 @@
 public class WMSLayer extends Layer {
 
-        protected static Icon icon = new ImageIcon(Toolkit.getDefaultToolkit().createImage(WMSPlugin.class.getResource("/images/wms_small.png")));
-        protected final ArrayList<WMSImage> wmsImages;
-        protected final String url;
-        protected final int serializeFormatVersion = 1;
- 
+        protected static final Icon icon =
+                new ImageIcon(Toolkit.getDefaultToolkit().createImage(WMSPlugin.class.getResource("/images/wms_small.png")));
+
+        protected ArrayList<GeorefImage> images = new ArrayList<GeorefImage>();
+        protected Grabber grabber;
+        protected final int serializeFormatVersion = 2;
+
         public WMSLayer() {
-                super("Blank Layer");
-                wmsImages = new ArrayList<WMSImage>();
-                url = "";
-        }
-        public WMSLayer(String name, String url) {
+                this("Blank Layer", null);
+        }
+
+        public WMSLayer(String name, Grabber grabber) {
                 super(name);
-                // to calculate the world dimension, we assume that the projection does
-                // not have problems with translating longitude to a correct scale.
-                // Next to that, the projection must be linear dependend on the lat/lon
-                // unprojected scale.
-                if (Projection.MAX_LON != 180)
-                        throw new IllegalArgumentException(tr
-                                        ("Wrong longitude transformation for tile manager. "+
-                                                        "Can't operate on {0}",Main.proj));
-
-                this.url = url;
-                //wmsImage = new WMSImage(url);
-                wmsImages = new ArrayList<WMSImage>();
-        }
-
-        public void grab() throws IOException
-        {
-                MapView mv = Main.map.mapView;
-                WMSImage wmsImage = new WMSImage(url);
-                wmsImage.grab(mv);
-                wmsImages.add(wmsImage);
-        }
-
-        public void grab(double minlat,double minlon,double maxlat,double maxlon)
-        throws IOException
-        {
-                MapView mv = Main.map.mapView;
-                WMSImage wmsImage = new WMSImage(url);
-                wmsImage.grab(mv,minlat,minlon,maxlat,maxlon);
-                wmsImages.add(wmsImage);
+                this.grabber = grabber;
+        }
+
+        public void grab(Bounds b, double pixelPerDegree) throws IOException {
+                if (grabber == null) return;
+                images.add(grabber.grab(b, Main.main.proj, pixelPerDegree));
+                Main.map.mapView.repaint();
         }
 
@@ -90 +70 @@
 
         @Override public String getToolTipText() {
-                return tr("WMS layer ({0}), {1} tile(s) loaded", name, wmsImages.size());
+                return tr("WMS layer ({0}), {1} tile(s) loaded", name, images.size());
         }
 
@@ -101 +81 @@
 
         @Override public void paint(Graphics g, final MapView mv) {
-                for(WMSImage wmsImage : wmsImages) {
-                        wmsImage.paint(g,mv);
-                }
+                for (GeorefImage img : images) img.paint(g, mv);
         }
 
         @Override public void visitBoundingBox(BoundingXYVisitor v) {
-                // doesn't have a bounding box
+                for (GeorefImage img : images) {
+                        v.visit(img.min);
+                        v.visit(img.max);
+                }
         }
 
@@ -124 +105 @@
         }
 
-        public WMSImage findImage(EastNorth eastNorth)
-        {
-                for(WMSImage wmsImage : wmsImages) {
-                        if (wmsImage.contains(eastNorth))  {
-                                return wmsImage;
+        public GeorefImage findImage(EastNorth eastNorth) {
+                // Iterate in reverse, so we return the image which is painted last.
+                // (i.e. the topmost one)
+                for (int i = images.size() - 1; i >= 0; i--) {
+                        if (images.get(i).contains(eastNorth)) {
+                                return images.get(i);
                         }
                 }
@@ -134 +116 @@
         }
 
-        //to enable the removal of the images when the layer is removed.
-        public void destroy() {
-                wmsImages.clear();
-        }
-        
         public class SaveWmsAction extends AbstractAction {
                 public SaveWmsAction() {
@@ -149 +126 @@
                                 ObjectOutputStream oos = new ObjectOutputStream(fos);
                                 oos.writeInt(serializeFormatVersion);
-                                oos.writeInt(wmsImages.size());
-                                for (WMSImage w : wmsImages) {
-                                        oos.writeObject(w);
+                                oos.writeInt(images.size());
+                                for (GeorefImage img : images) {
+                                        oos.writeObject(img);
                                 }
                                 oos.close();
@@ -181 +158 @@
                                 int numImg = ois.readInt();
                                 for (int i=0; i< numImg; i++) {
-                                        WMSImage img = (WMSImage) ois.readObject();
-                                        wmsImages.add(img);
+                                        GeorefImage img = (GeorefImage) ois.readObject();
+                                        images.add(img);
                                 }
                                 ois.close();