Changeset 424

Timestamp:

11/13/08 05:45:17 (8 weeks ago)

Author:

arneke

Message:

Fixed code for truncation

Location:

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

Files:

• cache/Cache.java (modified) (1 diff)
• cache/file/FileCache.java (modified) (4 diffs)
• cache/file/FilePathKey2Filter.java (modified) (3 diffs)
• rest/TruncateTask.java (modified) (4 diffs)
• service/kml/KMLDebugGridLayer.java (modified) (1 diff)

trunk/geowebcache/src/main/java/org/geowebcache/cache/Cache.java

@@ -70 +70 @@
     throws CacheException, GeoWebCacheException;
 
-    public void truncate(TileLayer tl, SRS srs, int zoomStart, int zoomStop, 
+    public int truncate(TileLayer tl, SRS srs, int zoomStart, int zoomStop, 
             int[][] bounds, MimeType mimeType) throws CacheException;
     

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

@@ -293 +293 @@
     }
 
-    public void truncate(TileLayer tl, SRS srs, int zoomStart, int zoomStop,
+    public int truncate(TileLayer tl, SRS srs, int zoomStart, int zoomStop,
             int[][] bounds, MimeType mimeType) throws CacheException {
 
+        int count = 0;
+        
         String prefix = tl.getCachePrefix();
 
@@ -314 +316 @@
                     for (File tile : tiles) {
                         tile.delete();
+                        count++;
                     }
 
@@ -319 +322 @@
                     if (chk == null || chk.length == 0) {
                         imd.delete();
+                        count++;
                     }
                 }
@@ -325 +329 @@
                 if (chk == null || chk.length == 0) {
                     srsZoom.delete();
-                }
-
-            }
-
+                    count++;
+                }
+
+            }
+            
+            return count;
+            
         } else {
             throw new CacheException(prefix

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

@@ -78 +78 @@
         } else {
             int tmp = findZoomLevel(name);
-            if(tmp <= zoomStart || tmp >= zoomStop) {
+            if(tmp < zoomStart || tmp > zoomStop) {
                 return false;
             }
@@ -118 +118 @@
             int[] box = bounds[zoomLevel];
 
-            // [2, 5, 5, 6] , why that when we've got 00_05 ?
+            
             if (x < box[0] || x > box[2]) {
                 return false;
@@ -128 +128 @@
         }
         
-        System.out.println(dir.getAbsolutePath() + " " + name);
+        //System.out.println(dir.getAbsolutePath() + " " + name);
         
         return true;

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

@@ -17 +17 @@
 package org.geowebcache.rest;
 
+import java.util.Arrays;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -33 +35 @@
     private final TileLayer tl;
     
+    private final static double[] nullBbox = {0.0,0.0,0.0,0.0};
+    
     public TruncateTask(SeedRequest req, TileLayer tl) {
         this.req = req;
@@ -43 +47 @@
         
         Cache cache = tl.getCache();
-        
-        BBOX bbox = req.getBounds();
+
         int[][] bounds = null;
         
-        if(bbox != null) {
-            bounds = tl.getCoveredGridLevels(req.getSRS(), bbox);
+        if(! Arrays.equals(req.getBounds().coords, nullBbox)) {
+            bounds = tl.getCoveredGridLevels(req.getSRS(), req.getBounds());
         }
         
@@ -54 +57 @@
         // we may have to throw a wider net
         MimeType mimeType = null;
-        if(req.getMimeFormat() != null && req.getMimeFormat().length() > 0) {
+        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);
+
+            if (bounds != null) {
+                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(), 
+        int count = cache.truncate(tl, req.getSRS(), 
                 req.getZoomStart(), req.getZoomStop(), 
                 bounds, mimeType);
+        log.info("Completed truncating " + count + " tiles");
     }
 

trunk/geowebcache/src/main/java/org/geowebcache/service/kml/KMLDebugGridLayer.java

@@ -387 +387 @@
 
 
-    public void truncate(TileLayer tl, SRS srs, int zoomStart, int zoomStop,
+    public int truncate(TileLayer tl, SRS srs, int zoomStart, int zoomStop,
             int[][] bounds, MimeType mimeType) throws CacheException {
         // TODO Auto-generated method stub
-        
+        return 0;
     }