Changeset 2091

Timestamp:

12/22/06 13:35:04 (2 years ago)

Author:

crschmidt

Message:

Commit a number of improvements to grid handling from #449. This adds
support for buffer:0 on grids, and includes changes to Remove extra
rows and columns from the grid in _initTiles when reusing an existing
grid, which is a fix to #357 and #436.

Files:

• trunk/openlayers/lib/OpenLayers/Layer/Grid.js (modified) (4 diffs)
• trunk/openlayers/lib/OpenLayers/Tile.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Tile/Image.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Tile/WFS.js (modified) (1 diff)
• trunk/openlayers/tests/test_Tile_Image.html (modified) (4 diffs)

trunk/openlayers/lib/OpenLayers/Layer/Grid.js

@@ -108 +108 @@
-                this._initTiles();
-            } else {
+                var buffer = (this.buffer) ? this.buffer*1.5 : 1;
-                while (true) {
-                    var tlLayer = this.grid[0][0].position;
-                    var tlViewPort = 
-                        this.map.getViewPortPxFromLayerPx(tlLayer);
-this.
+
-                        this.shiftColumn(true);
-this.
+
-                        this.shiftColumn(false);
-this.
+
-                        this.shiftRow(true);
-this.
+
-                        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();
+                            }
+                        }
+                    }
-                }
-            }
@@ -154 +166 @@
-     */
-    _initTiles:function() {
+        
+        // work out mininum number of rows and columns; this is the number of
+        // tiles required to cover the viewport plus one for panning
-        var viewSize = this.map.getSize();
+        var minRows = Math.ceil(viewSize.h/this.tileSize.h) + 1;
+        var minCols = Math.ceil(viewSize.w/this.tileSize.w) + 1;
+        
-        var bounds = this.map.getExtent();
-        var extent = this.map.getMaxExtent();
@@ -217 +235 @@
-                tileoffsetlon += tilelon;       
-                tileoffsetx += this.tileSize.w;
-
-
+
+
+
-            tileoffsetlat -= tilelat;
-            tileoffsety += this.tileSize.h;
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        //now actually draw the tiles
-        this.spiralTileLoad();
@@ -326 +363 @@
-                var row = this.grid[iRow];
-                for(var iCol=0; iCol < row.length; iCol++) {
-OpenLayers.Util.clearArray(row[iCol]
+row[iCol].destroy(
-                }
+            this.grid = [];
-            }
-        }

trunk/openlayers/lib/OpenLayers/Tile.js

@@ -70 +70 @@
-    */
-    draw:function() {
-
+
+
+
+
+
+
-    },
-    

trunk/openlayers/lib/OpenLayers/Tile/Image.js

@@ -44 +44 @@
-     */
-    draw:function() {
-
-
+
+
+
+
+
+
-        if (this.imgDiv == null) {
-            this.initImgDiv();
-        }
-
-
+
+
+
+
+
+
+
+
+
+
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-    },
-

trunk/openlayers/lib/OpenLayers/Tile/WFS.js

@@ -58 +58 @@
-     */
-    draw:function() {
-this.drawn
-this.clear();
+!OpenLayers.Tile.prototype.draw.apply(this, arguments)
+return false;    
-        }
-
-
-
-
-
+
+
+
-    },
-

trunk/openlayers/tests/test_Tile_Image.html

@@ -74 +74 @@
-        tile = new OpenLayers.Tile.Image(layer, position, new OpenLayers.Bounds(-185,-90,-180,90), url, size);
-        tile.draw()
-.src, ""
+, null
-        tile = new OpenLayers.Tile.Image(layer, position, new OpenLayers.Bounds(-181,-91,180,90), url, size);
-        tile.draw()
@@ -145 +145 @@
-    } 
-    function test_04_Tile_Image_Display_After_Move(t) {
-3
+2
-        var position = new OpenLayers.Pixel(20,30);
-        var bounds = new OpenLayers.Bounds(1,2,3,4);
@@ -158 +158 @@
-        tile.draw();
-        tile.moveTo(new OpenLayers.Bounds(-185,-90,-180,-80), new OpenLayers.Pixel(-180,-85), true);
-.style.display, 'none', "Tile display is set to none
+, null, "Tile imgDiv is null
-        var layer = new OpenLayers.Layer.WMS( "OpenLayers WMS", 
-            "http://labs.metacarta.com/wms/vmap0?", {layers: 'basic'}, {'alpha':true});
@@ -165 +165 @@
-        tile.draw();
-        tile.moveTo(new OpenLayers.Bounds(-185,-90,-180,-80), new OpenLayers.Pixel(-180,-85), true)
-
-
+
-        
-    }