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

fix animateZoom

Browse Source
This commit is contained in:
Hannes Janetzek 2013-06-28 03:58:11 +02:00
parent 85389dce85
commit fb25006b5a
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
vtm/src/org/oscim/view/MapViewPosition.java
View File

@ -700,7 +700,7 @@ public class MapViewPosition {
public synchronized void animateFling(int velocityX, int velocityY, public synchronized void animateFling(int velocityX, int velocityY,
int minX, int maxX, int minY, int maxY) { int minX, int maxX, int minY, int maxY) {
if (velocityX * velocityX + velocityY * velocityY < 4096) if (velocityX * velocityX + velocityY * velocityY < 2048)
return; return;
mScrollX = 0; mScrollX = 0;
@ -722,9 +722,21 @@ public class MapViewPosition {
} }
public synchronized void animateZoom(float scale) { public synchronized void animateZoom(float scale) {
mStartScale = mAbsScale; animateZoom(scale, 300);
mEndScale = mAbsScale * scale - mAbsScale; }
animStart(300);
public synchronized void animateZoom(float scale, int duration) {
if (mAnimEnd > 0 && mAnimScale){
mEndScale = (mEndScale + mStartScale) * scale - (mAbsScale);
mStartScale = mAbsScale;
} else{
mStartScale = mAbsScale;
mEndScale = mAbsScale * scale - mAbsScale;
}
mAnimFling = false;
mAnimMove = false;
mAnimScale = true;
animStart(duration);
} }
/** /**