Changeset 18838 in osm for applications/editors/josm/plugins/cadastre-fr

Timestamp:

2009-11-28T17:05:44+01:00 (15 years ago)

Author:

pieren

Message:

Fix minor issues if Grab is called without layer (possible since projection rework)

Location:

applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr

Files:

• CacheControl.java (modified) (2 diffs)
• CadastreInterface.java (modified) (1 diff)
• CadastrePlugin.java (modified) (1 diff)
• DownloadWMSVectorImage.java (modified) (3 diffs)
• MenuActionGrab.java (modified) (3 diffs)
• MenuActionNewLocation.java (modified) (1 diff)
• WMSLayer.java (modified) (2 diffs)

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

@@ -106 +106 @@
                 // till here
 
-                if (reply == JOptionPane.OK_OPTION) {
-                    return loadCache(file, wmsLayer.getLambertZone());
-                } else
-                    file.delete();
+                if (reply == JOptionPane.OK_OPTION && loadCache(file, wmsLayer.getLambertZone())) {
+                    return true;
+                } else {
+                    delete(file);
+                }
             }
         } catch (Exception e) {
@@ -122 +123 @@
             if (Main.proj instanceof LambertCC9Zones)
                 extension = cLambertCC9Z + extension;
-            File file = new File(CadastrePlugin.cacheDir + wmsLayer.getName() + "." + extension);
-            if (file.exists())
-                file.delete();
+            delete(new File(CadastrePlugin.cacheDir + wmsLayer.getName() + "." + extension));
         } catch (Exception e) {
             e.printStackTrace(System.out);
         }
     }
