Changeset 594

Timestamp:

07/07/08 15:34:21 (5 months ago)

Author:

allens

Message:

- made a bunch of TileGrid setters only recalculate the matrix if values change
- tweaked some tween stuff in TweenMap? (namely, pan/zoom durations) and added zoomInAbout() and zoomOutAbout()

Files:

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

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

@@ -910 +910 @@
-                        return _panX;
-                }
+
-                public function set panX(n:Number):void
-                {
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-                public function get panY():Number
-                {
@@ -923 +928 @@
-                public function set panY(n:Number):void
-                {
-
-
-
-
+
+
+
+
+
+
+
-                }
-
@@ -936 +944 @@
-                public function set zoomLevel(n:Number):void
-                {
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-                }
-
@@ -948 +959 @@
-                        return _scale;
-                }
+
-                public function set scale(n:Number):void
-                {
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-                }
-                                
-                public function resizeTo(p:Point):void
-                {
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-                }
-                

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

@@ -131 +131 @@
-                }
-
+        public function panAndZoomOut(location:Location, targetPoint:Point=null):void
+        {
+            // remember where we are so we can zoom *from* here
+            var startX:Number = grid.panX;
+            var startY:Number = grid.panY;
+            var startZoom:Number = grid.zoomLevel;
+
+            // zoom first so that the calculation for location is correct
+            grid.prepareForZooming();
+            grid.zoomLevel = Math.min(grid.maxZoom, Math.ceil(grid.zoomLevel - 1.0)); 
+                    
+            // figure out the pan
+            var p:Point = locationPoint(location,this);
+            if (!targetPoint) targetPoint = new Point(mapWidth/2, mapHeight/2);
+            var pan:Point = targetPoint.subtract(p);
+
+            // now apply the pan
+            grid.prepareForPanning();
+            grid.panX += (pan.x / grid.scale);
+            grid.panY += (pan.y / grid.scale);
+            
+            // now reset and tween here instead         
+            TweenLite.from(grid, panAndZoomDuration, { panY: startY, panX: startX, onComplete: grid.donePanning, ease: panEase });          
+            TweenLite.from(grid, panAndZoomDuration, { zoomLevel: startZoom, onComplete: grid.doneZooming, ease: zoomEase, overwrite: false });
+        }
+
+        public function zoomInAbout(targetPoint:Point, duration:Number=-1):void
+        {
+            zoomByAbout(1, targetPoint, duration);
+        }
+
+        public function zoomOutAbout(targetPoint:Point, duration:Number=-1):void
+        {
+            zoomByAbout(-1, targetPoint, duration);
+        }
+        
+        public function zoomByAbout(zoomDelta:int, targetPoint:Point, duration:Number=-1):void
+        {
+            if (duration < 0) duration = panAndZoomDuration;
+            
+            var location:Location = pointLocation(targetPoint);
+            
+            var startX:Number = grid.panX;
+            var startY:Number = grid.panY;
+            var startZoom:Number = grid.zoomLevel;
+            
+            var zoomed:Boolean = false;
+            var targetZoom:int = Math.max(grid.minZoom, Math.min(grid.maxZoom, grid.zoomLevel + zoomDelta));
+            if (grid.zoomLevel != targetZoom)
+            {
+                grid.zoomLevel = targetZoom;
+                zoomed = true;
+            }
+            
+            // now find the current position of the requested location:
+            var p:Point = locationPoint(location);
+            
+            // now find the pan offset from the target point to the current center
+            var pan:Point = targetPoint.subtract(p);
+            
+            // and move!
+            if (zoomed) grid.prepareForZooming();
+            grid.prepareForPanning();
+
+            grid.panX += (pan.x / grid.scale);
+            grid.panY += (pan.y / grid.scale);
+
+            if (duration > 0)
+            {
+                if (zoomed)
+                    TweenLite.from(grid, duration, {zoomLevel: startZoom,
+                                                    onComplete: grid.doneZooming,
+                                                    ease: zoomEase});
+                TweenLite.from(grid, duration, {panX: startX,
+                                                panY: startY,
+                                                onComplete: grid.donePanning,
+                                                ease: panEase,
+                                                overwrite: false}); 
+            }
+            else
+            {
+                if (zoomed) grid.doneZooming();
+                grid.donePanning();
+            }
+        }
+
-        /** EXPERIMENTAL! */
-
-
+
+
+
-            var position:MapPosition = extentPosition(extent);
-
-            var sc:Number = Math.pow(2, position.coord.zoom);
-
-         
+
-            var tx:Number = -TileGrid.TILE_WIDTH * position.coord.column / sc;
-            var ty:Number = -TileGrid.TILE_HEIGHT * position.coord.row / sc;
@@ -149 +236 @@
-            grid.prepareForPanning();
-
-
-
+
+
+
+
+
+
+
-        }
-
@@ -172 +264 @@
-                override public function panTo(location:Location, forceAnimate:Boolean=false):void
-                {
-
-
-
+
+
+
+
+
-                        var pan:Point = centerPoint.subtract(p);
-                        pan.x /= grid.scale;
-                        pan.y /= grid.scale;
+
-                        // grid.prepareForPanning();
-
-
-
+
+
+
+
+
+
+
+
-                                setCenter(location);
-                        }
@@ -192 +292 @@
-                 * @see com.modestmaps.Map#panTo
-                 */
-
+=null
-                {
-                var pan:Point = new Point(mapWidth/2, mapHeight/2).subtract(locationPoint(location,grid));
@@ -198 +298 @@
-                pan.y /= grid.scale;
-                // grid.prepareForPanning();
-
+
+
+
+
+
-                }
-                
@@ -205 +309 @@
-            override protected function zoomBy(dir:int):void
-            {
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-                    }
-            }