Changeset 388 for trunk/geowebcache/src/main/java/org/geowebcache/layer/GridCalculator.java

Timestamp:

09/05/08 02:30:42 (4 months ago)

Author:

arneke

Message:

Hooking zoomStart and zoomStop up to grid object instead of layer. More robust at looking for geowebcache.xml

Files:

• trunk/geowebcache/src/main/java/org/geowebcache/layer/GridCalculator.java (modified) (5 diffs)

trunk/geowebcache/src/main/java/org/geowebcache/layer/GridCalculator.java

@@ -69 +69 @@
     public GridCalculator(Grid grid) throws GeoWebCacheException {
 
-        //TODO this is messed up, ignoring Grid object
         this.grid = grid;
-        this.zoomStart = 0;
-        this.zoomStop = 30;
-        //this.metaWidth = metaWidth;
-        //this.metaHeight = metaHeight;
-
+        
         if(grid.resolutions != null) {
             this.resolutions = grid.resolutions;
             this.zoomStop = resolutions.length - 1;
+        } else {
+            this.zoomStart = grid.getZoomStart();
+            this.zoomStop = grid.getZoomStop();
         }
         
@@ -96 +94 @@
     private void determineGrid() throws GeoWebCacheException {
         if(grid.resolutions == null) {
-            // Figure out the approriate resolutions
+            // Figure out the appropriate resolutions
             
             double ratio = gridWidth / gridHeight;
@@ -152 +150 @@
         }
         
-        this.resolutions = new double[this.zoomStop - this.zoomStart + 1];
+        // We still need the full array, even though we only care about a part of it
+        this.resolutions = new double[this.zoomStop + 1];
         for(int i=this.zoomStart; i<= this.zoomStop; i++) {
             this.resolutions[i] = baseResolution;
@@ -472 +471 @@
     private int binarySearchForResolution(double reqResolution) 
     throws BadTileException {
-        return binarySearchForResolution(this.resolutions, reqResolution);
-    }
-    
-    protected static int binarySearchForResolution(double[] resolutions, double reqResolution) 
+        return binarySearchForResolution(this.resolutions, reqResolution, this.zoomStart);
+    }
+    
+    protected static int binarySearchForResolution(double[] resolutions, double reqResolution, int zoomStart) 
     throws BadTileException {
-        int low = 0;
+        int low = zoomStart;
         int high = resolutions.length - 1;
         
@@ -485 +484 @@
         
         // Deal with the edge cases first
-        if(reqLower > resolutions[1]) {
+        if(reqLower > resolutions[low]) {
             if(resolutions[0] < reqLower) {
                 throw new BadTileException("Resolution "+reqResolution+" is too big for grid,"