+    
+    private void delete(File file) {
+        System.out.println("Delete file "+file);
+        if (file.exists())
+            file.delete();
+        while (file.exists()) // wait until file is really gone (otherwise appends to existing one)
+            CadastrePlugin.safeSleep(500);
+    }
 
     public boolean loadCache(File file, int currentLambertZone) {
+        boolean successfulRead = false;
         try {
             FileInputStream fis = new FileInputStream(file);
             ObjectInputStream ois = new ObjectInputStream(fis);
-            if (wmsLayer.read(ois, currentLambertZone) == false)
-                return false;
+            successfulRead = wmsLayer.read(ois, currentLambertZone);
             ois.close();
             fis.close();
         } catch (Exception ex) {
             ex.printStackTrace(System.out);
-            JOptionPane.showMessageDialog(Main.parent, tr("Error loading file"), tr("Error"), JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(Main.parent, tr("Error loading file.\nProbably an old version of the cache file."), tr("Error"), JOptionPane.ERROR_MESSAGE);
             return false;
         }
-        if (wmsLayer.isRaster()) {
+        if (successfulRead && wmsLayer.isRaster()) {
             // serialized raster bufferedImage hangs-up on Java6. Recreate them here
             wmsLayer.images.get(0).image = RasterImageModifier.fixRasterImage(wmsLayer.images.get(0).image);
         }
-        return true;
+        return successfulRead;
     }
 

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

@@ -182 +182 @@
             System.out.println("GET "+interfaceURL);
             BufferedReader in = new BufferedReader(new InputStreamReader(urlConn.getInputStream()));
-            //while(in.readLine() != null) {}  // read the buffer otherwise we sent POST too early
+            // read the buffer otherwise we sent POST too early
             while ((ln = in.readLine()) != null) {
                 lines += ln;

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

@@ -86 +86 @@
  *                   support of subprojections in preferences for zones setting and UTM20N
  *                 - removed autosourcing of empty new nodes
+ * 1.6 28-Nov-2009 - Fix minor issues if Grab is called without layer (possible since projection rework)
  */
 public class CadastrePlugin extends Plugin {
-    static String VERSION = "1.4";
+    static String VERSION = "1.6";
 
     static JMenu cadastreJMenu;

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

@@ -8 +8 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
-import org.openstreetmap.josm.data.projection.LambertCC9Zones;
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
@@ -32 +31 @@
         try {
             if (grabber.getWmsInterface().retrieveInterface(wmsLayer)) {
+                boolean useFactor = true;
                 if (wmsLayer.images.isEmpty()) {
                     // first time we grab an image for this layer
                     if (CacheControl.cacheEnabled) {
                         if (wmsLayer.getCacheControl().loadCacheIfExist()) {
-                            Main.map.mapView.repaint();
+                            Main.map.mapView.zoomTo(wmsLayer.getCommuneBBox().toBounds());
+                            //Main.map.mapView.repaint();
                             return;
                         }
@@ -46 +47 @@
                         // set vectorized commune bounding box by opening the standard web window
                         grabber.getWmsInterface().retrieveCommuneBBox(wmsLayer);
-                        // if it is the first layer, use the communeBBox as grab bbox
-                        if (Main.proj instanceof LambertCC9Zones && Main.map.mapView.getAllLayers().size() == 1 ) {
+                        // if it is the first layer, use the communeBBox as grab bbox (and not divided)
+                        if (Main.map.mapView.getAllLayers().size() == 1 ) {
                             bounds = wmsLayer.getCommuneBBox().toBounds();
                             Main.map.mapView.zoomTo(bounds);
+                            useFactor = false;
                         }
                     }
                 }
                 // grab new images from wms server into active layer
-                wmsLayer.grab(grabber, bounds);
+                wmsLayer.grab(grabber, bounds, useFactor);
             }
         } catch (DuplicateLayerException e) {

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

@@ -11 +11 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
-import org.openstreetmap.josm.data.projection.LambertCC9Zones;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -30 +29 @@
 
     public void actionPerformed(ActionEvent e) {
-        // with the new projection LambertCC9Zones, we are able to determin the zone and thus lat/lon of 
-        // downloaded commune bounding box
-        if (Main.map != null || Main.proj instanceof LambertCC9Zones) {
+        if (Main.map != null) {
             if (CadastrePlugin.isCadastreProjection()) {
                 WMSLayer wmsLayer = WMSDownloadAction.getLayer();
@@ -43 +40 @@
                          + "projections and retry"));
             }
-        }
+        } else
+            new MenuActionNewLocation().actionPerformed(e);
     }
 

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

@@ -36 +36 @@
 
     public WMSLayer addNewLayer(ArrayList<WMSLayer> existingLayers) {
-        /*if (Main.map == null) {
-            JOptionPane.showMessageDialog(Main.parent,
-                    tr("Open a layer first (GPX, OSM, cache)"));
+        String location = "";
+        String codeDepartement = "";
+        String codeCommune = "";
+        boolean resetCookie = false;
+        JLabel labelSectionNewLocation = new JLabel(tr("Add a new layer"));
+        JPanel p = new JPanel(new GridBagLayout());
+        JLabel labelLocation = new JLabel(tr("Location"));
+        final JTextField inputTown = new JTextField( Main.pref.get("cadastrewms.location") );
+        inputTown.setToolTipText(tr("<html>Enter the town,village or city name.<br>"
+                + "Use the syntax and punctuation known by www.cadastre.gouv.fr .</html>"));
+
+        p.add(labelSectionNewLocation, GBC.eol());
+        p.add(labelLocation, GBC.std().insets(10, 0, 0, 0));
+        p.add(inputTown, GBC.eol().fill(GBC.HORIZONTAL).insets(5, 0, 0, 5));
+        JOptionPane pane = new JOptionPane(p, JOptionPane.INFORMATION_MESSAGE, JOptionPane.OK_CANCEL_OPTION, null) {
+            private static final long serialVersionUID = 1L;
+
+            @Override
+            public void selectInitialValue() {
+                inputTown.requestFocusInWindow();
+                inputTown.selectAll();
+            }
+        };
+        pane.createDialog(Main.parent, tr("Add new layer")).setVisible(true);
+        if (!Integer.valueOf(JOptionPane.OK_OPTION).equals(pane.getValue()))
             return null;
-        } else {*/
-            String location = "";
-            String codeDepartement = "";
-            String codeCommune = "";
-            boolean resetCookie = false;
-            JLabel labelSectionNewLocation = new JLabel(tr("Add a new layer"));
-            JPanel p = new JPanel(new GridBagLayout());
-            JLabel labelLocation = new JLabel(tr("Location"));
-            final JTextField inputTown = new JTextField( Main.pref.get("cadastrewms.location") );
-            inputTown.setToolTipText(tr("<html>Enter the town,village or city name.<br>"
-                    + "Use the syntax and punctuation known by www.cadastre.gouv.fr .</html>"));
 
-            p.add(labelSectionNewLocation, GBC.eol());
-            p.add(labelLocation, GBC.std().insets(10, 0, 0, 0));
-            p.add(inputTown, GBC.eol().fill(GBC.HORIZONTAL).insets(5, 0, 0, 5));
-            JOptionPane pane = new JOptionPane(p, JOptionPane.INFORMATION_MESSAGE, JOptionPane.OK_CANCEL_OPTION, null) {
-                private static final long serialVersionUID = 1L;
-
-                @Override
-                public void selectInitialValue() {
-                    inputTown.requestFocusInWindow();
-                    inputTown.selectAll();
-                }
-            };
-            pane.createDialog(Main.parent, tr("Add new layer")).setVisible(true);
-            if (!Integer.valueOf(JOptionPane.OK_OPTION).equals(pane.getValue()))
-                return null;
-
-            WMSLayer wmsLayer = null;
-            if (!inputTown.getText().equals("")) {
-                location = inputTown.getText().toUpperCase();
-                resetCookie = true;
-                Main.pref.put("cadastrewms.location", location);
-                Main.pref.put("cadastrewms.codeCommune", codeCommune);
-                if (Main.map != null) {
-                    for (Layer l : Main.map.mapView.getAllLayers()) {
-                        if (l instanceof WMSLayer && l.getName().equalsIgnoreCase(location + codeDepartement)) {
-                            return null;
-                        }
+        WMSLayer wmsLayer = null;
+        if (!inputTown.getText().equals("")) {
+            location = inputTown.getText().toUpperCase();
+            resetCookie = true;
+            Main.pref.put("cadastrewms.location", location);
+            Main.pref.put("cadastrewms.codeCommune", codeCommune);
+            if (Main.map != null) {
+                for (Layer l : Main.map.mapView.getAllLayers()) {
+                    if (l instanceof WMSLayer && l.getName().equalsIgnoreCase(location + codeDepartement)) {
+                        return null;
                     }
                 }
-                // add the layer if it doesn't exist
-                int zone = -1;
-                if (Main.proj instanceof LambertCC9Zones)
-                    zone = ((LambertCC9Zones)Main.proj).getLayoutZone();
-                else if (Main.proj instanceof Lambert)
-                    zone = ((Lambert)Main.proj).getLayoutZone();
-                else if (Main.proj instanceof UTM_20N_France_DOM)
-                    zone = ((UTM_20N_France_DOM)Main.proj).getCurrentGeodesic();
-                wmsLayer = new WMSLayer(location, codeCommune, zone);
-                Main.main.addLayer(wmsLayer);
-                System.out.println("Add new layer with Location:" + inputTown.getText());
-            } else if (existingLayers != null && existingLayers.size() > 0 && Main.map.mapView.getActiveLayer() instanceof WMSLayer) {
-                wmsLayer = (WMSLayer)Main.map.mapView.getActiveLayer();
-                resetCookie = true;
             }
+            // add the layer if it doesn't exist
+            int zone = -1;
+            if (Main.proj instanceof LambertCC9Zones)
+                zone = ((LambertCC9Zones)Main.proj).getLayoutZone();
+            else if (Main.proj instanceof Lambert)
+                zone = ((Lambert)Main.proj).getLayoutZone();
+            else if (Main.proj instanceof UTM_20N_France_DOM)
+                zone = ((UTM_20N_France_DOM)Main.proj).getCurrentGeodesic();
+            wmsLayer = new WMSLayer(location, codeCommune, zone);
+            Main.main.addLayer(wmsLayer);
+            System.out.println("Add new layer with Location:" + inputTown.getText());
+        } else if (existingLayers != null && existingLayers.size() > 0 && Main.map.mapView.getActiveLayer() instanceof WMSLayer) {
+            wmsLayer = (WMSLayer)Main.map.mapView.getActiveLayer();
+            resetCookie = true;
+        }
 
-            if (resetCookie)
-                CadastrePlugin.cadastreGrabber.getWmsInterface().resetCookieIfNewLayer(wmsLayer.getName());
-            return wmsLayer;
-        //}
+        if (resetCookie)
+            CadastrePlugin.cadastreGrabber.getWmsInterface().resetCookieIfNewLayer(wmsLayer.getName());
+        return wmsLayer;
     }
 

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

@@ -100 +100 @@
 
     public void grab(CadastreGrabber grabber, Bounds b) throws IOException {
-        if (isRaster) {
-            b = new Bounds(Main.proj.eastNorth2latlon(rasterMin), Main.proj.eastNorth2latlon(rasterMax));
-            divideBbox(b, Integer.parseInt(Main.pref.get("cadastrewms.rasterDivider",
-                    CadastrePreferenceSetting.DEFAULT_RASTER_DIVIDER)));
+        grab(grabber, b, true);
+    }
+    
+    public void grab(CadastreGrabber grabber, Bounds b, boolean useFactor) throws IOException {
+        if (useFactor) {
+            if (isRaster) {
+                b = new Bounds(Main.proj.eastNorth2latlon(rasterMin), Main.proj.eastNorth2latlon(rasterMax));
+                divideBbox(b, Integer.parseInt(Main.pref.get("cadastrewms.rasterDivider",
+                        CadastrePreferenceSetting.DEFAULT_RASTER_DIVIDER)));
+            } else
+                divideBbox(b, Integer.parseInt(Main.pref.get("cadastrewms.scale", Scale.X1.toString())));
         } else
-            divideBbox(b, Integer.parseInt(Main.pref.get("cadastrewms.scale", Scale.X1.toString())));
+            divideBbox(b, 1);
 
         for (EastNorthBound n : dividedBbox) {
@@ -440 +447 @@
             }
         }
+        System.out.println("Cache loaded for location "+location+" with "+images.size()+" images");
         return true;
     }