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

Timestamp:

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

Author:

pieren

Message:

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

File:

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

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