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

Timestamp:

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

Author:

gabriel

Message:

wmsplugin: Rework the code.

File:

• applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSLayer.java (modified) (8 diffs)

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();