From 4026ddb34fb7fc84b611c92182c12585e23273e8 Mon Sep 17 00:00:00 2001 From: Onuray Sahin Date: Fri, 28 Jan 2022 15:07:51 +0300 Subject: [PATCH] Fix multiple pin rendering. --- .../java/im/vector/app/features/location/LocationTracker.kt | 5 ----- .../java/im/vector/app/features/location/MapTilerMapView.kt | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/vector/src/main/java/im/vector/app/features/location/LocationTracker.kt b/vector/src/main/java/im/vector/app/features/location/LocationTracker.kt index 133819ba7a..ff66baf5ca 100644 --- a/vector/src/main/java/im/vector/app/features/location/LocationTracker.kt +++ b/vector/src/main/java/im/vector/app/features/location/LocationTracker.kt @@ -50,11 +50,6 @@ class LocationTracker @Inject constructor( return } - val isGpsEnabled = locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER) - val isNetworkEnabled = locationManager.isProviderEnabled(LocationManager.NETWORK_PROVIDER) - - Timber.d("## LocationTracker. isGpsEnabled: $isGpsEnabled - isNetworkEnabled: $isNetworkEnabled") - locationManager.allProviders .takeIf { it.isNotEmpty() } ?.forEach { provider -> diff --git a/vector/src/main/java/im/vector/app/features/location/MapTilerMapView.kt b/vector/src/main/java/im/vector/app/features/location/MapTilerMapView.kt index 8b64cf79d3..8ef72dfdff 100644 --- a/vector/src/main/java/im/vector/app/features/location/MapTilerMapView.kt +++ b/vector/src/main/java/im/vector/app/features/location/MapTilerMapView.kt @@ -78,7 +78,6 @@ class MapTilerMapView @JvmOverloads constructor( state.pinDrawable?.let { pinDrawable -> if (!safeMapRefs.style.isFullyLoaded || safeMapRefs.style.getImage(state.pinId) == null) { - safeMapRefs.symbolManager.deleteAll() safeMapRefs.style.addImage(state.pinId, pinDrawable) } } @@ -89,6 +88,7 @@ class MapTilerMapView @JvmOverloads constructor( initZoomDone = true } + safeMapRefs.symbolManager.deleteAll() safeMapRefs.symbolManager.create( SymbolOptions() .withLatLng(LatLng(locationData.latitude, locationData.longitude))