Changeset 389

Timestamp:

09/06/08 22:09:30 (2 months ago)

Author:

arneke

Message:

More sane handling of zoomStart, generate all resolutions even though we'll only use some.

Location:

trunk/geowebcache/src/main/java/org/geowebcache

Files:

• layer/Grid.java (modified) (3 diffs)
• layer/GridCalculator.java (modified) (7 diffs)
• rest/SeedResource.java (modified) (1 diff)
• rest/SeedTask.java (modified) (1 diff)

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

@@ -17 +17 @@
 package org.geowebcache.layer;
 
-import java.util.List;
-
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.geowebcache.GeoWebCacheException;
 import org.geowebcache.util.wms.BBOX;
-import org.mortbay.log.Log;
 
 /**
@@ -28 +27 @@
 
 public class Grid {
+    private static Log log = LogFactory.getLog(org.geowebcache.layer.Grid.class);
+
     private SRS srs = null;
     
@@ -144 +145 @@
     private GridCalculator initGridCalculator() throws GeoWebCacheException {
         if(zoomStart < 0 || zoomStop < zoomStart || zoomStop == 0) {
-            Log.debug("Missing values, setting zoomStart,zoomStop to 0,30");
+            log.debug("Missing values, setting zoomStart,zoomStop to 0,30");
             zoomStart = 0;
             zoomStop = 30;

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

@@ -50 +50 @@
     
     private double[] resolutions;
-    
-    // The following are for a tile, zoomed out all the way
-    //private double maxTileWidth;
-
-    //private double maxTileHeight;
 
     private int zoomStart;
 
     private int zoomStop;
-    
-    // Special treatment of "zoomed out tile" for EPSG 4326
-    //private boolean worldBoundsCoverTwoTiles = false;
 
     private int[] zoomedOutGridLoc = null;
@@ -151 +143 @@
         
         // 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;
+        resolutions = new double[this.zoomStop + 1];
+        for(int i=0; i<= this.zoomStop; i++) {
+            resolutions[i] = baseResolution;
             baseResolution = baseResolution / 2;
         }
@@ -163 +155 @@
         // We'll just waste a few bytes, for cheap lookups
         int[][] gridLevels = new int[zoomStop + 1][4];
-
-        //int tileCountX = (int) Math.round(gridWidth / resolutions[0]);
-        //int tileCountY = (int) Math.round(gridHeight / resolutions[0]);
-
-        //int metaLarger = (metaHeight > metaWidth) ? metaHeight : metaWidth;
-
-        //System.out.println("lb: " +layerBounds+ " base:" +
-        //  " tileWidth: " + tileWidth);
 
         double[] rawNumber = new double[4];
@@ -196 +180 @@
             rawNumber[3] = (layerBounds.coords[3] - gridBounds.coords[1] - 0.00001) / tileDelta;
             gridLevels[level][3] = (int) Math.floor(rawNumber[3]);
-
-            //System.out.println(Arrays.toString(rawNumber) + " "+ Arrays.toString(gridLevels[level]));
-            //System.out.println("postOrig: " +
-            //        );
-            //
-            //System.out.println("tileCountX "+tileCountX + " metaLarger: "
-            // + metaLarger);
-
-            //tileCountX = tileCountX * 2;
-            //tileCountY = tileCountY * 2;
         }
         return gridLevels;
@@ -239 +213 @@
 
         double reqTileWidth = tileBounds.coords[2] - tileBounds.coords[0];
-
-        //Arrays.binarySearch(a, key)
-        //double zoomLevel = Math.log(gridWidth / reqTileWidth) / Math.log(2);
-        
-        //long roundedZoomLevel = Math.round(zoomLevel);
-
         
         // (Z) Zoom level
         // For EPSG 4326, reqTileWidth = 0.087 log(4096) / log(2) - 1; -> 11
         retVals[2] = this.binarySearchForResolution(reqTileWidth / GridCalculator.TILEPIXELS);
+        
+        if(retVals[2] < zoomStart) {
+            throw new BadTileException("zoomStart is " + zoomStart 
+                    + " but tile would be " + retVals[2]);
+        }
 
         double tileWidth = resolutions[retVals[2]] * GridCalculator.TILEPIXELS;
@@ -458 +431 @@
     public double[] getResolutions() {
         return resolutions;
-        //double[] ret = new double[zoomStop - zoomStart + 1];
-        //double tileWidth = maxTileWidth / widthPixels;
-        
-        //for(int i=0; i<ret.length; i++) {
-        //    ret[i] = tileWidth;
-        //    tileWidth = tileWidth / 2;
-       // }
-        
-        //return ret;
     }
     
     private int binarySearchForResolution(double reqResolution) 
     throws BadTileException {
-        return binarySearchForResolution(this.resolutions, reqResolution, this.zoomStart);
-    }
-    
-    protected static int binarySearchForResolution(double[] resolutions, double reqResolution, int zoomStart) 
+        return binarySearchForResolution(this.resolutions, reqResolution);
+    }
+    
+    protected static int binarySearchForResolution(double[] resolutions, double reqResolution) 
     throws BadTileException {
-        int low = zoomStart;
+        int low = 0;
         int high = resolutions.length - 1;
         
@@ -484 +448 @@
         
         // Deal with the edge cases first
-        if(reqLower > resolutions[low]) {
+        if(resolutions[low] < reqUpper) {
             if(resolutions[0] < reqLower) {
                 throw new BadTileException("Resolution "+reqResolution+" is too big for grid,"
                         +" biggest supported is " + resolutions[0]);
             }
-            return 0;
-        }
-        
-        if(reqUpper < resolutions[high - 1]) {
+            return low;
+        }
+        
+        if(resolutions[high] > reqLower) {
             if(resolutions[high] / 1.5 > reqUpper) {
                 throw new BadTileException("Resolution "+reqResolution+" is too small for grid,"

trunk/geowebcache/src/main/java/org/geowebcache/rest/SeedResource.java

@@ -182 +182 @@
         if(null == rq.getThreadCount() 
                 || rq.getThreadCount() < 1 
-                || type.equalsIgnoreCase("seed")) {
+                || type.equalsIgnoreCase("truncate")) {
             threadCount = 1;
         } else {

trunk/geowebcache/src/main/java/org/geowebcache/rest/SeedTask.java

@@ -69 +69 @@
             }
             SRS srs = req.getSRS();
+            if(srs == null) {
+                srs = tl.getGrids().entrySet().iterator().next().getKey();
+            }
+            
             BBOX bounds = req.getBounds();
+            if(bounds == null) {
+                bounds = tl.getGrid(srs).getBounds();
+            }
 
             int[][] coveredGridLevels = tl.getCoveredGridLevels(srs,bounds);