mirror of
https://github.com/element-hq/element-android
synced 2024-11-23 01:45:36 +03:00
Merge pull request #8176 from vector-im/dependabot/gradle/org.maplibre.gl-android-sdk-10.0.2
Bump org.maplibre.gl:android-sdk from 9.6.0 to 10.0.2
This commit is contained in:
commit
4f64b20bca
4 changed files with 10 additions and 9 deletions
|
@ -134,7 +134,7 @@ ext.libs = [
|
|||
'mavericksTesting' : "com.airbnb.android:mavericks-testing:$mavericks"
|
||||
],
|
||||
maplibre : [
|
||||
'androidSdk' : "org.maplibre.gl:android-sdk:9.6.0",
|
||||
'androidSdk' : "org.maplibre.gl:android-sdk:10.0.2",
|
||||
'pluginAnnotation' : "org.maplibre.gl:android-plugin-annotation-v9:1.0.0"
|
||||
],
|
||||
mockk : [
|
||||
|
|
|
@ -17,6 +17,7 @@
|
|||
package im.vector.app.features.location
|
||||
|
||||
import com.mapbox.mapboxsdk.camera.CameraPosition
|
||||
import com.mapbox.mapboxsdk.camera.CameraUpdateFactory
|
||||
import com.mapbox.mapboxsdk.constants.MapboxConstants
|
||||
import com.mapbox.mapboxsdk.geometry.LatLng
|
||||
import com.mapbox.mapboxsdk.geometry.LatLngBounds
|
||||
|
@ -28,12 +29,12 @@ fun MapboxMap?.zoomToLocation(locationData: LocationData, preserveCurrentZoomLev
|
|||
} else {
|
||||
INITIAL_MAP_ZOOM_IN_PREVIEW
|
||||
}
|
||||
this?.easeCamera {
|
||||
CameraPosition.Builder()
|
||||
.target(LatLng(locationData.latitude, locationData.longitude))
|
||||
.zoom(zoomLevel)
|
||||
.build()
|
||||
}
|
||||
val expectedCameraPosition = CameraPosition.Builder()
|
||||
.target(LatLng(locationData.latitude, locationData.longitude))
|
||||
.zoom(zoomLevel)
|
||||
.build()
|
||||
val cameraUpdate = CameraUpdateFactory.newCameraPosition(expectedCameraPosition)
|
||||
this?.easeCamera(cameraUpdate)
|
||||
}
|
||||
|
||||
fun MapboxMap?.zoomToBounds(latLngBounds: LatLngBounds) {
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:mapbox_renderTextureMode="true"
|
||||
app:maplibre_renderTextureMode="true"
|
||||
app:showLocateButton="true" />
|
||||
|
||||
<im.vector.app.features.location.MapLoadingErrorView
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:mapbox_renderTextureMode="true"
|
||||
app:maplibre_renderTextureMode="true"
|
||||
app:showLocateButton="true"
|
||||
tools:background="#4F00" />
|
||||
|
||||
|
|
Loading…
Reference in a new issue