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

Timestamp:

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

Author:

pieren

Message:

Add subprojection handling

File:

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

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