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

Timestamp:

2009-01-28T21:44:10+01:00 (16 years ago)

Author:

pieren

Message:

add municipality bbox in grab and cache

File:

• applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java (modified) (1 diff)

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

@@ -29 +29 @@
         try {
             if (grabber.getWmsInterface().retrieveInterface(wmsLayer)) {
-                if (wmsLayer.isRaster() && wmsLayer.images.isEmpty())
-                    wmsLayer.setRasterBounds(bounds);
-                if (CacheControl.cacheEnabled && wmsLayer.images.isEmpty()) {
-                    // images loaded from cache
-                    if (wmsLayer.getCacheControl().loadCacheIfExist()) {
-                        Main.map.mapView.repaint();
-                        return;
+                if (wmsLayer.images.isEmpty()) {
+                    // first time we grab an image for this layer
+                    if (CacheControl.cacheEnabled) {
+                        if (wmsLayer.getCacheControl().loadCacheIfExist()) {
+                            Main.map.mapView.repaint();
+                            return;
+                        }
                     }
+                    if (wmsLayer.isRaster())
+                        // set raster image commune bounding box based on current view (before adjustment) 
+                        wmsLayer.setRasterBounds(bounds);
+                    else
+                        // set vectorized commune bounding box by opening the standard web window
+                        wmsLayer.setCommuneBBox( grabber.getWmsInterface().retrieveCommuneBBox());
                 }
                 // grab new images from wms server into active layer