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 21:57:38 +01:00
commit f86e28b165
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -166,7 +166,7 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
} }
// ///////////////////////////// INITIALIZING UI PART /////////////////////////////////// // ///////////////////////////// INITIALIZING UI PART ///////////////////////////////////
public void init(final MapActivity ctx, int w, int h) { public void init(MapActivity ctx, int w, int h) {
application = (OsmandApplication) ctx.getApplicationContext(); application = (OsmandApplication) ctx.getApplicationContext();
settings = application.getSettings(); settings = application.getSettings();
@ -220,11 +220,7 @@ 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 = ctx.getMapViewTrackingUtilities().isMapLinkedToLocation();
getAnimatedDraggingThread().startZooming(getZoom() - 1, currentViewport.getZoomFloatPart(), false); getAnimatedDraggingThread().startZooming(getZoom() - 1, currentViewport.getZoomFloatPart(), false);
if (mapLinked) {
ctx.getMapViewTrackingUtilities().setMapLinkedToLocation(true);
}
} }
} }
}; };