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

Timestamp:

08/21/08 15:25:34 (5 months ago)

Author:

arneke

Message:

Tons of minor tweaks and fixes. Separated out the XStream stuff a bit more. Cleaned up dependencies.

Files:

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

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

@@ -26 +26 @@
 
     // We may want to change this later
-    private static final int TILEPIXELS = 256;
+    public static final int TILEPIXELS = 256;
     
     //private BBOX gridBounds = null;
     private Grid grid;
     
-    public final static double[] RESOLUTIONS4326 = 
+    // The following are created to save memory. 
+    // Note that they can be modified by external code -> not 100% safe!
+    protected final static double[] RESOLUTIONS4326 = 
         GridCalculator.getResolutionArray(180.0, TILEPIXELS, 26);
     
-    public final static double[] RESOLUTIONS900913 = 
+    protected final static double[] RESOLUTIONS900913 = 
         GridCalculator.getResolutionArray(20037508.34*2,TILEPIXELS, 26);
     
@@ -248 +250 @@
 
         // Get the bounds
-        BBOX layerBounds = grid.bounds;
+        //BBOX layerBounds = grid.bounds;
         BBOX gridBounds = grid.gridBounds;
         
@@ -499 +501 @@
         
         while (low <= high) {
-            int mid = (low + high) / 2;
+            int mid = (low + high) >>> 1;
             
             if(resolutions[mid] > reqUpper) {
@@ -528 +530 @@
     }
     
+    public static double[] get900913Resolutions() {
+        return GridCalculator.RESOLUTIONS900913;
+    }
+    
+    public static double[] get4326Resolutions() {
+        return GridCalculator.RESOLUTIONS4326;
+    }
+    
 }