Changeset 601

Timestamp:

07/16/08 13:56:25 (2 months ago)

Author:

tom

Message:

slowly refactoring load queue in TileGrid in tween branch

Files:

• branches/tom-tweenlite/lib/com/modestmaps/core/TileGrid.as (modified) (12 diffs)

branches/tom-tweenlite/lib/com/modestmaps/core/TileGrid.as

@@ -60 +60 @@
-                protected var provider:IMapProvider;
-
-
-
+
-                
-                // per-tile, the number of images we're expecting to load
@@ -83 +82 @@
-                // currently visible tiles
-                protected var visibleTiles:Array = [];
-
-
-
-
+
-                // number of tiles we're failing to show
-                protected var blankCount:int = 0;
@@ -119 +115 @@
-                protected static const DEFAULT_TILE_BUFFER:int = 0;
-                protected static const DEFAULT_ENFORCE_BOUNDS:Boolean = true;
+                protected static const DEFAULT_MAX_OPEN_REQUESTS:int = 4;
-
-                /** if we don't have a tile at currentZoom, onRender will look for tiles up to 5 levels out.
@@ -135 +132 @@
-                // 0 or 1, really: 2 will load *lots* of extra tiles
-                public var tileBuffer:int = DEFAULT_TILE_BUFFER;
+                
+                // how many Loaders are allowed to be open at once?
+                public var maxOpenRequests:int = DEFAULT_MAX_OPEN_REQUESTS;
-
-                // set this to true to enable enforcing of map bounds from the map provider's limits
@@ -158 +158 @@
-                        this.draggable = draggable;
-                        this.provider = provider;
+
+                        this.tileQueue = new TileQueue();
-
-                        doubleClickEnabled = true;
@@ -235 +237 @@
-                                                + "\ncurrent child count: " + well.numChildren
-                                                + "\nvisible tile count: " + visibleTiles.length
-q
+tileQ
-                                                + "\nblank count: " + blankCount
-                                                + "\nrequests: " + openRequests.length
@@ -352 +354 @@
-                                                        // keep a local copy of the URLs so we don't have to call this twice: 
-                                                        layersNeeded[tile] = provider.getTileUrls(coord);
-q
+tileQ
-                                                }
-                                                else {
@@ -527 +529 @@
-                {
-                        // prepare the queue
-MAX_OPEN_REQUESTS && q
+maxOpenRequests && tileQ
-
-                                // prune queue for tiles that aren't visible
-
-
-
+
-                                
-                                // note that queue is not the same as visible tiles, because things 
@@ -539 +539 @@
-        
-                                // sort queue by distance from 'center'
-queue = queue.sort
+tileQueue.sortTiles
-                        }
-                        
-                        // process the queue
-MAX_OPEN_REQUESTS && q
-queue.shift() as Tile
+maxOpenRequests && tileQ
+tileQueue.shift()
-                                // if it's still on the stage:
-                                if (tile.parent) {
@@ -598 +598 @@
-                {
-                        if (t1.zoom == t2.zoom && t1.zoom == currentZoom && t2.zoom == currentZoom) {
--centerRow,2) + Math.pow(t1.column
--centerRow,2) + Math.pow(t2.column
++0.5-centerRow,2) + Math.pow(t1.column+0.5
++0.5-centerRow,2) + Math.pow(t2.column+0.5
-                                return d1 < d2 ? -1 : d1 > d2 ? 1 : 0; 
-                        }
@@ -982 +982 @@
-                        openRequests = [];
-                        recentlySeen = [];
-queue = []
+tileQueue.clear()
-                        
-                        dirty = true;
@@ -1154 +1154 @@
-}
-
+import com.modestmaps.core.Tile;        
+
+class TileQueue
+{
+        // Tiles we want to load:
+        protected var queue:Array;
+        
+        public function TileQueue()
+        {
+                queue = [];
+        }
+        
+        public function get length():Number 
+        {
+                return queue.length;
+        }
+        
+        public function push(tile:Tile):void
+        {
+                queue.push(tile);
+        }
+        
+        public function shift():Tile
+        {
+                return queue.shift() as Tile;
+        }
+        
+        public function sortTiles(callback:Function):void
+        {
+                queue = queue.sort(callback);
+        }
+        
+        public function retainAll(tiles:Array):void
+        {
+                var tilesToKeep:Array = tiles; 
+                queue = queue.filter(function(tile:Tile, i:int, a:Array):Boolean {
+                        return tilesToKeep.indexOf(tile) >= 0;
+                });             
+                tilesToKeep = null;
+        }
+        
+        public function clear():void
+        {
+                queue = [];
+        }
+        
+}
+