Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2016-06-09 16:39:31 +02:00
commit 2e6bbf794c

View file

@ -408,7 +408,7 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
public void setMainLayer(BaseMapLayer mainLayer) {
this.mainLayer = mainLayer;
int zoom = currentViewport.getZoom();
maxZoom = BaseMapLayer.DEFAULT_MAX_ZOOM;
maxZoom = mainLayer.getMaximumShownMapZoom();
minZoom = mainLayer.getMinimumShownMapZoom() + 1;
if (maxZoom < zoom) {
zoom = maxZoom;
@ -1117,4 +1117,4 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
public Context getContext() {
return activity;
}
}
}