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-04 17:02:59 +01:00
commit f446a2c4ca
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -167,7 +167,7 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
}
// ///////////////////////////// INITIALIZING UI PART ///////////////////////////////////
public void init(MapActivity ctx, int w, int h) {
public void init(final MapActivity ctx, int w, int h) {
application = (OsmandApplication) ctx.getApplicationContext();
settings = application.getSettings();
@ -222,9 +222,9 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
//afterTwoFingersTap = true;
if (isZoomingAllowed(getZoom(), -1.1f)) {
getAnimatedDraggingThread().startZooming(getZoom() - 1, currentViewport.getZoomFloatPart(), false);
if (wasMapLinkedBeforeGesture) {
activity.getMapViewTrackingUtilities().setMapLinkedToLocation(true);
}
//if (wasMapLinkedBeforeGesture) {
ctx.getMapViewTrackingUtilities().setMapLinkedToLocation(true);
//}
}
}
};
@ -1083,7 +1083,6 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
private class MapTileViewOnGestureListener extends SimpleOnGestureListener {
@Override
public boolean onDown(MotionEvent e) {
wasMapLinkedBeforeGesture = activity.getMapViewTrackingUtilities().isMapLinkedToLocation();
return false;
}