Changeset 24913 in osm

Timestamp:

2010-12-30T15:21:07+01:00 (14 years ago)

Author:

pieren

Message:

simplified some procedures

Location:

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

Files:

• DownloadWMSVectorImage.java (modified) (2 diffs)
• WMSLayer.java (modified) (3 diffs)

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

@@ -33 +33 @@
         try {
             if (grabber.getWmsInterface().retrieveInterface(wmsLayer)) {
-                boolean useFactor = true;
                 if (wmsLayer.images.isEmpty()) {
                     // first time we grab an image for this layer
@@ -52 +51 @@
                         // 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 (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, useFactor);
+                wmsLayer.grab(grabber, bounds);
             }
         } catch (DuplicateLayerException e) {

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

@@ -127 +127 @@
 
     public void grab(CadastreGrabber grabber, Bounds b) throws IOException {
-        grab(grabber, b, true);
-    }
-
-    public void grab(CadastreGrabber grabber, Bounds b, boolean useFactor) throws IOException {
         cancelled = false;
-        if (useFactor) {
+        // if it is the first layer, use the communeBBox as grab bbox (and not divided)
+        if (Main.map.mapView.getAllLayers().size() == 1 ) {
+            b = this.getCommuneBBox().toBounds();
+            Main.map.mapView.zoomTo(b);
+            divideBbox(b, 1);
+        } else {
             if (isRaster) {
                 b = new Bounds(Main.proj.eastNorth2latlon(rasterMin), Main.proj.eastNorth2latlon(rasterMax));
                 divideBbox(b, Integer.parseInt(Main.pref.get("cadastrewms.rasterDivider",
-                        CadastrePreferenceSetting.DEFAULT_RASTER_DIVIDER)), 0);
+                        CadastrePreferenceSetting.DEFAULT_RASTER_DIVIDER)));
             } else
-                divideBbox(b, Integer.parseInt(Main.pref.get("cadastrewms.scale", Scale.X1.toString())), 0);
-        } else
-            divideBbox(b, 1, 0);
+                divideBbox(b, Integer.parseInt(Main.pref.get("cadastrewms.scale", Scale.X1.toString())));
+        }
 
         int lastSavedImage = images.size();
@@ -189 +189 @@
      *               4 = configurable size from preferences (100 meters per default) rounded
      *                   allowing grabbing of next contiguous zone
-     *               5 = use the size provided in next argument optionalSize
-     * @param optionalSize box size used when factor is 5.
-     */
-    private void divideBbox(Bounds b, int factor, int optionalSize) {
+     */
+    private void divideBbox(Bounds b, int factor) {
         EastNorth lambertMin = Main.proj.latlon2eastNorth(b.getMin());
         EastNorth lambertMax = Main.proj.latlon2eastNorth(b.getMax());
@@ -208 +206 @@
         } else {
             // divide to fixed size squares
-            int cSquare = factor == 4 ? Integer.parseInt(Main.pref.get("cadastrewms.squareSize", "100")) : optionalSize;
+            int cSquare = Integer.parseInt(Main.pref.get("cadastrewms.squareSize", "100"));
             minEast = minEast - minEast % cSquare;
             minNorth = minNorth - minNorth % cSquare;