Changeset 3556

Timestamp:

07/02/07 19:38:36 (1 year ago)

Author:

euzuro

Message:

more tinkering. not finished

Files:

• sandbox/euzuro/untiled/lib/OpenLayers/Layer/Grid.js (modified) (7 diffs)

sandbox/euzuro/untiled/lib/OpenLayers/Layer/Grid.js

@@ -23 +23 @@
-    /** @type Integer */
-    buffer: 2,
+
+    /** @type Float */
+    ratio: 1.5,
-
-    /**
@@ -125 +128 @@
-        OpenLayers.Layer.HTTPRequest.prototype.moveTo.apply(this, arguments);
-        
-
-
-
+
+
-        if (bounds != null) {
-             
+            // if grid is empty or zoom has changed, we *must* re-tile
+            var forceReTile = !this.grid.length || zoomChanged;
+
+            // total bounds of the tiles
+            var tilesBounds = this.getTilesBounds();            
+      
-            if (this.singleTile) {
-
-
-
-
-
+
+
+
+
+
+
+
-                }
-            } else if (!this.grid.length || zoomChanged ||
-                       !this.getGridBounds().containsBounds(bounds, true)) { 
-                this._initTiles();
-            } else {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-                }
-            }
@@ -197 +188 @@
-    /**
-     * @private
-
-
+
+
+
+
-        var mapSize = this.map.getSize();
-  
+        //determine new tile bounds
+        var center = bounds.getCenterLonLat();
+        var tileWidth = bounds.getWidth() * this.ratio;
+        var tileHeight = bounds.getHeight() * this.ratio;
+        var tileBounds = 
+            new OpenLayers.Bounds(center.lon - (tileWidth / 2),
+                                  center.lat - (tileHeight / 2),
+                                  center.lon + (tileWidth / 2),
+                                  center.lat + (tileHeight / 2));
+
+
+
-        var lPX = -(this.buffer*mapSize.w);
-        var bPX = ((this.buffer+1)*mapSize.h);
@@ -216 +221 @@
-        }
-
-
-
+
+
+
+
+
-        } else {
-
-
-
+
+
-    },
-
-    /**
-     * @private
-
-
+
+
+
+
-        
-        // work out mininum number of rows and columns; this is the number of
@@ -235 +244 @@
-        var minCols = Math.ceil(viewSize.w/this.tileSize.w) + 1;
-        
-        var bounds = this.map.getExtent();
-        var extent = this.map.getMaxExtent();
-        var resolution = this.map.getResolution();
@@ -401 +409 @@
-
-    /**
+     * @param {OpenLayers.Bounds} bounds
+     */
+    _moveGriddedTiles: function(bounds) {
+        var buffer = (this.buffer) ? this.buffer*1.5 : 1;
+        while (true) {
+            var tlLayer = this.grid[0][0].position;
+            var tlViewPort = 
+                this.map.getViewPortPxFromLayerPx(tlLayer);
+            if (tlViewPort.x > -this.tileSize.w * (buffer - 1)) {
+                this.shiftColumn(true);
+            } else if (tlViewPort.x < -this.tileSize.w * buffer) {
+                this.shiftColumn(false);
+            } else if (tlViewPort.y > -this.tileSize.h * (buffer - 1)) {
+                this.shiftRow(true);
+            } else if (tlViewPort.y < -this.tileSize.h * buffer) {
+                this.shiftRow(false);
+            } else {
+                break;
+            }
+        };
+        if (this.buffer == 0) {
+            for (var r=0, rl=this.grid.length; r<rl; r++) {
+                var row = this.grid[r];
+                for (var c=0, cl=row.length; c<cl; c++) {
+                    var tile = row[c];
+                    if (!tile.drawn && tile.bounds.intersectsBounds(bounds, false)) {
+                        tile.draw();
+                    }
+                }
+            }
+        }
+    },
+    
+    /**
-     * addTile gives subclasses of Grid the opportunity to create an 
-     * OpenLayer.Tile of their choosing. The implementer should initialize 
@@ -424 +466 @@
-
-        if (this.map != null) {
-
-
+
+
+
+
+
+
+
-    },
-