Changeset 18720 in osm

Timestamp:

2009-11-21T00:18:50+01:00 (15 years ago)

Author:

pieren

Message:

Add subprojection handling

Location:

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

Files:

• CacheControl.java (modified) (3 diffs)
• CacheFileLambert4ZoneFilter.java (added)
• CacheFileLambert9ZoneFilter.java (added)
• CacheFileUTM20NFilter.java (added)
• CadastrePlugin.java (modified) (7 diffs)
• MenuActionLoadFromCache.java (modified) (9 diffs)
• MenuActionNewLocation.java (modified) (2 diffs)
• WMSLayer.java (modified) (3 diffs)

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

@@ -22 +22 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.projection.LambertCC9Zones;
+import org.openstreetmap.josm.data.projection.UTM_20N_France_DOM;
 
 public class CacheControl implements Runnable {
     
     public static final String cLambertCC9Z = "CC";
+
+    public static final String cUTM20N = "UTM";
 
     public class ObjectOutputStreamAppend extends ObjectOutputStream {
@@ -87 +90 @@
             if (Main.proj instanceof LambertCC9Zones)
                 extension = cLambertCC9Z + extension;
+            else if (Main.proj instanceof UTM_20N_France_DOM)
+                extension = cUTM20N + extension;
             File file = new File(CadastrePlugin.cacheDir + wmsLayer.getName() + "." + extension);
             if (file.exists()) {
@@ -167 +172 @@
                 if (Main.proj instanceof LambertCC9Zones)
                     extension = cLambertCC9Z + extension;
+                else if (Main.proj instanceof UTM_20N_France_DOM)
+                    extension = cUTM20N + extension;
                 File file = new File(CadastrePlugin.cacheDir + wmsLayer.getName() + "." + extension);
                 try {

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

@@ -25 +25 @@
 import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
 import org.openstreetmap.josm.plugins.Plugin;
+import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.projection.*;
 
@@ -129 +131 @@
 
         UploadAction.registerUploadHook(new CheckSourceUploadHook());
+        
+        Lambert proj = new Lambert();
+        LatLon ll = new LatLon(48.559902360278954, 7.75309953770033);
+        EastNorth ea = proj.latlon2eastNorth(ll);
+        System.out.println(ea);
     }
 
@@ -154 +161 @@
 
             JMenuItem menuResetCookie = new JMenuItem(new MenuActionResetCookie());
-            JMenuItem menuLambertZone = new JMenuItem(new MenuActionLambertZone());
+            //JMenuItem menuLambertZone = new JMenuItem(new MenuActionLambertZone());
             JMenuItem menuLoadFromCache = new JMenuItem(new MenuActionLoadFromCache());
+            // temporary disabled:
             //JMenuItem menuActionBoundaries = new JMenuItem(new MenuActionBoundaries());
             //JMenuItem menuActionBuildings = new JMenuItem(new MenuActionBuildings());
@@ -164 +172 @@
             cadastreJMenu.add(menuSource);
             cadastreJMenu.add(menuResetCookie);
-            cadastreJMenu.add(menuLambertZone);
+            //cadastreJMenu.add(menuLambertZone);
             cadastreJMenu.add(menuLoadFromCache);
             // all SVG features disabled until official WMS is released
@@ -229 +237 @@
                     item.getText().equals(MenuActionBuildings.name)*/) {
                     item.setEnabled(isEnabled);
-                } else if (item.getText().equals(MenuActionLambertZone.name)) {
-                    item.setEnabled(!isEnabled);
                 }
         }
@@ -244 +250 @@
             } else if (oldFrame != null && newFrame == null) {
                 setEnabledAll(false);
-                Lambert.layoutZone = -1;
-                LambertCC9Zones.layoutZone = -1;
+                //Lambert.layoutZone = -1;
+                //LambertCC9Zones.layoutZone = -1;
             }
         }
