Changeset 18207 in osm for applications

Timestamp:

2009-10-18T18:11:09+02:00 (15 years ago)

Author:

pieren

Message:

Use the new cadastre projection LambertCC9Zones

Location:

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

Files:

• CacheControl.java (modified) (5 diffs)
• CadastreGrabber.java (modified) (1 diff)
• CadastrePlugin.java (modified) (7 diffs)
• CadastrePreferenceSetting.java (modified) (1 diff)
• DownloadWMSVectorImage.java (modified) (2 diffs)
• EastNorthBound.java (modified) (2 diffs)
• MenuActionGrab.java (modified) (2 diffs)
• MenuActionLambertZone.java (modified) (4 diffs)
• MenuActionLoadFromCache.java (modified) (2 diffs)
• MenuActionNewLocation.java (modified) (4 diffs)
• WMSDownloadAction.java (modified) (2 diffs)
• WMSLayer.java (modified) (7 diffs)

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

@@ -21 +21 @@
 import javax.swing.JOptionPane;
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.projection.LambertCC9Zones;
 
 public class CacheControl implements Runnable {
+    
+    public static final String cLambertCC9Z = "CC";
 
     public class ObjectOutputStreamAppend extends ObjectOutputStream {
@@ -81 +84 @@
     public boolean loadCacheIfExist() {
         try {
-            File file = new File(CadastrePlugin.cacheDir + wmsLayer.getName() + "." + String.valueOf(wmsLayer.lambertZone+1));
+            String extension = String.valueOf((wmsLayer.getLambertZone() + 1));
+            if (Main.proj instanceof LambertCC9Zones)
+                extension = cLambertCC9Z + extension;
+            File file = new File(CadastrePlugin.cacheDir + wmsLayer.getName() + "." + extension);
             if (file.exists()) {
                 JOptionPane pane = new JOptionPane(
@@ -96 +102 @@
 
                 if (reply == JOptionPane.OK_OPTION) {
-                    return loadCache(file, wmsLayer.lambertZone);
+                    return loadCache(file, wmsLayer.getLambertZone());
                 } else
                     file.delete();
@@ -108 +114 @@
     public void deleteCacheFile() {
         try {
-            File file = new File(CadastrePlugin.cacheDir + wmsLayer.getName() + "." + String.valueOf(wmsLayer.lambertZone+1));
+            String extension = String.valueOf((wmsLayer.getLambertZone() + 1));
+            if (Main.proj instanceof LambertCC9Zones)
+                extension = cLambertCC9Z + extension;
+            File file = new File(CadastrePlugin.cacheDir + wmsLayer.getName() + "." + extension);
             if (file.exists())
                 file.delete();
@@ -155 +164 @@
             imagesLock.unlock();
             if (images != null && !images.isEmpty()) {
-                File file = new File(CadastrePlugin.cacheDir + wmsLayer.getName() + "." + String.valueOf((wmsLayer.lambertZone + 1)));
+                String extension = String.valueOf((wmsLayer.getLambertZone() + 1));
+                if (Main.proj instanceof LambertCC9Zones)
+                    extension = cLambertCC9Z + extension;
+                File file = new File(CadastrePlugin.cacheDir + wmsLayer.getName() + "." + extension);
                 try {
                     if (file.exists()) {

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

@@ -74 +74 @@
         //str += "&width=800&height=600"; // maximum allowed by wms server
         str += "&width=1000&height=800"; // maximum allowed by wms server
+        //str += "&exception=application/vnd.ogc.se_inimage"; // used by normal client but not required
         str += "&styles=LS3_90,LS2_90,LS1_90,PARCELLE_90,NUMERO_90,PT3_90,PT2_90,PT1_90,LIEUDIT_90";
         str += ",SUBSECTION_90";

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

@@ -7 +7 @@
 import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
-import java.util.LinkedList;
 
 import javax.swing.JCheckBoxMenuItem;
@@ -75 +74 @@
  * 1.3 23-Aug-2009 - improve georeferencing action cancellation
  *                 - fixed bug of raster image loaded from cache not working on Java1.6
- *                 - improve mouse click bounce detection during georeferencing process 
+ *                 - improve mouse click bounce detection during georeferencing process
+ * 1.4 17-Oct-2009 - add support for new Lambert CC 9 Zones projection 
  */
 public class CadastrePlugin extends Plugin {
-    static String VERSION = "1.3";
+    static String VERSION = "1.4";
 
     static JMenu cadastreJMenu;
@@ -121 +121 @@
 
         refreshConfiguration();
-        refreshMenu();
 
         UploadAction.registerUploadHook(new CheckSourceUploadHook());
     }
 
-    public void refreshMenu() throws Exception {
+    public static void refreshMenu() {
         MainMenu menu = Main.main.menu;
 
@@ -207 +206 @@
         } else
             System.out.println("shortcut F11 already redefined; do not change");
+
+        refreshMenu();
     }
 
@@ -214 +215 @@
     }
 
-    private void setEnabledAll(boolean isEnabled) {
+    private static void setEnabledAll(boolean isEnabled) {
+        boolean isLambertCC9Zones = Main.proj instanceof LambertCC9Zones;
         for (int i = 0; i < cadastreJMenu.getItemCount(); i++) {
             JMenuItem item = cadastreJMenu.getItem(i);
             if (item != null)
-                if (item.getText().equals(MenuActionGrab.name) ||
-                    item.getText().equals(MenuActionGrabPlanImage.name) /* ||
+                if (item.getText().equals(MenuActionGrabPlanImage.name) /*||
+                    item.getText().equals(MenuActionGrab.name) ||
                     item.getText().equals(MenuActionBoundaries.name) ||
                     item.getText().equals(MenuActionBuildings.name)*/) {
@@ -239 +241 @@
                 setEnabledAll(false);
                 Lambert.layoutZone = -1;
+                LambertCC9Zones.layoutZone = -1;
             }
         }
@@ -248 +251 @@
             || Main.proj.toString().equals(new UTM_20N_Guadeloupe_Ste_Anne().toString())
             || Main.proj.toString().equals(new UTM_20N_Martinique_Fort_Desaix().toString())
-            || Main.proj.toString().equals(new GaussLaborde_Reunion().toString());
+            || Main.proj.toString().equals(new GaussLaborde_Reunion().toString())
+            || Main.proj.toString().equals(new LambertCC9Zones().toString());
     }
 

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

@@ -240 +240 @@
         CacheControl.cacheEnabled = enableCache.isSelected();
         CadastrePlugin.refreshConfiguration();
+        CadastrePlugin.refreshMenu();
 
         return false;

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

@@ -7 +7 @@
 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;
@@ -38 +39 @@
                         }
                     }
-                    if (wmsLayer.isRaster())
+                    if (wmsLayer.isRaster()) {
                         // set raster image commune bounding box based on current view (before adjustment)
                         wmsLayer.setRasterBounds(bounds);
-                    else
+                    } else {
                         // set vectorized commune bounding box by opening the standard web window
                         wmsLayer.setCommuneBBox( grabber.getWmsInterface().retrieveCommuneBBox());
+                        // if it is the first layer, use the communeBBox as grab bbox
+                        if (Main.proj instanceof LambertCC9Zones && Main.map.mapView.getAllLayers().size() == 1 ) {
+                            bounds = wmsLayer.getCommuneBBox().toBounds();
+                            Main.map.mapView.zoomTo(bounds);
+                        }
+                    }
                 }
                 // grab new images from wms server into active layer

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

@@ -3 +3 @@
 import java.io.Serializable;
 
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.coor.EastNorth;
 
@@ -28 +30 @@
         return enb;
     }
+    
+    public Bounds toBounds() {
+        return new Bounds(Main.proj.eastNorth2latlon(min), Main.proj.eastNorth2latlon(max));
+    }
 
     @Override public String toString() {

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

@@ -10 +10 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
+import org.openstreetmap.josm.data.projection.LambertCC9Zones;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -28 +29 @@
 
     public void actionPerformed(ActionEvent e) {
-        if (Main.map != null) {
+        // 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 (CadastrePlugin.isCadastreProjection()) {
                 WMSLayer wmsLayer = WMSDownloadAction.getLayer();

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

@@ -14 +14 @@
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.data.projection.Lambert;
+import org.openstreetmap.josm.data.projection.LambertCC9Zones;
 import org.openstreetmap.josm.tools.GBC;
 
@@ -22 +23 @@
     public static String name = "Change Lambert zone";
 
+    public static String[] lambert4zones = { "", "1 (51.30 to 48.15 degrees)", "2 (48.15 to 45.45 degrees)", "3 (45.45 to 42.76 degrees)", "4 (Corsica)" };
+    public static String[] lambert9zones = { "", "1 (41 to 43 degrees)", "2 (42 to 44 degrees)",
+            "3 (43 to 45 degrees)", "4 (44 to 46 degrees)", "5 (45 to 47 degrees)",
+            "6 (46 to 48 degrees)", "7 (47 to 49 degrees)", "8 (48 to 50 degrees)",
+            "9 (49 to 51 degrees)" };
+
     public MenuActionLambertZone() {
-        super(tr(name), "cadastre_small", tr("Set manually the Lambert zone (e.g. for locations between two zones)"),
+        super(tr(name), "cadastre_small", tr("Set manually the Lambert zone"),
                 null, false);
     }
@@ -29 +36 @@
     public void actionPerformed(ActionEvent e) {
         JPanel p = new JPanel(new GridBagLayout());
-        String[] zones = { "", "1 (51.30 to 48.15 degrees)", "2 (48.15 to 45.45 degrees)", "3 (45.45 to 42.76 degrees)", "4 (Corsica)" };
-        final JComboBox inputLambertZone = new JComboBox(zones);
+        final JComboBox inputLambertZone;
+        if (Main.proj instanceof LambertCC9Zones)
+            inputLambertZone = new JComboBox(lambert9zones);
+        else
+            inputLambertZone = new JComboBox(lambert4zones);
         JLabel newLambertZone = new JLabel(tr("Zone"));
         p.add(newLambertZone, GBC.std());
@@ -47 +57 @@
         if (inputLambertZone.getSelectedIndex() > 0) {
             Lambert.layoutZone = inputLambertZone.getSelectedIndex() - 1;
+            LambertCC9Zones.layoutZone = Lambert.layoutZone; 
         }
     }

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

@@ -6 +6 @@
 import java.io.File;
 import javax.swing.JFileChooser;
+import javax.swing.JOptionPane;
+
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.data.projection.Lambert;
+import org.openstreetmap.josm.data.projection.LambertCC9Zones;
 import org.openstreetmap.josm.gui.layer.Layer;
 
@@ -31 +34 @@
                 String filename = file.getName();
                 String ext = (filename.lastIndexOf(".")==-1)?"":filename.substring(filename.lastIndexOf(".")+1,filename.length());
-                String location = filename.substring(0, filename.lastIndexOf("."));
-                // check the extension and its Lambert zone consistency
-                try {
-                    int cacheZone = Integer.parseInt(ext) - 1;
-                    if (cacheZone >=0 && cacheZone <= 3) {
-                        if (Lambert.layoutZone == -1) {
-                            Lambert.layoutZone = cacheZone;
-                            System.out.println("Load cache \"" + filename + "\" in Lambert Zone " + (Lambert.layoutZone+1));
-                        } else if (cacheZone != Lambert.layoutZone) {
-                            System.out.println("Cannot load cache \"" + filename + "\" which is not in current Lambert Zone "
-                                    + Lambert.layoutZone);
-                            continue nextFile;
-                        } else
-                            System.out.println("Load cache " + filename);
+                if ((ext.length() > 2 && ext.substring(0, CacheControl.cLambertCC9Z.length()).equals(CacheControl.cLambertCC9Z) &&
+                    !(Main.proj instanceof LambertCC9Zones))
+                    || (ext.length() == 1) && !(Main.proj instanceof Lambert)) {
+                        JOptionPane.showMessageDialog(Main.parent, tr("{0} not allowed with the current projection", filename), tr("Error"), JOptionPane.ERROR_MESSAGE);
+                        continue;
+                } else {
+                    String location = filename.substring(0, filename.lastIndexOf("."));
+                    if (ext.length() > 2 && ext.substring(0, CacheControl.cLambertCC9Z.length()).equals(CacheControl.cLambertCC9Z))
+                        ext = ext.substring(2);
+                    // check the extension and its Lambert zone consistency
+                    try {
+                        int cacheZone = Integer.parseInt(ext) - 1;
+                        if (cacheZone >=0 && cacheZone <= 3) {
+                            if (Lambert.layoutZone == -1) {
+                                Lambert.layoutZone = cacheZone;
+                                System.out.println("Load cache \"" + filename + "\" in Lambert Zone " + (Lambert.layoutZone+1));
+                            } else if (cacheZone != Lambert.layoutZone) {
+                                System.out.println("Cannot load cache \"" + filename + "\" which is not in current Lambert Zone "
+                                        + Lambert.layoutZone);
+                                continue nextFile;
+                            } else
+                                System.out.println("Load cache " + filename);
+                        }
+                    } catch (NumberFormatException ex) {
+                        System.out.println("Selected file \"" + filename + "\" is not a WMS cache file (invalid extension)");
+                        continue;
                     }
-                } catch (NumberFormatException ex) {
-                    System.out.println("Selected file \"" + filename + "\" is not a WMS cache file (invalid extension)");
-                    continue;
-                }
-                // check if the selected cache is not already displayed
-                if (Main.map != null) {
-                    for (Layer l : Main.map.mapView.getAllLayers()) {
-                        if (l instanceof WMSLayer && l.getName().equals(location)) {
-                            System.out.println("The location " + filename + " is already on screen. Cache not loaded.");
-                            continue nextFile;
+                    // check if the selected cache is not already displayed
+                    if (Main.map != null) {
+                        for (Layer l : Main.map.mapView.getAllLayers()) {
+                            if (l instanceof WMSLayer && l.getName().equals(location)) {
+                                System.out.println("The location " + filename + " is already on screen. Cache not loaded.");
+                                continue nextFile;
+                            }
                         }
                     }
+                    // create layer and load cache
+                    WMSLayer wmsLayer = new WMSLayer("", "", Integer.parseInt(ext)-1);
+                    if (wmsLayer.getCacheControl().loadCache(file, Lambert.layoutZone))
+                        Main.main.addLayer(wmsLayer);
+                    
                 }
-                // create layer and load cache
-                WMSLayer wmsLayer = new WMSLayer("", "", Integer.parseInt(ext)-1);
-                if (wmsLayer.getCacheControl().loadCache(file, Lambert.layoutZone))
-                    Main.main.addLayer(wmsLayer);
             }
         }

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

@@ -16 +16 @@
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.data.projection.Lambert;
+import org.openstreetmap.josm.data.projection.LambertCC9Zones;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.tools.GBC;
@@ -34 +35 @@
 
     public WMSLayer addNewLayer(ArrayList<WMSLayer> existingLayers) {
-        if (Main.map == null) {
+        /*if (Main.map == null) {
             JOptionPane.showMessageDialog(Main.parent,
                     tr("Open a layer first (GPX, OSM, cache)"));
             return null;
-            /*
-        } else if (existingLayers != null && existingLayers.size() > 0) {
-            JOptionPane.showMessageDialog(Main.parent,
-                    tr("Select one cadastre layer first"));
-            return null;*/
-        } else {
+        } else {*/
             String location = "";
             String codeDepartement = "";
@@ -78 +74 @@
                 Main.pref.put("cadastrewms.location", location);
                 Main.pref.put("cadastrewms.codeCommune", codeCommune);
-                for (Layer l : Main.map.mapView.getAllLayers()) {
-                    if (l instanceof WMSLayer && l.getName().equalsIgnoreCase(location + codeDepartement)) {
-                        return null;
+                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
-                wmsLayer = new WMSLayer(location, codeCommune, Lambert.layoutZone);
+                if (Main.proj instanceof LambertCC9Zones)
+                    wmsLayer = new WMSLayer(location, codeCommune, LambertCC9Zones.layoutZone);
+                else
+                    wmsLayer = new WMSLayer(location, codeCommune, Lambert.layoutZone);
                 Main.main.addLayer(wmsLayer);
                 System.out.println("Add new layer with Location:" + inputTown.getText());
@@ -95 +96 @@
                 CadastrePlugin.cadastreGrabber.getWmsInterface().resetCookieIfNewLayer(wmsLayer.getName());
             return wmsLayer;
-        }
+        //}
     }
 

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

@@ -26 +26 @@
     public static WMSLayer getLayer() {
         // check if we already have a layer created. if not, create; if yes, reuse.
+        ArrayList<WMSLayer> existingWMSlayers = new ArrayList<WMSLayer>();
         if (Main.map != null) {
             Layer activeLayer = Main.map.mapView.getActiveLayer();
             if (activeLayer instanceof WMSLayer)
                 return (WMSLayer) activeLayer;
-            ArrayList<WMSLayer> existingWMSlayers = new ArrayList<WMSLayer>();
             for (Layer l : Main.map.mapView.getAllLayers()) {
                 if (l instanceof WMSLayer) {
@@ -42 +42 @@
             JOptionPane.showMessageDialog(Main.parent,
                     tr("More than one WMS layer present\nSelect one of them first, then retry"));
+        } else {
+            return new MenuActionNewLocation().addNewLayer(existingWMSlayers);
         }
         return null;

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

@@ -19 +19 @@
 import javax.swing.Icon;
 import javax.swing.ImageIcon;
+import javax.swing.JDialog;
 import javax.swing.JMenuItem;
 import javax.swing.JOptionPane;
@@ -25 +26 @@
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
 import org.openstreetmap.josm.data.projection.Lambert;
+import org.openstreetmap.josm.data.projection.LambertCC9Zones;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.gui.MapView;
@@ -42 +44 @@
     Component[] component = null;
 
-    public int lambertZone = -1;
+    private int lambertZone = -1;
 
     protected static final Icon icon = new ImageIcon(Toolkit.getDefaultToolkit().createImage(
@@ -77 +79 @@
         this.location = location;
         this.codeCommune = codeCommune;
-        this.lambertZone = Lambert.layoutZone;
+        this.lambertZone = lambertZone;
         // enable auto-sourcing option
         CadastrePlugin.pluginUsed = true;
@@ -380 +382 @@
         }
         this.communeBBox = (EastNorthBound) ois.readObject();
-        if (this.lambertZone != currentLambertZone) {
+        if (this.lambertZone != currentLambertZone && currentLambertZone != -1) {
             JOptionPane.showMessageDialog(Main.parent, tr("Lambert zone {0} in cache "+
                     "incompatible with current Lambert zone {1}",
@@ -484 +486 @@
     public void setCommuneBBox(EastNorthBound entireCommune) {
         this.communeBBox = entireCommune;
+        if (Main.proj instanceof LambertCC9Zones)
+            setLambertCC9Zone(communeBBox.min.north());
     }
 
@@ -493 +497 @@
     }
 
+    public int getLambertZone() {
+        return lambertZone;
+    }
+
+    public void setLambertCC9Zone(double north) {
+        int lambertZone = LambertCC9Zones.north2ZoneNumber(north);
+        this.lambertZone = lambertZone;
+        if (LambertCC9Zones.layoutZone != lambertZone) {
+            String currentZone = MenuActionLambertZone.lambert9zones[LambertCC9Zones.layoutZone+1];
+            String destZone = MenuActionLambertZone.lambert9zones[lambertZone+1];
+            if (Main.map.mapView.getAllLayers().size() == 1) {
+                /* Enable this code below when JOSM will have a proper support of dynamic projection change
+                 * 
+                System.out.println("close all layers and change current Lambert zone from "+LambertCC9Zones.layoutZone+" to "+lambertZone);
+                Bounds b = null;
+                if (Main.map != null && Main.map.mapView != null)
+                    b = Main.map.mapView.getRealBounds();
+                LambertCC9Zones.layoutZone = lambertZone;
+                Main.map.mapView.zoomTo(b);
+                */
+            } else {
+                JOptionPane.showMessageDialog(Main.parent, tr("Current layer is in Lambert CC9 Zone \"{0}\"\n"+
+                        "where the commune is in Lambert CC9 Zone \"{1}\".\n"+
+                        "Upload your changes, close all layers and change\n"+
+                        "manually the Lambert zone from the Cadastre menu"
+                        , currentZone, destZone));
+            }
+        }
+    }
+
 }