Skip to content

Commit 61f9c5f

Browse files
bmartybmarty
authored
Merge pull request #9116 from element-hq/feature/bma/updateMaplibre
Update Maplibre dependency to version 11.6.1
2 parents dd0028d + 1cda5eb commit 61f9c5f

8 files changed

Lines changed: 42 additions & 42 deletions

File tree

‎dependencies.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,8 @@ ext.libs = [
127127
'mavericksTesting' : "com.airbnb.android:mavericks-testing:$mavericks"
128128
],
129129
maplibre : [
130-
'androidSdk' : "org.maplibre.gl:android-sdk:10.0.2",
131-
'pluginAnnotation' : "org.maplibre.gl:android-plugin-annotation-v9:1.0.0"
130+
'androidSdk' : "org.maplibre.gl:android-sdk:11.6.1",
131+
'pluginAnnotation' : "org.maplibre.gl:android-plugin-annotation-v9:3.0.2"
132132
],
133133
mockk : [
134134
'mockk' : "io.mockk:mockk:$mockk",

‎vector-app/src/main/java/im/vector/app/VectorApplication.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ import com.airbnb.mvrx.Mavericks
3333
import com.facebook.stetho.Stetho
3434
import com.gabrielittner.threetenbp.LazyThreeTen
3535
import com.github.rubensousa.gravitysnaphelper.GravitySnapHelper
36-
import com.mapbox.mapboxsdk.Mapbox
3736
import com.vanniktech.emoji.EmojiManager
3837
import com.vanniktech.emoji.google.GoogleEmojiProvider
3938
import dagger.hilt.android.HiltAndroidApp
@@ -61,6 +60,7 @@ import im.vector.app.features.themes.ThemeUtils
6160
import im.vector.app.features.version.VersionProvider
6261
import im.vector.application.R
6362
import org.jitsi.meet.sdk.log.JitsiMeetDefaultLogHandler
63+
import org.maplibre.android.MapLibre
6464
import org.matrix.android.sdk.api.Matrix
6565
import org.matrix.android.sdk.api.auth.AuthenticationService
6666
import timber.log.Timber
@@ -220,7 +220,7 @@ class VectorApplication :
220220
EmojiManager.install(GoogleEmojiProvider())
221221

222222
// Initialize Mapbox before inflating mapViews
223-
Mapbox.getInstance(this)
223+
MapLibre.getInstance(this)
224224

225225
initMemoryLeakAnalysis()
226226
}

‎vector/src/main/java/im/vector/app/features/location/LocationSharingFragment.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import androidx.lifecycle.lifecycleScope
2121
import com.airbnb.mvrx.fragmentViewModel
2222
import com.airbnb.mvrx.withState
2323
import com.google.android.material.dialog.MaterialAlertDialogBuilder
24-
import com.mapbox.mapboxsdk.maps.MapView
2524
import dagger.hilt.android.AndroidEntryPoint
2625
import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
2726
import im.vector.app.core.platform.VectorBaseFragment
@@ -39,6 +38,7 @@ import im.vector.app.features.location.option.LocationSharingOption
3938
import im.vector.app.features.settings.VectorPreferences
4039
import im.vector.lib.strings.CommonStrings
4140
import kotlinx.coroutines.launch
41+
import org.maplibre.android.maps.MapView
4242
import org.matrix.android.sdk.api.util.MatrixItem
4343
import java.lang.ref.WeakReference
4444
import javax.inject.Inject

‎vector/src/main/java/im/vector/app/features/location/MapBoxMapExt.kt‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77

88
package im.vector.app.features.location
99

10-
import com.mapbox.mapboxsdk.camera.CameraPosition
11-
import com.mapbox.mapboxsdk.camera.CameraUpdateFactory
12-
import com.mapbox.mapboxsdk.constants.MapboxConstants
13-
import com.mapbox.mapboxsdk.geometry.LatLng
14-
import com.mapbox.mapboxsdk.geometry.LatLngBounds
15-
import com.mapbox.mapboxsdk.maps.MapboxMap
10+
import org.maplibre.android.camera.CameraPosition
11+
import org.maplibre.android.camera.CameraUpdateFactory
12+
import org.maplibre.android.constants.MapLibreConstants
13+
import org.maplibre.android.geometry.LatLng
14+
import org.maplibre.android.geometry.LatLngBounds
15+
import org.maplibre.android.maps.MapLibreMap
1616

