Changeset 13426 in osm for applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CacheControl.java

Timestamp:

2009-01-28T21:44:10+01:00 (16 years ago)

Author:

pieren

Message:

add municipality bbox in grab and cache

File:

• applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CacheControl.java (modified) (4 diffs)

applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CacheControl.java

@@ -18 +18 @@
 import javax.swing.JOptionPane;
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.coor.EastNorth;
 
 public class CacheControl implements Runnable {
@@ -112 +111 @@
             FileInputStream fis = new FileInputStream(file);
             ObjectInputStream ois = new ObjectInputStream(fis);
-            int sfv = ois.readInt();
-            if (sfv != wmsLayer.serializeFormatVersion) {
-                JOptionPane.showMessageDialog(Main.parent, tr("Unsupported WMS file version; found {0}, expected {1}",
-                        sfv, wmsLayer.serializeFormatVersion), tr("Cache Format Error"), JOptionPane.ERROR_MESSAGE);
+            if (wmsLayer.read(ois, currentLambertZone) == false)
                 return false;
-            }
-            wmsLayer.setLocation((String) ois.readObject());
-            wmsLayer.setCodeCommune((String) ois.readObject());
-            wmsLayer.lambertZone = ois.readInt();
-            wmsLayer.setRaster(ois.readBoolean());
-            wmsLayer.setRasterMin((EastNorth) ois.readObject());
-            wmsLayer.setRasterCenter((EastNorth) ois.readObject());
-            wmsLayer.setRasterRatio(ois.readDouble());
-            if (wmsLayer.lambertZone != currentLambertZone) {
-                JOptionPane.showMessageDialog(Main.parent, tr("Lambert zone {0} in cache "+
-                        " incompatible with current Lambert zone {1}",
-                        wmsLayer.lambertZone+1, currentLambertZone), tr("Cache Lambert Zone Error"), JOptionPane.ERROR_MESSAGE);
-                return false;
-            }
-            boolean EOF = false;
-            try {
-                while (!EOF) {
-                    GeorefImage newImage = (GeorefImage) ois.readObject();
-                    for (GeorefImage img : wmsLayer.images) {
-                        if (CadastrePlugin.backgroundTransparent) {
-                            if (img.overlap(newImage))
-                                // mask overlapping zone in already grabbed image
-                                img.withdraw(newImage);
-                            else
-                                // mask overlapping zone in new image only when
-                                // new image covers completely the existing image
-                                newImage.withdraw(img);
-                        }
-                    }
-                    wmsLayer.images.add(newImage);
-                }
-            } catch (EOFException e) {}
             ois.close();
             fis.close();
@@ -155 +119 @@
             JOptionPane
                     .showMessageDialog(Main.parent, tr("Error loading file"), tr("Error"), JOptionPane.ERROR_MESSAGE);
+            return false;
         }
         return true;
@@ -205 +170 @@
                         ObjectOutputStream oos = new ObjectOutputStream(
                                 new BufferedOutputStream(new FileOutputStream(file)));
-                        oos.writeInt(wmsLayer.serializeFormatVersion);
-                        oos.writeObject(wmsLayer.getLocation());
-                        oos.writeObject(wmsLayer.getCodeCommune());
-                        oos.writeInt(wmsLayer.lambertZone);
-                        oos.writeBoolean(wmsLayer.isRaster());
-                        oos.writeObject(wmsLayer.getRasterMin());
-                        oos.writeObject(wmsLayer.getRasterCenter());
-                        oos.writeDouble(wmsLayer.getRasterRatio());
-                        for (GeorefImage img : images) {
-                            oos.writeObject(img);
-                        }
+                        wmsLayer.write(oos, images);
                         oos.close();
                     }