Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

Update MapView OfflineRegionDefintion initialize #12686

Merged
merged 1 commit into from
Aug 21, 2018
Merged

Update MapView OfflineRegionDefintion initialize #12686

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 35 additions & 9 deletions platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,13 @@
import com.mapbox.mapboxsdk.camera.CameraUpdateFactory;
import com.mapbox.mapboxsdk.constants.MapboxConstants;
import com.mapbox.mapboxsdk.constants.Style;
import com.mapbox.mapboxsdk.geometry.LatLng;
import com.mapbox.mapboxsdk.maps.renderer.MapRenderer;
import com.mapbox.mapboxsdk.maps.renderer.glsurfaceview.GLSurfaceViewMapRenderer;
import com.mapbox.mapboxsdk.maps.renderer.textureview.TextureViewMapRenderer;
import com.mapbox.mapboxsdk.maps.widgets.CompassView;
import com.mapbox.mapboxsdk.net.ConnectivityReceiver;
import com.mapbox.mapboxsdk.offline.OfflineGeometryRegionDefinition;
import com.mapbox.mapboxsdk.offline.OfflineRegionDefinition;
import com.mapbox.mapboxsdk.offline.OfflineTilePyramidRegionDefinition;
import com.mapbox.mapboxsdk.storage.FileSource;
Expand Down Expand Up @@ -567,22 +569,46 @@ public void setOfflineRegionDefinition(OfflineRegionDefinition definition) {
return;
}

OfflineTilePyramidRegionDefinition regionDefinition = (OfflineTilePyramidRegionDefinition) definition;
setStyleUrl(regionDefinition.getStyleURL());
if (definition instanceof OfflineTilePyramidRegionDefinition) {
setOfflineTilePyramidRegionDefinition((OfflineTilePyramidRegionDefinition) definition);
} else if (definition instanceof OfflineGeometryRegionDefinition) {
setOfflineGeometryRegionDefinition((OfflineGeometryRegionDefinition) definition);
} else {
throw new UnsupportedOperationException("OfflineRegionDefintion instance not supported");
}
}

private void setOfflineRegionDefinition(String styleUrl, LatLng cameraTarget, double minZoom, double maxZoom) {
CameraPosition cameraPosition = new CameraPosition.Builder()
.target(regionDefinition.getBounds().getCenter())
.zoom(regionDefinition.getMinZoom())
.target(cameraTarget)
.zoom(minZoom)
.build();

setStyleUrl(styleUrl);
if (!isMapInitialized()) {
mapboxMapOptions.camera(cameraPosition);
mapboxMapOptions.minZoomPreference(regionDefinition.getMinZoom());
mapboxMapOptions.maxZoomPreference(regionDefinition.getMaxZoom());
mapboxMapOptions.minZoomPreference(minZoom);
mapboxMapOptions.maxZoomPreference(maxZoom);
return;
}
mapboxMap.moveCamera(CameraUpdateFactory.newCameraPosition(cameraPosition));
mapboxMap.setMinZoomPreference(regionDefinition.getMinZoom());
mapboxMap.setMaxZoomPreference(regionDefinition.getMaxZoom());
mapboxMap.setMinZoomPreference(minZoom);
mapboxMap.setMaxZoomPreference(maxZoom);
}

private void setOfflineTilePyramidRegionDefinition(OfflineTilePyramidRegionDefinition regionDefinition) {
setOfflineRegionDefinition(regionDefinition.getStyleURL(),
regionDefinition.getBounds().getCenter(),
regionDefinition.getMinZoom(),
regionDefinition.getMaxZoom()
);
}

private void setOfflineGeometryRegionDefinition(OfflineGeometryRegionDefinition regionDefinition) {
setOfflineRegionDefinition(regionDefinition.getStyleURL(),
regionDefinition.getBounds().getCenter(),
regionDefinition.getMinZoom(),
regionDefinition.getMaxZoom()
);
}

//
Expand Down