Changeset 5394

Timestamp:

12/13/07 09:04:49 (1 year ago)

Author:

ianmayo

Message:

Andrew's updated version that allows user to zoom in & out further

Files:

• sandbox/ianmayo/branches/worldwind/openlayers/lib/OpenLayers/Layer/WorldWind.js (modified) (6 diffs)

sandbox/ianmayo/branches/worldwind/openlayers/lib/OpenLayers/Layer/WorldWind.js

@@ -61 +61 @@
-     * be present in a subdirectory named n. eg if the url of the layer is set to file:///home/wwcache/ then worldwind
-     * level 1 data is expected to be found in the directory /home/wwcache/1.
-and checkCache is set in options 
+
-     * of the file 0000/0000_0000.jpg to confirm the presence of the cache files.
-     */
@@ -67 +67 @@
-    
-        this.cacheDir = new Array();
-   
-url.substr(0,7) == 'file://'
-   
+
+(url.substr(0,7) == 'file://')
+
-            var fso = false;
-            var mozFile = false;
-
-options != undefined && options.checkCache
+
+url.substr(0,7) != 'file://'
-                
-                try {
@@ -158 +158 @@
-        var zoom = this.map.getZoom();
-        var extent = this.map.getMaxExtent();
-
+
+
-        return zoom;
-    },
@@ -177 +178 @@
-        var zoom = this.getZoom();
-        var extent = this.map.getMaxExtent();
-this.getZoom(
+Math.min(zoom,this.zoomLevels
-        var x = Math.floor((bounds.left - extent.left)/deg);
-        var y = Math.floor((bounds.bottom - extent.bottom)/deg);
-if (this.map.getResolution() <= (this.lzd/512)
-            && this.getZoom()
+//if (this.map.getResolution() <= (this.lzd/512) && this.getZoom() <= this.zoomLevels) {
+       //if (this.map.getResolution() <= (this.lzd/this.tileSize.w) && zoom
-            return this.getURLForTile(zoom,x,y);
-
-
-
+//
+//
+//
-
-    },
@@ -207 +208 @@
-    */
-    getURLForTile: function(z,x,y) {
+        
+        if(this.map.getResolution() > (this.lzd/this.tileSize.w)) {
+            if(this.adjustTileSizeAndRedraw(512 / (2*(this.getZoomForResolution(this.lzd/512) - this.map.getZoom())))) {
+                return; 
+            }
+        }
+        else if(this.tileSize.w < 512 && (this.map.getResolution() <= (this.lzd/512)) ) {
+            if(this.adjustTileSizeAndRedraw(512)) {
+                return;
+            }
+        }
+        else if(this.tileSize.w > 512 && z <= this.zoomLevels) {
+            if(this.adjustTileSizeAndRedraw(512)) {
+                return;
+            }
+        }
+        else if(this.getZoom() > this.zoomLevels) {
+            if(this.adjustTileSizeAndRedraw(512 * (2*(this.getZoom() - this.zoomLevels)))) {
+                return;
+            }
+        }
+        
+        z = Math.min(z,this.zoomLevels);
-        
-        if(this.cacheDir[z] != undefined) {
@@ -222 +246 @@
-        
-    },
+    
+    adjustTileSizeAndRedraw: function(tileSize) {
+        if(this.tileSize.w != tileSize)  {
+            this.clearGrid();
+            this.tileSize = new OpenLayers.Size(tileSize,tileSize);
+            this.redraw();
+            return true;
+        }
+        return false;
+    },
-
-
-    CLASS_NAME: "OpenLayers.Layer.WorldWind"
-});
-