xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: Animator.zoomTo()

Browse Source
This commit is contained in:
Hannes Janetzek 2014-02-16 18:03:02 +01:00
parent 46ad2be83b
commit 5cffe3a3b3
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
vtm/src/org/oscim/map/Animator.java
View File

@ -131,13 +131,14 @@ public class Animator {
public synchronized void animateZoom(long duration, double scaleBy, public synchronized void animateZoom(long duration, double scaleBy,
float pivotX, float pivotY) { float pivotX, float pivotY) {
mMap.getMapPosition(mStartPos); mMap.getMapPosition(mCurPos);
if (mState == ANIM_SCALE) if (mState == ANIM_SCALE)
scaleBy = (mStartPos.scale + mDeltaPos.scale) * scaleBy; scaleBy = (mStartPos.scale + mDeltaPos.scale) * scaleBy;
else else
scaleBy = mStartPos.scale * scaleBy; scaleBy = mCurPos.scale * scaleBy;
mStartPos.copy(mCurPos);
scaleBy = clamp(scaleBy, Viewport.MIN_SCALE, Viewport.MAX_SCALE); scaleBy = clamp(scaleBy, Viewport.MIN_SCALE, Viewport.MAX_SCALE);
mDeltaPos.scale = scaleBy - mStartPos.scale; mDeltaPos.scale = scaleBy - mStartPos.scale;