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

Timestamp:

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

Author:

pieren

Message:

Use the new cadastre projection LambertCC9Zones

File:

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

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;
-        }
+        //}
     }