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 2016-12-31 16:11:36 +01:00
commit 7254784412
1 changed files with 3 additions and 3 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

@ -1061,13 +1061,13 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
if (baseZoom > getMaxZoom()) { if (baseZoom > getMaxZoom()) {
return false; return false;
} }
if (baseZoom > getMaxZoom() - 1 && dz >= 1) { if (baseZoom > getMaxZoom() - 1 && dz > 1) {
return false; return false;
} }
if (baseZoom < getMinZoom()) { if (baseZoom < getMinZoom()) {
return false; return false;
} }
if (baseZoom < getMinZoom() + 1 && dz <= -1) { if (baseZoom < getMinZoom() + 1 && dz < -1) {
return false; return false;
} }
return true; return true;
@ -1114,7 +1114,7 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
@Override @Override
public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) { public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) {
if (!(multiTouchSupport.isInZoomMode()) { if (!multiTouchSupport.isInZoomMode()) {
dragToAnimate(e2.getX() + distanceX, e2.getY() + distanceY, e2.getX(), e2.getY(), true); dragToAnimate(e2.getX() + distanceX, e2.getY() + distanceY, e2.getX(), e2.getY(), true);
} }
return true; return true;