diff --git a/LICENSE.md b/LICENSE.md index 1b8bf2d6fc..5eeedd2010 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -14,7 +14,7 @@ For the full license terms, please see the Mapbox Terms of Service at https://ww ## Additional Mapbox Maps Android licenses Mapbox Maps Android uses portions of the Android App Startup Runtime. -URL: [https://developer.android.com/jetpack/androidx/releases/startup#1.0.0](https://developer.android.com/jetpack/androidx/releases/startup#1.0.0) +URL: [https://developer.android.com/jetpack/androidx/releases/startup#1.1.0](https://developer.android.com/jetpack/androidx/releases/startup#1.1.0) License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) diff --git a/app/src/main/java/com/mapbox/maps/testapp/examples/camera/RestrictBoundsActivity.kt b/app/src/main/java/com/mapbox/maps/testapp/examples/camera/RestrictBoundsActivity.kt index 9c3339c33c..841e2989dc 100644 --- a/app/src/main/java/com/mapbox/maps/testapp/examples/camera/RestrictBoundsActivity.kt +++ b/app/src/main/java/com/mapbox/maps/testapp/examples/camera/RestrictBoundsActivity.kt @@ -146,8 +146,8 @@ class RestrictBoundsActivity : AppCompatActivity() { private val INFINITE_BOUNDS: CameraBoundsOptions = CameraBoundsOptions.Builder() .bounds( CoordinateBounds( - Point.fromLngLat(170.0202020, -20.0), - Point.fromLngLat(190.0, 20.0), + Point.fromLngLat(0.0, 0.0), + Point.fromLngLat(0.0, 0.0), true ) ) diff --git a/app/src/main/java/com/mapbox/maps/testapp/examples/customlayer/CustomLayerActivity.kt b/app/src/main/java/com/mapbox/maps/testapp/examples/customlayer/CustomLayerActivity.kt index 3927fd48d3..5c31de3ea4 100644 --- a/app/src/main/java/com/mapbox/maps/testapp/examples/customlayer/CustomLayerActivity.kt +++ b/app/src/main/java/com/mapbox/maps/testapp/examples/customlayer/CustomLayerActivity.kt @@ -29,7 +29,7 @@ class CustomLayerActivity : AppCompatActivity() { Style.MAPBOX_STREETS ) { mapboxMap.setCamera( - CameraOptions.Builder().center(Point.fromLngLat(-243.60947, 39.91448)).zoom(10.0).build() + CameraOptions.Builder().center(Point.fromLngLat(116.39053, 39.91448)).zoom(10.0).build() ) initFab() } diff --git a/app/src/main/java/com/mapbox/maps/testapp/examples/customlayer/NativeCustomLayerActivity.kt b/app/src/main/java/com/mapbox/maps/testapp/examples/customlayer/NativeCustomLayerActivity.kt index f4d60022cb..0aa3173666 100644 --- a/app/src/main/java/com/mapbox/maps/testapp/examples/customlayer/NativeCustomLayerActivity.kt +++ b/app/src/main/java/com/mapbox/maps/testapp/examples/customlayer/NativeCustomLayerActivity.kt @@ -30,7 +30,7 @@ class NativeCustomLayerActivity : AppCompatActivity() { Style.MAPBOX_STREETS ) { mapboxMap.setCamera( - CameraOptions.Builder().center(Point.fromLngLat(-243.60947, 39.91448)).zoom(10.0) + CameraOptions.Builder().center(Point.fromLngLat(116.39053, 39.91448)).zoom(10.0) .build() ) initFab() diff --git a/buildSrc/src/main/kotlin/Project.kt b/buildSrc/src/main/kotlin/Project.kt index b6f12f4b4f..e7097e18b7 100644 --- a/buildSrc/src/main/kotlin/Project.kt +++ b/buildSrc/src/main/kotlin/Project.kt @@ -76,8 +76,8 @@ object Versions { const val mapboxGestures = "0.7.0" const val mapboxJavaServices = "5.4.1" const val mapboxBase = "0.5.0" - const val mapboxGlNative = "10.0.0-rc.7.2" - const val mapboxCommon = "17.1.0" + const val mapboxGlNative = "10.0.0-rc.8" + const val mapboxCommon = "18.0.0" const val mapboxAndroidCore = "5.0.0" const val mapboxAndroidTelemetry = "8.1.0" const val androidxCore = "1.3.1" diff --git a/sdk/src/androidTest/java/com/mapbox/maps/OfflineTest.kt b/sdk/src/androidTest/java/com/mapbox/maps/OfflineTest.kt index 45fb0ed7e8..ddb8049626 100644 --- a/sdk/src/androidTest/java/com/mapbox/maps/OfflineTest.kt +++ b/sdk/src/androidTest/java/com/mapbox/maps/OfflineTest.kt @@ -236,8 +236,9 @@ class OfflineTest { offlineManager.createTilesetDescriptor( TilesetDescriptorOptions.Builder() .styleURI(STYLE) - .minZoom(ZOOM.toInt().toByte()) - .maxZoom(ZOOM.toInt().toByte()) + // Make the zoom range lager to make sure the download process not complete to fast. + .minZoom((ZOOM - 5).toInt().toByte()) + .maxZoom((ZOOM + 5).toInt().toByte()) .build() ) ) @@ -303,6 +304,7 @@ class OfflineTest { } switchAirplaneMode() verifyAirplaneModeEnabled() + // Make the zoom lever one more larger to make sure all the tiles are downloaded. prepareMapView( observer, listOf( @@ -353,7 +355,8 @@ class OfflineTest { MapEvents.MAP_LOADED, MapEvents.STYLE_LOADED, MapEvents.MAP_LOADING_ERROR - ) + ), + ZOOM + 1 ) try { // map loaded, style loaded @@ -419,9 +422,11 @@ class OfflineTest { } switchAirplaneMode() verifyAirplaneModeEnabled() + // Show map with the zoom level larger than download range to trigger loading error prepareMapView( observer, - listOf(MapEvents.MAP_IDLE, MapEvents.MAP_LOADING_ERROR) + listOf(MapEvents.MAP_IDLE, MapEvents.MAP_LOADING_ERROR), + ZOOM + 3 ) try { // we do not throw timeout exception and verify we have exactly 1 IDLE event after timeout @@ -451,9 +456,11 @@ class OfflineTest { } } OfflineSwitch.getInstance().isMapboxStackConnected = false + // Set zoom 1 larger to make sure all tiles are download. prepareMapView( observer, - listOf(MapEvents.MAP_IDLE) + listOf(MapEvents.MAP_IDLE), + ZOOM + 1 ) try { // we wait for whole time and verify we hit exactly one IDLE event @@ -524,10 +531,10 @@ class OfflineTest { .metadata(Value(STYLE_PACK_METADATA)) .build() ) - // set min zoom twice less in order to make sure tile in loaded map view + // set min and max zoom in range [zoom-2, zoom+2] to make sure tile in loaded map view // will be fully visible and not somewhere on tile edge - .minZoom((ZOOM.toInt() / 2).toByte()) - .maxZoom(ZOOM.toInt().toByte()) + .minZoom((ZOOM - 2).toInt().toByte()) + .maxZoom((ZOOM + 2).toInt().toByte()) .build() ) ) @@ -550,7 +557,7 @@ class OfflineTest { } } - private fun prepareMapView(observer: Observer, eventList: List) { + private fun prepareMapView(observer: Observer, eventList: List, zoom: Double = ZOOM) { var mapboxMap: MapboxMap rule.scenario.onActivity { it.runOnUiThread { @@ -562,7 +569,7 @@ class OfflineTest { context = context, cameraOptions = CameraOptions.Builder() .center(TOKYO) - .zoom(ZOOM) + .zoom(zoom) .build() ) )