Changeset 599

Timestamp:

07/16/08 12:57:21 (2 months ago)

Author:

tom

Message:

BIG CHANGES in tom-tweenlite branch, to allow zooming around arbitrary points... MapEvent?.panDelta may be broken while zooming, but it's worth it I promise

Files:

• branches/tom-tweenlite/lib/com/modestmaps/core/Coordinate.as (modified) (1 diff)
• branches/tom-tweenlite/lib/com/modestmaps/core/MarkerClip.as (modified) (2 diffs)
• branches/tom-tweenlite/lib/com/modestmaps/core/TileGrid.as (modified) (31 diffs)
• branches/tom-tweenlite/lib/com/modestmaps/extras/ZoomSlider.as (added)
• branches/tom-tweenlite/lib/com/modestmaps/Map.as (modified) (12 diffs)
• branches/tom-tweenlite/lib/com/modestmaps/mapproviders/AbstractMapProvider.as (modified) (2 diffs)
• branches/tom-tweenlite/lib/com/modestmaps/TweenMap.as (modified) (11 diffs)
• branches/tom-tweenlite/samples/as3/ModestMapsSample.as (modified) (6 diffs)

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

@@ -11 +11 @@
-            public var zoom:Number;
-            
-            public static const MAX_ZOOM:Number = 20;
-        
-            public function Coordinate(row:Number, column:Number, zoom:Number)
-            {

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

@@ -262 +262 @@
-            protected function onMapPanned(event:MapEvent):void
-            {
-
+
+
+
+
+
+
-                    x = starting.x + event.panDelta.x;
-                    y = starting.y + event.panDelta.y;
-                }
-                else {
+                        // TODO: this shouldn't really ever happen, and the following might not work:
-                    x = event.panDelta.x;
-                    y = event.panDelta.y;                   
@@ -295 +301 @@
-                     */ 
-                    dirty = true;
-// 
+
-            }
-            

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

@@ -27 +27 @@
-                // we need a reference to our map for createTile() only, 
-                // slightly messy but better than a whole TileFactory hierarchy!
+                // TODO: can we just use a function? how would TweenMap override it?
-                private var map:Map;
-
@@ -39 +40 @@
-                protected var minTx:Number, maxTx:Number, minTy:Number, maxTy:Number;
-
-
-protected var _panX:Number;
-protected var _panY:Number;
-protected var _scale:Number;
-
+ etc are stored in here
+// NB: this matrix is never applied to a DisplayObject's transform
+//     because it would require scaling tile positions to compensate
+//     instead, we adapt its values such that the current zoom level
+//     is approximately scale 1, and positions make sense in screen pixels
-                protected var worldMatrix:Matrix;
+                
+                // this turns screen points into coordinates
-                protected var _invertedMatrix:Matrix; // use lazy getter for this
-                
-
+
+
-                protected var _topLeftCoordinate:Coordinate;
-                protected var _bottomRightCoordinate:Coordinate;
@@ -114 +118 @@
-                protected static const DEFAULT_MAX_TILES_TO_KEEP:int = 256;
-                protected static const DEFAULT_TILE_BUFFER:int = 0;
-fals
+tru
-
-                /** if we don't have a tile at currentZoom, onRender will look for tiles up to 5 levels out.
@@ -155 +159 @@
-                        this.provider = provider;
-
-
-
-
+
-
-                        // from provider:
@@ -180 +182 @@
-
-                        well = new Sprite();
+                        well.doubleClickEnabled = true;
+                        well.mouseEnabled = true;
+                        well.mouseChildren = false;
-                        addChild(well);
-
-
+/* 
-                        worldMatrix.translate(_panX,_panX);
-                        worldMatrix.scale(_scale,_scale);
-
+
+
+
+
+
+
-                        
-                        addEventListener(Event.ADDED_TO_STAGE, onAddedToStage);                 
@@ -229 +239 @@
-                                }
-                                
-_panX.toFixed(3) + " ty: " + _panY.toFixed(3) + " sc: " + _
+tx.toFixed(3) + " ty: " + tx.toFixed(3) + " sc: " + 
-                                                + "\nfps: " + fps.toFixed(0)
-                                                + "\ncurrent child count: " + well.numChildren
@@ -253 +263 @@
-                        if (!dirty || !stage) {
-                                return;
+                        }
+
+                        enforceBounds();
+
+                        if (zooming && panning) {
+                                map.onExtentChanged(map.getExtent());
+                        } 
+                        else if (panning) {
+                                if (startPan) {
+                                        dispatchEvent(new MapEvent(MapEvent.PANNED, new Point(worldMatrix.tx-startPan.x, worldMatrix.ty-startPan.y)));
+                                }                       
+                                else {
+                                        trace("panning but no startPan");
+                                }               
+                        }       
+                        else if (zooming) {
+                        var zoomEvent:MapEvent = new MapEvent(MapEvent.ZOOMED_BY);
+                zoomEvent.zoomDelta = zoomLevel-startZoom;
+                zoomEvent.zoomLevel = zoomLevel;
+                dispatchEvent(zoomEvent);
-                        }
-                        
@@ -476 +506 @@
-                                tile.x = positionCol*provider.tileWidth*positionScaleCompensation;
-                                tile.y = positionRow*provider.tileHeight*positionScaleCompensation;
-
+
+
+
+
-                        }
-                        
@@ -482 +515 @@
-                        // let's make sure we keep them around:
-                        var maxRecentlySeen:int = Math.max(visibleTiles.length,maxTilesToKeep);
-/*                      trace();
-                        trace('visibleTiles', visibleTiles.length);
-                        trace('maxRecentlySeen', maxRecentlySeen);
-                        trace('recentlySeen', recentlySeen.length); */
-                        
-                        // prune cache of already seen tiles if it's getting too big:
@@ -691 +720 @@
-                }       
-                
-=null
+
-                {
-                        prepareForPanning(true);
-globalToLocal(new Point(event.stageX, event.stageY)
+new Point(event.stageX, event.stageY
-                        stage.addEventListener(MouseEvent.MOUSE_MOVE, mouseDragged);
-                        stage.addEventListener(MouseEvent.MOUSE_UP, mouseReleased);
@@ -700 +729 @@
-                }
-
-=null
+
-                {
-                        stage.removeEventListener(MouseEvent.MOUSE_MOVE, mouseDragged);
@@ -713 +742 @@
-                public function mouseDragged(event:MouseEvent):void
-                {
-globalToLocal(new Point(event.stageX, event.stageY)
-_panX += (mousePoint.x - pmouse.x) / _scale
-_panY += (mousePoint.y - pmouse.y) / _scale
+new Point(event.stageX, event.stageY
+tx += mousePoint.x - pmouse.x
+ty += mousePoint.y - pmouse.y
-                        pmouse = mousePoint;
-                        calculateMatrix();
-                        var origin:Point = startPan || new Point(_panX,_panY);
-                        dispatchEvent(new MapEvent(MapEvent.PANNED, new Point(-(origin.x-_panX)*_scale, -(origin.y-_panY)*_scale)));
-                        event.updateAfterEvent();
-                }       
-
-                private function calculateMatrix():void
-                {
-                        // first, simply do what was asked:
-                        worldMatrix.identity();
-                        worldMatrix.translate(_panX,_panY);
-                        worldMatrix.scale(_scale,_scale);
-                        worldMatrix.translate(mapWidth/2, mapHeight/2);
-                        
-                        // nullify things that will be recalculated as needed
-                        _invertedMatrix = null;
-                        _topLeftCoordinate = null;
-                        _bottomRightCoordinate = null;
-
-                        // enforce map bounds?
-                        if (enforceBounds()) {
-                                // try again!
-                                worldMatrix.identity();
-                                worldMatrix.translate(_panX,_panY);
-                                worldMatrix.scale(_scale,_scale);
-                                worldMatrix.translate(mapWidth/2, mapHeight/2);                         
-
-                                // nullify things that will be recalculated as needed
-                                _invertedMatrix = null;
-                                _topLeftCoordinate = null;
-                                _bottomRightCoordinate = null;
-                        }
-                        
-                        // and request a redraw:
-                        dirty = true;
-                }
-                                                
-                // today is all about lazy evaluation
-calculateMatrix
+'dirty = true'
-                // and only calculated again if you need it
-                protected function get invertedMatrix():Matrix
@@ -762 +757 @@
-                                _invertedMatrix = worldMatrix.clone();
-                                _invertedMatrix.invert();
+                                _invertedMatrix.scale(scale/provider.tileWidth, scale/provider.tileHeight);
-                        }
-                        return _invertedMatrix;
@@ -774 +770 @@
-                        if (!_topLeftCoordinate) {
-                                var tl:Point = invertedMatrix.transformPoint(new Point());
-                                tl.x *= _scale/provider.tileWidth;
-                                tl.y *= _scale/provider.tileHeight;
-                                _topLeftCoordinate = new Coordinate(tl.y, tl.x, zoomLevel);                     
-                        }
@@ -789 +783 @@
-                        if (!_bottomRightCoordinate) {
-                                var br:Point = invertedMatrix.transformPoint(new Point(mapWidth, mapHeight));
-                                br.x *= _scale/provider.tileWidth;
-                                br.y *= _scale/provider.tileHeight;
-                                _bottomRightCoordinate = new Coordinate(br.y, br.x, zoomLevel);                 
-                        }
@@ -805 +797 @@
-                {
-                        var c:Point = invertedMatrix.transformPoint(new Point(mapWidth/2, mapHeight/2));
-                        c.x *= _scale/provider.tileWidth;
-                        c.y *= _scale/provider.tileHeight;
-                        return new Coordinate(c.y, c.x, zoomLevel);                     
-                }
@@ -842 +832 @@
-                        
-                        var p:Point = invertedMatrix.transformPoint(point);
-_scale*p.y/provider.tileHeight, _scale*p.x/provider.tileWidth
+p.y, p.x
-                }
-                
@@ -855 +845 @@
-                                }
-                        }
-_panX,_panY
+tx, ty
-                        panning = true;
-                        dispatchEvent(new MapEvent(MapEvent.START_PANNING));
@@ -874 +864 @@
-                public function prepareForZooming():void
-                {
+                        //trace(getTimer(), 'TileGrid.prepareForZooming');
-                        if (startZoom >= 0) {
-                                doneZooming();
@@ -886 +877 @@
-                public function doneZooming():void
-                {
+                        //trace(getTimer(), 'TileGrid.doneZooming');
-                        startZoom = -1;
-                        zooming = false;
@@ -895 +887 @@
-                public function resetTiles(coord:Coordinate, point:Point):void
-                {
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-                        // reset the worldMatrix
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-                }
-
-                public function get zoomLevel():Number
-                {
-_
+
-                }
-
@@ -950 +912 @@
-                    if (zoomLevel != n)
-                    {
-
-
-
-
-
-
+
-            }
-                }
@@ -961 +918 @@
-                public function get scale():Number
-                {
-_scale
+Math.sqrt(worldMatrix.a * worldMatrix.a + worldMatrix.b * worldMatrix.b)
-                }
-
@@ -968 +925 @@
-                    if (scale != n)
-                    {
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                    }
-                }
@@ -984 +948 @@
-                    if (mapWidth != p.x || mapHeight != p.y)
-                    {
+                        var dx:Number = p.x - mapWidth;
+                        var dy:Number = p.y - mapHeight;
+                        
+                        // maintain the center point:
+                        tx += dx/2;
+                        ty += dy/2;
+                        
-                        mapWidth = p.x;
-                        mapHeight = p.y;
-                scrollRect = new Rectangle(0, 0, mapWidth, mapHeight);
-
+
+
+
-                        // force this but only for onResize
-                        onRender();
@@ -1060 +1033 @@
-                }
-                
-calculateMatrix
+onRender
-                 *  don't use setters inside of here to correct values otherwise we'll get stuck in a loop! */
-
+ 
-                {
-                        if (!enforceBoundsEnabled) {
@@ -1068 +1041 @@
-                        }
-                        
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-                        
-                        var touched:Boolean = false;
@@ -1088 +1058 @@
-                        if (rightX-leftX > maxTx-minTx) {
-                                //trace("CENTERING X");
-
+
+
-                                touched = true;
-                        }
-                        else if (leftX < minTx) {
-                                //trace("TOO LEFT");
-
+
+
-                                touched = true;
-                        }
-                        else if (rightX > maxTx) {
-                                //trace("TOO RIGHT");
-
+
+
-                                touched = true;
-  
+
-
-                        var upY:Number = tl.row * provider.tileHeight;
@@ -1107 +1080 @@
-                        if (downY-upY > maxTy-minTy) {
-                                //trace("CENTERING Y");
-
+
+
-                                touched = true;
-                        }
-                        else if (upY < minTy) {
-                                //trace("TOO HIGH");
-
+
+
-                                touched = true;
-                        }
-                        else if (downY > maxTy) {
-                                //trace("TOO LOW");
-
+
+
-                                touched = true;
-                        } 
-
+                        if (touched) {
+                                _invertedMatrix = null;
+                                _topLeftCoordinate = null;
+                                _bottomRightCoordinate = null;                          
+                        }
+
-                        //trace("bounds of visible map area: ", leftX, rightX, upY, downY);
-
-                        return touched;                 
-                }
-
-                override public function set doubleClickEnabled(enabled:Boolean):void
-                {
-                        if (enabled) {
-                                well.doubleClickEnabled = true;
-                                well.mouseEnabled = true;
-                                well.mouseChildren = false;
-                        }
-                        else {
-                                well.doubleClickEnabled = false;
-                        }
-                        super.doubleClickEnabled = false;
-                }
-                
@@ -1144 +1113 @@
-                        if (d) {
-                                if (stage) stage.invalidate();
+                                
+                                _invertedMatrix = null;
+                                _topLeftCoordinate = null;
+                                _bottomRightCoordinate = null;                  
-                        }
-                }
@@ -1151 +1124 @@
-                        return _dirty;
-                }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-        

branches/tom-tweenlite/lib/com/modestmaps/Map.as

@@ -39 +39 @@
-        import flash.events.MouseEvent;
-        import flash.external.ExternalInterface;
+        import flash.geom.Matrix;
-        import flash.geom.Point;
-        import flash.geom.Rectangle;
@@ -91 +92 @@
-            * @see com.modestmaps.core.TileGrid
-            */
-p
+mapP
-            {
-                if (!Reactor.running())
@@ -100 +101 @@
-                }
-
-
-
-
+
+
+
+
+
-
-                        // initialize the grid (so point/location/coordinate functions should be valid after this)
@@ -140 +143 @@
-                else {
-                        var extent:MapExtent = new MapExtent(85, -85, 180, -180);
-                        //setExtent(extent);
-                        
-                        var l1:Location = mapProvider.coordinateLocation(mapProvider.outerLimits()[0]);
@@ -157 +159 @@
-                                        extent.east = l2.lon;
-                                }
-                                
-                                //trace(extent);                        
-
-                        setExtent(extent);                      
@@ -307 +307 @@
-                var centerCoord:Coordinate = (new Coordinate(centerRow, centerColumn, centerZoom)).zoomTo(initZoom);
-                
+                trace("centering on", centerCoord);
+                
-                return coordinatePosition(centerCoord);
-                }
@@ -502 +504 @@
-                if (!grid.panning && !grid.zooming) {
-                        grid.prepareForPanning();
-panY = grid.panY+(mapHeight*panFraction/grid.scale
+ty += (mapHeight*panFraction
-                    grid.donePanning();
-                }
@@ -512 +514 @@
-                if (!grid.panning && !grid.zooming) {
-                        grid.prepareForPanning();
-panY = grid.panY-(mapHeight*panFraction/grid.scale
+ty -= (mapHeight*panFraction
-                    grid.donePanning();
-                }
@@ -522 +524 @@
-                if (!grid.panning && !grid.zooming) {
-                        grid.prepareForPanning();
-panX = grid.panX+(mapWidth*panFraction/grid.scale
+tx += (mapWidth*panFraction
-                    grid.donePanning();
-                }
@@ -532 +534 @@
-                if (!grid.panning && !grid.zooming) {
-                        grid.prepareForPanning();
-panX = grid.panX-(mapWidth*panFraction/grid.scale
+tx -= (mapWidth*panFraction
-                    grid.donePanning();
-                }
-            }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+