Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
2e6bbf794c
1 changed files with 2 additions and 2 deletions
|
@ -408,7 +408,7 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
|
||||||
public void setMainLayer(BaseMapLayer mainLayer) {
|
public void setMainLayer(BaseMapLayer mainLayer) {
|
||||||
this.mainLayer = mainLayer;
|
this.mainLayer = mainLayer;
|
||||||
int zoom = currentViewport.getZoom();
|
int zoom = currentViewport.getZoom();
|
||||||
maxZoom = BaseMapLayer.DEFAULT_MAX_ZOOM;
|
maxZoom = mainLayer.getMaximumShownMapZoom();
|
||||||
minZoom = mainLayer.getMinimumShownMapZoom() + 1;
|
minZoom = mainLayer.getMinimumShownMapZoom() + 1;
|
||||||
if (maxZoom < zoom) {
|
if (maxZoom < zoom) {
|
||||||
zoom = maxZoom;
|
zoom = maxZoom;
|
||||||
|
@ -1117,4 +1117,4 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
|
||||||
public Context getContext() {
|
public Context getContext() {
|
||||||
return activity;
|
return activity;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue