Changeset 422

Timestamp:

11/12/08 17:43:08 (8 weeks ago)

Author:

arneke

Message:

Fixes for truncation, still need to write unit tests and straighten out a few nails

Location:

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

Files:

• cache/file/FilePathKey2.java (modified) (1 diff)
• cache/file/FilePathKey2Filter.java (modified) (3 diffs)
• layer/GridCalculator.java (modified) (3 diffs)
• rest/TruncateTask.java (modified) (2 diffs)

trunk/geowebcache/src/main/java/org/geowebcache/cache/file/FilePathKey2.java

@@ -87 +87 @@
         if (number > 9) {
             if(number > 11) {
-                numberOrder = (int) Math.ceil(Math.log10(number) - 0.01);
+                numberOrder = (int) Math.ceil(Math.log10(number) - 0.02);
             } else {
                 numberOrder = 2;

trunk/geowebcache/src/main/java/org/geowebcache/cache/file/FilePathKey2Filter.java

@@ -53 +53 @@
      *  *                 EPSG_2163_01
      */
-    public boolean accept(File dir, String name) {
-        System.out.println(dir.getAbsolutePath() + " " + name);
-        
+    public boolean accept(File dir, String name) {  
         if(name.startsWith("EPSG_")) {
             // srs and zoomlevel level
@@ -80 +78 @@
         } else {
             int tmp = findZoomLevel(name);
-            if(tmp < zoomStart || tmp > zoomStop) {
+            if(tmp <= zoomStart || tmp >= zoomStop) {
                 return false;
             }
@@ -121 +119 @@
 
             // [2, 5, 5, 6] , why that when we've got 00_05 ?
-            if (x <= box[0] || x >= box[2]) {
+            if (x < box[0] || x > box[2]) {
                 return false;
             }
 
-            if (y <= box[1] || y >= box[3]) {
+            if (y < box[1] || y > box[3]) {
                 return false;
             }
         }
+        
+        System.out.println(dir.getAbsolutePath() + " " + name);
         
         return true;

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

@@ -190 +190 @@
     }
 
+    public int[][] getGridBounds() {
+        int[][] ret = new int[boundsGridLevels.length][boundsGridLevels[0].length];
+        
+        for(int i=0; i<boundsGridLevels.length; i++) {
+            ret[i] = boundsGridLevels[i].clone();
+        }
+        
+        return ret;
+    }
+    
     /**
      * Determines the location in a three dimensional grid based on WMS
@@ -236 +246 @@
         retVals[0] = (int) Math.round(xLoc);
         double absdiff = Math.abs(retVals[0]*tileWidth - xdiff);
-        
-        // This doesn't work too great
-        // http://localhost:8080/geowebcache/service/wms?LAYERS=topp%3Aopen_space&FORMAT=image%2Fpng&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&STYLES=&EXCEPTIONS=application%2Fvnd.ogc.se_inimage&SRS=EPSG%3A900913&BBOX=-8238077.159316406,4955673.447285157,-8218509.280078124,4965241.326523438&WIDTH=256&HEIGHT=256
         if(absdiff > 0.00005 && (absdiff / tileWidth)  > 0.05) {
             throw new BadTileException("Your bounds in the x direction are offset"
@@ -515 +522 @@
     }
     
+    /**
+     * Expands the 2-dim array with bounds to cover complete metatiles
+     * 
+     * Note that these may exceed the bounds of the layer.
+     * 
+     * @param gridBounds
+     * @param reqBounds
+     * @param meta
+     * @return
+     */
+    public static int[][] expandBoundsToMetaTiles(int[][] gridBounds, int[][] reqBounds, int[] meta) {
+        int[][] ret = new int[reqBounds.length][reqBounds[0].length];
+        
+        for (int i = 0; i < reqBounds.length; i++) {
+            // Go down
+            ret[i][0] = (reqBounds[i][0] - (reqBounds[i][0] % meta[0]));
+            ret[i][1] = (reqBounds[i][1] - (reqBounds[i][1] % meta[1]));
+
+            // Go up
+            ret[i][2] = (reqBounds[i][2] - (reqBounds[i][2] % meta[0]) + meta[0] - 1);
+            ret[i][3] = (reqBounds[i][3] - (reqBounds[i][3] % meta[1]) + meta[1] - 1);
+            
+            // Then check against grid
+            //if(ret[i][0] < gridBounds[i][0]) {
+            //    ret[i][0] = 0;
+            //}
+            //if(ret[i][1] < gridBounds[i][1]) {
+            //    ret[i][1] = 0;
+            //}
+            //if(ret[i][2] > gridBounds[i][2]) {
+            //    ret[i][2] = gridBounds[i][2];
+            //}
+            //if(ret[i][3] > gridBounds[i][3]) {
+            //    ret[i][3] = gridBounds[i][3];
+            //}
+        }
+        
+        return ret;
+    }
+    
     public static double[] get900913Resolutions() {
         return GridCalculator.RESOLUTIONS900913;

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

@@ -21 +21 @@
 import org.geowebcache.GeoWebCacheException;
 import org.geowebcache.cache.Cache;
+import org.geowebcache.layer.GridCalculator;
 import org.geowebcache.layer.TileLayer;
 import org.geowebcache.mime.MimeType;
@@ -50 +51 @@
         }
         
+        // Check if MimeType supports metatiling, in which case 
+        // we may have to throw a wider net
+        MimeType mimeType = null;
+        if(req.getMimeFormat() != null && req.getMimeFormat().length() > 0) {
+            mimeType = MimeType.createFromFormat(req.getMimeFormat());
+            
+            int[] metaFactors = tl.getMetaTilingFactors();
+            
+            int gridBounds[][] = tl.getGrid(req.getSRS()).getGridCalculator().getGridBounds();
+            
+            if(metaFactors[0] > 1 || metaFactors[1] > 1
+                    && mimeType.supportsTiling()) {
+                bounds = GridCalculator.expandBoundsToMetaTiles(gridBounds, bounds, metaFactors);
+            }
+        }
+        
         cache.truncate(tl, req.getSRS(), 
                 req.getZoomStart(), req.getZoomStop(), 
-                bounds, MimeType.createFromFormat(req.getMimeFormat()));
+                bounds, mimeType);
     }