Changeset 602

Timestamp:

07/16/08 16:16:14 (2 months ago)

Author:

tom

Message:

more refactoring to TileGrid in tween branch

Files:

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

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

@@ -30 +30 @@
-                private var map:Map;
-
-provider.tileWidth and provider.
+tileWidth and 
-        // this was needed for the NASA DailyPlanetProvider which has 512x512px tiles
-                // public static const TILE_WIDTH:Number = 256;
-                // public static const TILE_HEIGHT:Number = 256;        
-        
-
-
+
+
+
-
-                protected var minTx:Number, maxTx:Number, minTy:Number, maxTy:Number;
+
+                // read-only, convenience for tileWidth/Height
+                protected var _tileWidth:Number;
+                protected var _tileHeight:Number;
+
-
-                // pan and zoom etc are stored in here
@@ -94 +100 @@
-
-                // what zoom level of tiles is 'correct'?
-
+_
-                // so we know if we're going in or out
-                protected var previousZoom:int;         
@@ -158 +164 @@
-                        this.draggable = draggable;
-                        this.provider = provider;
+
+                        _tileWidth = provider.tileWidth;
+                        _tileHeight = provider.tileHeight;
-
-                        this.tileQueue = new TileQueue();
@@ -286 +295 @@
-                        // TODO deal with what happens with non-square projections!
-                        var worldMin:Point = worldMatrix.transformPoint(new Point(0,0));
-provider.tileWidth, provider.
+tileWidth, 
-
-                        // what zoom level of tiles should we be loading, taking into account min/max zoom?
@@ -299 +308 @@
-                        
-                        // this is the level of tiles we'll be loading:
-
+_
-                
-                        // this is how big the world is, in tiles:
@@ -493 +502 @@
-                                var positionCol:Number = (scaleFactor*tile.column) - realMinCol;
-                                var positionRow:Number = (scaleFactor*tile.row) - realMinRow;
-provider.
-provider.
+
+
-                                
-                                var tileScale:Number = Math.pow(2, zoomLevel-tile.zoom);
-provider.tileWidth) / provider.
+tileWidth) / 
-                                tile.scaleX = tile.scaleY = tileScale;                          
-                        }
@@ -687 +696 @@
-                                        if (tile) {
-                                                delete layersNeeded[tile];
-provider.tileWidth, provider.
+tileWidth, 
-                                                if (tile.zoom == currentZoom) {
-                                                        tile.show();
@@ -738 +747 @@
-                                _invertedMatrix = worldMatrix.clone();
-                                _invertedMatrix.invert();
-provider.tileWidth, scale/provider.
+tileWidth, scale/
-                        }
-                        return _invertedMatrix;
@@ -746 +755 @@
-                        throw new Error("invertedMatrix is read only");
-                }
+
+                /** derived from map provider by calculateBounds(), read-only here for convenience */
+                public function get minZoom():Number
+                {
+                        return _minZoom;
+                }
+                /** derived from map provider by calculateBounds(), read-only here for convenience */
+                public function get maxZoom():Number
+                {
+                        return _maxZoom;
+                }
+
+                /** convenience method for tileWidth */
+                public function get tileWidth():Number
+                {
+                        return _tileWidth;
+                }
+                /** convenience method for tileHeight */
+                public function get tileHeight():Number
+                {
+                        return _tileHeight;
+                }
+
+                /** read-only, this is the level of tiles we'll be loading first */
+                public function get currentZoom():Number
+                {
+                        return _currentZoom;
+                }
+
-
-                public function get topLeftCoordinate():Coordinate
@@ -871 +909 @@
-                        worldMatrix.translate(mapWidth/2, mapHeight/2 );
-                        worldMatrix.translate(point.x, point.y);
-provider.tileWidth*coord.column, -provider.
+tileWidth*coord.column, -
-
-                        // reset the inverted matrix, request a redraw, etc.
@@ -947 +985 @@
-                {
-                        this.provider = provider;
+
+                        _tileWidth = provider.tileWidth;
+                        _tileHeight = provider.tileHeight;
-                        
-                        calculateBounds();
@@ -993 +1034 @@
-                        var br:Coordinate = limits[1] as Coordinate;
-
-
-
+_
+_
-                        
-                        tl = tl.zoomTo(0);
-                        br = br.zoomTo(0);
-
-provider.
-provider.
-provider.
-provider.
+
+
+
+
-                }
-                
@@ -1025 +1066 @@
-                        var br:Coordinate = bottomRightCoordinate.zoomTo(0);
-                        
-provider.
-provider.
+
+
-                        
-                        if (rightX-leftX > maxTx-minTx) {
@@ -1041 +1082 @@
-                        }
-
-provider.
-provider.
+
+
-
-                        if (downY-upY > maxTy-minTy) {