Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2017-01-03 21:17:16 +01:00
commit 9490e49f3b

View file

@ -220,10 +220,10 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
public void onTwoFingerTap() { public void onTwoFingerTap() {
//afterTwoFingersTap = true; //afterTwoFingersTap = true;
if (isZoomingAllowed(getZoom(), -1.1f)) { if (isZoomingAllowed(getZoom(), -1.1f)) {
boolean mapLinked = MapActivity.getMapViewTrackingUtilities().isMapLinkedToLocation(); boolean mapLinked = ctx.getMapViewTrackingUtilities().isMapLinkedToLocation();
getAnimatedDraggingThread().startZooming(getZoom() - 1, currentViewport.getZoomFloatPart(), false); getAnimatedDraggingThread().startZooming(getZoom() - 1, currentViewport.getZoomFloatPart(), false);
if (mapLinked) { if (mapLinked) {
MapActivity.getMapViewTrackingUtilities().setMapLinkedToLocation(true); ctx.getMapViewTrackingUtilities().setMapLinkedToLocation(true);
} }
} }
} }