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

add animateTo(MapPosition)

Browse Source 
patch from Kimmo Vuorinen. Thanks!
This commit is contained in:
Hannes Janetzek 2014-02-15 00:29:56 +01:00
parent eacc9a2d30
commit 478078dc23
1 changed files with 45 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
vtm/src/org/oscim/map/MapAnimator.java
View File

@ -41,6 +41,8 @@ public class MapAnimator {
private final int ANIM_SCALE = 1 << 1;
private final int ANIM_FLING = 1 << 2;
private final int ANIM_BBOX = 1 << 3;
private final int ANIM_ROTATE = 1 << 4;
private final int ANIM_TILT = 1 << 5;
private final Map mMap;
private final Viewport mViewport;
@ -113,6 +115,39 @@ public class MapAnimator {
animStart(duration);
}
public synchronized void animateTo(long duration, MapPosition mapPosition) {
mViewport.getMapPosition(mPos);
mapPosition.scale = FastMath.clamp(mapPosition.scale,
Viewport.MIN_SCALE,
Viewport.MAX_SCALE);
mDeltaPos.scale = mapPosition.scale;
mScaleBy = mapPosition.scale - mPos.scale;
mStartPos.x = mPos.x;
mStartPos.y = mPos.y;
mStartPos.scale = mPos.scale;
mStartPos.angle = mPos.angle;
mStartPos.tilt = mPos.tilt;
mDeltaPos.x = MercatorProjection.longitudeToX(mapPosition.getLongitude()) - mStartPos.x;
mDeltaPos.y = MercatorProjection.latitudeToY(mapPosition.getLatitude()) - mStartPos.y;
mDeltaPos.angle = mStartPos.angle - mapPosition.angle;
while (mDeltaPos.angle > 180)
mDeltaPos.angle -= 360;
while (mDeltaPos.angle < -180)
mDeltaPos.angle += 360;
mDeltaPos.tilt = mapPosition.tilt - mStartPos.tilt;
mState = ANIM_MOVE | ANIM_SCALE | ANIM_ROTATE | ANIM_TILT;
animStart(duration);
}
public synchronized void animateZoom(long duration, double scale, float pivotX, float pivotY) {
mViewport.getMapPosition(mPos);
@ -251,10 +286,19 @@ public class MapAnimator {
(float) (dy - mScroll.y));
mScroll.x = dx;
mScroll.y = dy;
changed = true;
}
}
if ((mState & ANIM_ROTATE) != 0) {
mViewport.setRotation(mStartPos.angle + mDeltaPos.angle * adv);
changed = true;
}
if ((mState & ANIM_TILT) != 0) {
mViewport.setTilt(mStartPos.tilt + mDeltaPos.tilt * adv);
changed = true;
}
// remember current map position
mViewport.getMapPosition(mPos);