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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2017-01-03 10:58:40 +01:00
commit 279584e42b
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java
View file

@ -830,7 +830,7 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
final double lat = tb.getLatFromPixel(event.getX(), event.getY());
final double lon = tb.getLonFromPixel(event.getX(), event.getY());
int zoomDir = event.getAxisValue(MotionEvent.AXIS_VSCROLL) < 0 ? -1 : 1;
getAnimatedDraggingThread().startMoving(lat, lon, getZoom() + zoomDir, !(doubleTapScaleDetector.isInZoomMode() || afterDoubleTap));
getAnimatedDraggingThread().startMoving(lat, lon, getZoom() + zoomDir, true);
return true;
}
return false;
@ -1053,7 +1053,7 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
if (!isZoomingAllowed(baseZoom, dz)) {
dz = Math.signum(dz);
}
zoomToAnimate(baseZoom, dz, true);
zoomToAnimate(baseZoom, dz, !(doubleTapScaleDetector.isInZoomMode() || afterDoubleTap));
rotateToAnimate(calcRotate);
}