Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix context menu point animation

Browse source
This commit is contained in:
max-klaus 2019-08-13 10:21:25 +03:00
parent f0dde03f19
commit 1d316087b6
2 changed files with 29 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
View file

@ -1734,6 +1734,7 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo
private void showOnMap(LatLon latLon, boolean updateCoords, boolean alreadyAdjusted, int zoom) { private void showOnMap(LatLon latLon, boolean updateCoords, boolean alreadyAdjusted, int zoom) {
AnimateDraggingMapThread thread = map.getAnimatedDraggingThread(); AnimateDraggingMapThread thread = map.getAnimatedDraggingThread();
zoom = Math.min(zoom, thread.calculateMoveZoom(null, latLon.getLatitude(), latLon.getLongitude(), null));
LatLon calcLatLon = calculateCenterLatLon(latLon, zoom, updateCoords); LatLon calcLatLon = calculateCenterLatLon(latLon, zoom, updateCoords);
if (updateCoords) { if (updateCoords) {
mapCenter = calcLatLon; mapCenter = calcLatLon;

42
OsmAnd/src/net/osmand/plus/views/AnimateDraggingMapThread.java
View file

@ -188,19 +188,9 @@ public class AnimateDraggingMapThread {
double startLon = rb.getLongitude(); double startLon = rb.getLongitude();
final int startZoom = rb.getZoom(); final int startZoom = rb.getZoom();
final double startZoomFP = rb.getZoomFloatPart(); final double startZoomFP = rb.getZoomFloatPart();
float[] mSt = new float[2];
boolean skipAnimation = false; final int moveZoom = calculateMoveZoom(rb, finalLat, finalLon, mSt);
float mStX = rb.getPixXFromLatLon(startLat, startLon) - rb.getPixXFromLatLon(finalLat, finalLon); boolean skipAnimation = moveZoom == 0;
float mStY = rb.getPixYFromLatLon(startLat, startLon) - rb.getPixYFromLatLon(finalLat, finalLon);
while (Math.abs(mStX) + Math.abs(mStY) > 1200) {
rb.setZoom(rb.getZoom() - 1);
if (rb.getZoom() <= 4) {
skipAnimation = true;
}
mStX = rb.getPixXFromLatLon(startLat, startLon) - rb.getPixXFromLatLon(finalLat, finalLon);
mStY = rb.getPixYFromLatLon(startLat, startLon) - rb.getPixYFromLatLon(finalLat, finalLon);
}
final int moveZoom = rb.getZoom();
// check if animation needed // check if animation needed
skipAnimation = skipAnimation || (Math.abs(moveZoom - startZoom) >= 3 || Math.abs(endZoom - moveZoom) > 3); skipAnimation = skipAnimation || (Math.abs(moveZoom - startZoom) >= 3 || Math.abs(endZoom - moveZoom) > 3);
if (skipAnimation || wasAnimating) { if (skipAnimation || wasAnimating) {
@ -220,7 +210,7 @@ public class AnimateDraggingMapThread {
final float mMoveY = rb.getPixYFromLatLon(startLat, startLon) - rb.getPixYFromLatLon(finalLat, finalLon); final float mMoveY = rb.getPixYFromLatLon(startLat, startLon) - rb.getPixYFromLatLon(finalLat, finalLon);
final boolean doNotUseAnimations = tileView.getSettings().DO_NOT_USE_ANIMATIONS.get(); final boolean doNotUseAnimations = tileView.getSettings().DO_NOT_USE_ANIMATIONS.get();
final float animationTime = doNotUseAnimations ? 1 : Math.max(450, (Math.abs(mStX) + Math.abs(mStY)) / 1200f * MOVE_MOVE_ANIMATION_TIME); final float animationTime = doNotUseAnimations ? 1 : Math.max(450, (Math.abs(mSt[0]) + Math.abs(mSt[1])) / 1200f * MOVE_MOVE_ANIMATION_TIME);
startThreadAnimating(new Runnable() { startThreadAnimating(new Runnable() {
@ -249,6 +239,30 @@ public class AnimateDraggingMapThread {
}); });
} }
public int calculateMoveZoom(RotatedTileBox rb, final double finalLat, final double finalLon, float[] mSt) {
if (rb == null) {
rb = tileView.getCurrentRotatedTileBox().copy();
}
double startLat = rb.getLatitude();
double startLon = rb.getLongitude();
boolean skipAnimation = false;
if (mSt == null) {
mSt = new float[2];
}
mSt[0] = rb.getPixXFromLatLon(startLat, startLon) - rb.getPixXFromLatLon(finalLat, finalLon);
mSt[1] = rb.getPixYFromLatLon(startLat, startLon) - rb.getPixYFromLatLon(finalLat, finalLon);
while (Math.abs(mSt[0]) + Math.abs(mSt[1]) > 1200) {
rb.setZoom(rb.getZoom() - 1);
if (rb.getZoom() <= 4) {
skipAnimation = true;
}
mSt[0] = rb.getPixXFromLatLon(startLat, startLon) - rb.getPixXFromLatLon(finalLat, finalLon);
mSt[1] = rb.getPixYFromLatLon(startLat, startLon) - rb.getPixYFromLatLon(finalLat, finalLon);
}
return skipAnimation ? 0 : rb.getZoom();
}
private void animatingRotateInThread(float rotate, float animationTime, boolean notify) { private void animatingRotateInThread(float rotate, float animationTime, boolean notify) {
AccelerateDecelerateInterpolator interpolator = new AccelerateDecelerateInterpolator(); AccelerateDecelerateInterpolator interpolator = new AccelerateDecelerateInterpolator();
float startRotate = tileView.getRotate(); float startRotate = tileView.getRotate();