17-
fun MapboxMap?.zoomToLocation(locationData: LocationData, preserveCurrentZoomLevel: Boolean = false) {
17+
fun MapLibreMap?.zoomToLocation(locationData: LocationData, preserveCurrentZoomLevel: Boolean = false) {
1818
val zoomLevel = if (preserveCurrentZoomLevel && this?.cameraPosition != null) {
1919
cameraPosition.zoom
2020
} else {
@@ -28,11 +28,11 @@ fun MapboxMap?.zoomToLocation(locationData: LocationData, preserveCurrentZoomLev
2828
this?.easeCamera(cameraUpdate)
2929
}
3030

31-
fun MapboxMap?.zoomToBounds(latLngBounds: LatLngBounds) {
31+
fun MapLibreMap?.zoomToBounds(latLngBounds: LatLngBounds) {
3232
this?.getCameraForLatLngBounds(latLngBounds)?.let { camPosition ->
3333
// unZoom a little to avoid having pins exactly at the edges of the map
3434
cameraPosition = CameraPosition.Builder(camPosition)
35-
.zoom((camPosition.zoom - 1).coerceAtLeast(MapboxConstants.MINIMUM_ZOOM.toDouble()))
35+
.zoom((camPosition.zoom - 1).coerceAtLeast(MapLibreConstants.MINIMUM_ZOOM.toDouble()))
3636
.build()
3737
}
3838
}

‎vector/src/main/java/im/vector/app/features/location/MapTilerMapView.kt‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,16 @@ import androidx.core.graphics.drawable.toBitmap
1919
import androidx.core.view.marginBottom
2020
import androidx.core.view.marginTop
2121
import androidx.core.view.updateLayoutParams
22-
import com.mapbox.mapboxsdk.geometry.LatLng
23-
import com.mapbox.mapboxsdk.maps.MapView
24-
import com.mapbox.mapboxsdk.maps.MapboxMap
25-
import com.mapbox.mapboxsdk.maps.Style
26-
import com.mapbox.mapboxsdk.plugins.annotation.SymbolManager
27-
import com.mapbox.mapboxsdk.plugins.annotation.SymbolOptions
28-
import com.mapbox.mapboxsdk.style.layers.Property
2922
import im.vector.app.R
3023
import im.vector.app.core.utils.DimensionConverter
3124
import im.vector.lib.strings.CommonStrings
25+
import org.maplibre.android.geometry.LatLng
26+
import org.maplibre.android.maps.MapLibreMap
27+
import org.maplibre.android.maps.MapView
28+
import org.maplibre.android.maps.Style
29+
import org.maplibre.android.plugins.annotation.SymbolManager
30+
import org.maplibre.android.plugins.annotation.SymbolOptions
31+
import org.maplibre.android.style.layers.Property
3232
import timber.log.Timber
3333

3434
private const val USER_PIN_ID = "user-pin-id"
@@ -42,7 +42,7 @@ class MapTilerMapView @JvmOverloads constructor(
4242
private var pendingState: MapState? = null
4343

4444
data class MapRefs(
45-
val map: MapboxMap,
45+
val map: MapLibreMap,
4646
val symbolManager: SymbolManager,
4747
val style: Style
4848
)
@@ -94,7 +94,7 @@ class MapTilerMapView @JvmOverloads constructor(
9494
}
9595
}
9696

97-
private fun initMapStyle(map: MapboxMap, url: String) {
97+
private fun initMapStyle(map: MapLibreMap, url: String) {
9898
map.setStyle(url) { style ->
9999
val symbolManager = SymbolManager(this, map, style)
100100
symbolManager.iconAllowOverlap = true
@@ -108,7 +108,7 @@ class MapTilerMapView @JvmOverloads constructor(
108108
}
109109
}
110110

111-
private fun initLocateButton(map: MapboxMap) {
111+
private fun initLocateButton(map: MapLibreMap) {
112112
if (showLocationButton) {
113113
addView(locateButton)
114114
adjustCompassButton(map)
@@ -132,15 +132,15 @@ class MapTilerMapView @JvmOverloads constructor(
132132
}
133133
}
134134

135-
private fun adjustCompassButton(map: MapboxMap) {
135+
private fun adjustCompassButton(map: MapLibreMap) {
136136
locateButton.post {
137137
val marginTop = locateButton.height + locateButton.marginTop + locateButton.marginBottom
138138
val marginRight = context.resources.getDimensionPixelOffset(im.vector.lib.ui.styles.R.dimen.location_sharing_compass_button_margin_horizontal)
139139
map.uiSettings.setCompassMargins(0, marginTop, marginRight, 0)
140140
}
141141
}
142142

143-
private fun listenCameraMove(map: MapboxMap, locationTargetChangeListener: LocationTargetChangeListener?) {
143+
private fun listenCameraMove(map: MapLibreMap, locationTargetChangeListener: LocationTargetChangeListener?) {
144144
map.addOnCameraMoveListener {
145145
notifyLocationOfMapCenter(locationTargetChangeListener)
146146
}

‎vector/src/main/java/im/vector/app/features/location/domain/usecase/CompareLocationsUseCase.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77

88
package im.vector.app.features.location.domain.usecase
99

10-
import com.mapbox.mapboxsdk.geometry.LatLng
1110
import im.vector.app.features.location.LocationData
1211
import kotlinx.coroutines.withContext
12+
import org.maplibre.android.geometry.LatLng
1313
import org.matrix.android.sdk.api.session.Session
1414
import javax.inject.Inject
1515

‎vector/src/main/java/im/vector/app/features/location/live/map/LiveLocationMapViewFragment.kt‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,6 @@ import androidx.lifecycle.lifecycleScope
2121
import com.airbnb.mvrx.fragmentViewModel
2222
import com.airbnb.mvrx.withState
2323
import com.google.android.material.bottomsheet.BottomSheetBehavior
24-
import com.mapbox.mapboxsdk.geometry.LatLng
25-
import com.mapbox.mapboxsdk.geometry.LatLngBounds
26-
import com.mapbox.mapboxsdk.maps.MapView
27-
import com.mapbox.mapboxsdk.maps.MapboxMap
28-
import com.mapbox.mapboxsdk.maps.MapboxMapOptions
29-
import com.mapbox.mapboxsdk.maps.Style
30-
import com.mapbox.mapboxsdk.maps.SupportMapFragment
31-
import com.mapbox.mapboxsdk.plugins.annotation.OnSymbolClickListener
32-
import com.mapbox.mapboxsdk.plugins.annotation.Symbol
33-
import com.mapbox.mapboxsdk.plugins.annotation.SymbolManager
34-
import com.mapbox.mapboxsdk.plugins.annotation.SymbolOptions
35-
import com.mapbox.mapboxsdk.style.layers.Property
3624
import dagger.hilt.android.AndroidEntryPoint
3725
import im.vector.app.R
3826
import im.vector.app.core.extensions.addChildFragment
@@ -54,6 +42,18 @@ import im.vector.app.features.location.zoomToBounds
5442
import im.vector.app.features.location.zoomToLocation
5543
import im.vector.lib.strings.CommonStrings
5644
import kotlinx.coroutines.launch
45+
import org.maplibre.android.geometry.LatLng
46+
import org.maplibre.android.geometry.LatLngBounds
47+
import org.maplibre.android.maps.MapLibreMap
48+
import org.maplibre.android.maps.MapLibreMapOptions
49+
import org.maplibre.android.maps.MapView
50+
import org.maplibre.android.maps.Style
51+
import org.maplibre.android.maps.SupportMapFragment
52+
import org.maplibre.android.plugins.annotation.OnSymbolClickListener
53+
import org.maplibre.android.plugins.annotation.Symbol
54+
import org.maplibre.android.plugins.annotation.SymbolManager
55+
import org.maplibre.android.plugins.annotation.SymbolOptions
56+
import org.maplibre.android.style.layers.Property
5757
import timber.log.Timber
5858
import java.lang.ref.WeakReference
5959
import javax.inject.Inject
@@ -74,7 +74,7 @@ class LiveLocationMapViewFragment :
7474

7575
private val viewModel: LiveLocationMapViewModel by fragmentViewModel()
7676

77-
private var mapboxMap: WeakReference<MapboxMap>? = null
77+
private var mapboxMap: WeakReference<MapLibreMap>? = null
7878
private var mapView: MapView? = null
7979
private var symbolManager: SymbolManager? = null
8080
private var mapStyle: Style? = null
@@ -214,7 +214,7 @@ class LiveLocationMapViewFragment :
214214
private fun getOrCreateSupportMapFragment() =
215215
childFragmentManager.findFragmentByTag(MAP_FRAGMENT_TAG) as? SupportMapFragment
216216
?: run {
217-
val options = MapboxMapOptions.createFromAttributes(requireContext(), null)
217+
val options = MapLibreMapOptions.createFromAttributes(requireContext(), null)
218218
SupportMapFragment.newInstance(options)
219219
.also { addChildFragment(R.id.liveLocationMapFragmentContainer, it, tag = MAP_FRAGMENT_TAG) }
220220
}

‎vector/src/main/java/im/vector/app/features/location/preview/LocationPreviewFragment.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import androidx.lifecycle.lifecycleScope
1717
import com.airbnb.mvrx.args
1818
import com.airbnb.mvrx.fragmentViewModel
1919
import com.airbnb.mvrx.withState
20-
import com.mapbox.mapboxsdk.maps.MapView
2120
import dagger.hilt.android.AndroidEntryPoint
2221
import im.vector.app.R
2322
import im.vector.app.core.platform.VectorBaseFragment
@@ -35,6 +34,7 @@ import im.vector.app.features.location.UrlMapProvider
3534
import im.vector.app.features.location.showUserLocationNotAvailableErrorDialog
3635
import im.vector.lib.strings.CommonStrings
3736
import kotlinx.coroutines.launch
37+
import org.maplibre.android.maps.MapView
3838
import java.lang.ref.WeakReference
3939
import javax.inject.Inject
4040

0 commit comments

Comments
 (0)