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

make double tap zoom to screen location

Browse Source
This commit is contained in:
Hannes Janetzek 2014-05-04 18:48:41 +02:00
parent d5827de12e
commit 24f699993b
1 changed files with 23 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
vtm/src/org/oscim/layers/MapEventLayer.java
View File

@ -75,14 +75,12 @@ public class MapEventLayer extends Layer implements InputListener, GestureListen
protected static final float MIN_SLOP = 25.4f / 2; protected static final float MIN_SLOP = 25.4f / 2;
/** 100 ms since start of move to reduce fling scroll */ /** 100 ms since start of move to reduce fling scroll */
protected static final float FLING_THREHSHOLD = 100; protected static final float FLING_MIN_THREHSHOLD = 100;
//private final Viewport mViewport;
private final VelocityTracker mTracker; private final VelocityTracker mTracker;
public MapEventLayer(Map map) { public MapEventLayer(Map map) {
super(map); super(map);
//mViewport = map.viewport();
mTracker = new VelocityTracker(); mTracker = new VelocityTracker();
} }
@ -121,6 +119,7 @@ public class MapEventLayer extends Layer implements InputListener, GestureListen
mDoubleTap = false; mDoubleTap = false;
mStartMove = -1; mStartMove = -1;
mDown = true; mDown = true;
mDrag = false;
mPrevX1 = e.getX(0); mPrevX1 = e.getX(0);
mPrevY1 = e.getY(0); mPrevY1 = e.getY(0);
@ -138,34 +137,32 @@ public class MapEventLayer extends Layer implements InputListener, GestureListen
if (action == MotionEvent.ACTION_UP) { if (action == MotionEvent.ACTION_UP) {
mDown = false; mDown = false;
if (mDoubleTap && !mDrag) { if (mDoubleTap && !mDrag) {
mMap.animator().animateZoom(300, 2, 0, 0); /* handle double tap zoom */
mMap.animator().animateZoom(300, 2,
mPrevX1 - mMap.getWidth() / 2,
mPrevY1 - mMap.getHeight() / 2);
} else if (mStartMove > 0) {
/* handle fling gesture */
mTracker.update(e.getX(), e.getY(), e.getTime());
float vx = mTracker.getVelocityX();
float vy = mTracker.getVelocityY();
/* reduce velocity for short moves */
float t = e.getTime() - mStartMove;
if (t < FLING_MIN_THREHSHOLD) {
t = t / FLING_MIN_THREHSHOLD;
vy *= t * t;
vx *= t * t;
}
doFling(vx, vy);
} }
mDrag = false;
if (mStartMove < 0)
return true;
mTracker.update(e.getX(), e.getY(), e.getTime());
float vx = mTracker.getVelocityX();
float vy = mTracker.getVelocityY();
/* reduce velocity for short moves */
float t = e.getTime() - mStartMove;
if (t < FLING_THREHSHOLD) {
t = t / FLING_THREHSHOLD;
vy *= t * t;
vx *= t * t;
}
doFling(vx, vy);
return true; return true;
} }
if (action == MotionEvent.ACTION_CANCEL) { if (action == MotionEvent.ACTION_CANCEL) {
//mStartMove = -1; return false;
mDown = false;
mDoubleTap = false;
return true;
} }
if (action == MotionEvent.ACTION_POINTER_DOWN) { if (action == MotionEvent.ACTION_POINTER_DOWN) {
mStartMove = -1; mStartMove = -1;