@@ -251 +257 @@
     
     public static boolean isCadastreProjection() {
-            return Main.proj.toString().equals(new Lambert().toString())
-            || Main.proj.toString().equals(new UTM_20N_Guadeloupe_Fort_Marigot().toString())
-            || Main.proj.toString().equals(new UTM_20N_Guadeloupe_Ste_Anne().toString())
-            || Main.proj.toString().equals(new UTM_20N_Martinique_Fort_Desaix().toString())
+        return Main.proj.toString().equals(new Lambert().toString())
+            || Main.proj.toString().equals(new UTM_20N_France_DOM().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/MenuActionLoadFromCache.java

@@ -13 +13 @@
 import org.openstreetmap.josm.data.projection.Lambert;
 import org.openstreetmap.josm.data.projection.LambertCC9Zones;
+import org.openstreetmap.josm.data.projection.UTM_20N_France_DOM;
 import org.openstreetmap.josm.gui.layer.Layer;
 
@@ -30 +31 @@
 
         File[] files = fc.getSelectedFiles();
+        int layoutZone = getCurrentProjZone();
         nextFile:
         for (File file : files) {
@@ -35 +37 @@
                 String filename = file.getName();
                 String ext = (filename.lastIndexOf(".")==-1)?"":filename.substring(filename.lastIndexOf(".")+1,filename.length());
-                if ((ext.length() > 2 && ext.substring(0, CacheControl.cLambertCC9Z.length()).equals(CacheControl.cLambertCC9Z) &&
+                if ((ext.length() == 3 && ext.substring(0, CacheControl.cLambertCC9Z.length()).equals(CacheControl.cLambertCC9Z) &&
                     !(Main.proj instanceof LambertCC9Zones))
+                    || (ext.length() == 4 && ext.substring(0, CacheControl.cUTM20N.length()).equals(CacheControl.cUTM20N) &&
+                            !(Main.proj instanceof UTM_20N_France_DOM))
                     || (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);
@@ -42 +46 @@
                 } else {
                     String location = filename.substring(0, filename.lastIndexOf("."));
-                    if (ext.length() > 2 && ext.substring(0, CacheControl.cLambertCC9Z.length()).equals(CacheControl.cLambertCC9Z))
+                    if (ext.length() == 3 && ext.substring(0, CacheControl.cLambertCC9Z.length()).equals(CacheControl.cLambertCC9Z))
                         ext = ext.substring(2);
-                    // check the extension and its Lambert zone consistency
+                    else if (ext.length() == 4 && ext.substring(0, CacheControl.cUTM20N.length()).equals(CacheControl.cUTM20N))
+                        ext = ext.substring(3);
+                    // check the extension and its compatibility with current projection
                     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);
+                        if (cacheZone >=0 && cacheZone <= 9) {
+                            if (cacheZone != layoutZone) {
+                                JOptionPane.showMessageDialog(Main.parent, tr("Cannot load cache {0} which is not compatible with current projection zone", filename), tr("Error"), JOptionPane.ERROR_MESSAGE);
                                 continue nextFile;
                             } else
@@ -59 +61 @@
                         }
                     } catch (NumberFormatException ex) {
-                        System.out.println("Selected file \"" + filename + "\" is not a WMS cache file (invalid extension)");
-                        continue;
+                        JOptionPane.showMessageDialog(Main.parent, tr("Selected file {0} is not a cache file from this plugin (invalid extension)", filename), tr("Error"), JOptionPane.ERROR_MESSAGE);
+                        continue nextFile;
                     }
                     // check if the selected cache is not already displayed
@@ -66 +68 @@
                         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.");
+                                JOptionPane.showMessageDialog(Main.parent, tr("The location {0} is already on screen. Cache not loaded.", filename), tr("Error"), JOptionPane.ERROR_MESSAGE);
                                 continue nextFile;
                             }
@@ -73 +75 @@
                     // create layer and load cache
                     WMSLayer wmsLayer = new WMSLayer("", "", Integer.parseInt(ext)-1);
-                    if (wmsLayer.getCacheControl().loadCache(file, Lambert.layoutZone))
+                    if (wmsLayer.getCacheControl().loadCache(file, layoutZone))
                         Main.main.addLayer(wmsLayer);
                     
@@ -85 +87 @@
         JFileChooser fc = new JFileChooser(new File(CadastrePlugin.cacheDir));
         fc.setMultiSelectionEnabled(true);
-        if (Lambert.layoutZone != -1)
-            fc.addChoosableFileFilter(CacheFileFilter.filters[Lambert.layoutZone]);
+        int layoutZone = new MenuActionLoadFromCache().getCurrentProjZone();
+        if (layoutZone != -1) {
+            if (Main.proj instanceof Lambert)
+                fc.addChoosableFileFilter(CacheFileLambert4ZoneFilter.filters[layoutZone]);
+            else if (Main.proj instanceof LambertCC9Zones)
+                fc.addChoosableFileFilter(CacheFileLambert9ZoneFilter.filters[layoutZone]);
+            else if (Main.proj instanceof UTM_20N_France_DOM)
+                fc.addChoosableFileFilter(CacheFileUTM20NFilter.filters[layoutZone]);
+        }
         fc.setAcceptAllFileFilterUsed(false);
 
@@ -96 +105 @@
     }
 
+    private int getCurrentProjZone() {
+        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();
+        return zone;
+    }
 }

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

@@ -17 +17 @@
 import org.openstreetmap.josm.data.projection.Lambert;
 import org.openstreetmap.josm.data.projection.LambertCC9Zones;
+import org.openstreetmap.josm.data.projection.UTM_20N_France_DOM;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.tools.GBC;
@@ -81 +82 @@
                 }
                 // add the layer if it doesn't exist
+                int zone = -1;
                 if (Main.proj instanceof LambertCC9Zones)
-                    wmsLayer = new WMSLayer(location, codeCommune, LambertCC9Zones.layoutZone);
-                else
-                    wmsLayer = new WMSLayer(location, codeCommune, Lambert.layoutZone);
+                    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());

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

@@ -29 +29 @@
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
-import org.openstreetmap.josm.data.projection.LambertCC9Zones;
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
@@ -517 +516 @@
     public void setCommuneBBox(EastNorthBound entireCommune) {
         this.communeBBox = entireCommune;
-        if (Main.proj instanceof LambertCC9Zones)
-            setLambertCC9Zone(communeBBox.min.north());
+//        if (Main.proj instanceof LambertCC9Zones)
+//            setLambertCC9Zone(communeBBox.min.north());
     }
 
@@ -532 +531 @@
     }
 
-    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));
-            }
-        }
-    }
+//    public void setLambertCC9Zone(double north) {
+//        int lambertZone = LambertCC9Zones.north2ZoneNumber(north);
+//        this.lambertZone = lambertZone;
+//        if (((LambertCC9Zones)Main.proj).getLayoutZone() != lambertZone) {
+//            String currentZone = MenuActionLambertZone.lambert9zones[((LambertCC9Zones)Main.proj).getLayoutZone()+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));
+//            }
+//        }
+//    }
 
     public EastNorth getRasterCenter() {