Changeset 18838 in osm for applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/WMSLayer.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/WMSLayer.java (modified) (2 diffs)

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

@@ -100 +100 @@
 
     public void grab(CadastreGrabber grabber, Bounds b) throws IOException {
-        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)));
+        grab(grabber, b, true);
+    }
+    
+    public void grab(CadastreGrabber grabber, Bounds b, boolean useFactor) throws IOException {
+        if (useFactor) {
+            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)));
+            } else
+                divideBbox(b, Integer.parseInt(Main.pref.get("cadastrewms.scale", Scale.X1.toString())));
         } else
-            divideBbox(b, Integer.parseInt(Main.pref.get("cadastrewms.scale", Scale.X1.toString())));
+            divideBbox(b, 1);
 
         for (EastNorthBound n : dividedBbox) {
@@ -440 +447 @@
             }
         }
+        System.out.println("Cache loaded for location "+location+" with "+images.size()+" images");
         return true;
     }