From c07709803c3670c13a54ab48eb13174415babe68 Mon Sep 17 00:00:00 2001
From: Hannes Janetzek <hannes.janetzek@gmail.com>
Date: Tue, 1 Oct 2013 23:17:14 +0200
Subject: [PATCH] fix animateToBBox

---
 vtm/src/org/oscim/map/MapAnimator.java | 27 ++++++++++++++++----------
 vtm/src/org/oscim/map/Viewport.java    |  7 +------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/vtm/src/org/oscim/map/MapAnimator.java b/vtm/src/org/oscim/map/MapAnimator.java
index f1d3e725..eb247091 100644
--- a/vtm/src/org/oscim/map/MapAnimator.java
+++ b/vtm/src/org/oscim/map/MapAnimator.java
@@ -24,6 +24,7 @@ public class MapAnimator {
 	private final int ANIM_MOVE = 1 << 0;
 	private final int ANIM_SCALE = 1 << 1;
 	private final int ANIM_FLING = 1 << 2;
+	private final int ANIM_BBOX = 1 << 3;
 
 	private final Map mMap;
 	private final Viewport mViewport;
@@ -58,6 +59,8 @@ public class MapAnimator {
 		double newScale = Math.min(zx, zy);
 
 		animateTo(500, bbox.getCenterPoint(), newScale, false);
+
+		mState = ANIM_MOVE | ANIM_SCALE | ANIM_BBOX;
 	}
 
 	public synchronized void animateTo(long duration, GeoPoint geoPoint, double scale,
@@ -75,9 +78,7 @@ public class MapAnimator {
 		scale = FastMath.clamp(scale, Viewport.MIN_SCALE, Viewport.MAX_SCALE);
 		mDeltaPos.scale = scale;
 
-		scale = (float) (scale / mPos.scale);
-
-		mScaleBy = mPos.scale * scale - mPos.scale;
+		mScaleBy = scale - mPos.scale;
 
 		mStartPos.scale = mPos.scale;
 		mStartPos.angle = mPos.angle;
@@ -87,6 +88,7 @@ public class MapAnimator {
 
 		mDeltaPos.x = MercatorProjection.longitudeToX(geoPoint.getLongitude());
 		mDeltaPos.y = MercatorProjection.latitudeToY(geoPoint.getLatitude());
+
 		mDeltaPos.x -= mStartPos.x;
 		mDeltaPos.y -= mStartPos.y;
 
@@ -107,9 +109,7 @@ public class MapAnimator {
 		scale = FastMath.clamp(scale, Viewport.MIN_SCALE, Viewport.MAX_SCALE);
 		mDeltaPos.scale = scale;
 
-		scale = (float) (scale / mPos.scale);
-
-		mScaleBy = mPos.scale * scale - mPos.scale;
+		mScaleBy = scale - mPos.scale;
 
 		mStartPos.scale = mPos.scale;
 		mStartPos.angle = mPos.angle;
@@ -186,8 +186,8 @@ public class MapAnimator {
 			if (millisLeft <= 0) {
 				// set final position
 				if ((mState & ANIM_MOVE) != 0)
-					mViewport.moveInternal(mStartPos.x + mDeltaPos.x,
-					                       mStartPos.y + mDeltaPos.y);
+					mViewport.moveTo(mStartPos.x + mDeltaPos.x,
+					                 mStartPos.y + mDeltaPos.y);
 
 				if ((mState & ANIM_SCALE) != 0) {
 					if (mScaleBy > 0)
@@ -213,11 +213,18 @@ public class MapAnimator {
 			}
 
 			if ((mState & ANIM_MOVE) != 0) {
-				mViewport.moveInternal(mStartPos.x + mDeltaPos.x * adv,
-				                       mStartPos.y + mDeltaPos.y * adv);
+				mViewport.moveTo(mStartPos.x + mDeltaPos.x * adv,
+				                 mStartPos.y + mDeltaPos.y * adv);
 				changed = true;
 			}
 
+			if ((mState & ANIM_BBOX) != 0) {
+				if (mPos.angle > 180)
+					mPos.angle -= 360;
+				mViewport.setRotation(mPos.angle * (1 - adv));
+				mViewport.setTilt(mPos.tilt * (1 - adv));
+			}
+
 			if ((mState & ANIM_FLING) != 0) {
 				adv = (float) Math.sqrt(adv);
 				double dx = mVelocity.x * adv;
diff --git a/vtm/src/org/oscim/map/Viewport.java b/vtm/src/org/oscim/map/Viewport.java
index 6a6cc86d..76e2b8ea 100644
--- a/vtm/src/org/oscim/map/Viewport.java
+++ b/vtm/src/org/oscim/map/Viewport.java
@@ -401,12 +401,7 @@ public class Viewport {
 	}
 
 	/* used by MapAnimator */
-	void moveInternal(double mx, double my) {
-		Point p = applyRotation(mx, my);
-		moveTo(p.x, p.y);
-	}
-
-	private void moveTo(double x, double y) {
+	void moveTo(double x, double y) {
 		mPos.x = x;
 		mPos.y = y;