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 08:00:05 +01:00
commit 42e956b0de
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1052,16 +1052,16 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
} }
private boolean isZoomingAllowed(int baseZoom, float dz) { private boolean isZoomingAllowed(int baseZoom, float dz) {
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;