fix follow user location #507

liodali · Mar 18, 2024 · 67faf54 · 67faf54
1 parent 5716e18
commit 67faf54
Show file tree

Hide file tree

Showing 4 changed files with 235 additions and 119 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -64,7 +64,7 @@ android {
 }
 dependencies {
 
-    def coroutines_version ="1.7.1"
+    def coroutines_version ="1.7.3"
 
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
@@ -87,7 +87,7 @@ dependencies {
     //implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
 
-    implementation 'org.osmdroid:osmdroid-android:6.1.17'
+    implementation 'org.osmdroid:osmdroid-android:6.1.18'
     implementation 'com.github.MKergall:osmbonuspack:6.9.0'
     implementation 'com.google.android.material:material:1.11.0'
 

diff --git a/android/src/main/kotlin/hamza/dali/flutter_osm_plugin/FlutterOsmView.kt b/android/src/main/kotlin/hamza/dali/flutter_osm_plugin/FlutterOsmView.kt
@@ -466,7 +466,10 @@ class FlutterOsmView(
                 }
 
                 "user#position" -> {
-                    when (gpsServiceManager.isProviderEnabled(GPS_PROVIDER)) {
+                    when (gpsServiceManager.isProviderEnabled(GPS_PROVIDER)
+                            || gpsServiceManager.isProviderEnabled(
+                        NETWORK_PROVIDER
+                    )) {
                         true ->
                             getUserLocation(result)
 
@@ -638,6 +641,7 @@ class FlutterOsmView(
             val arrowIcon = (args["arrowDirectionIcon"] as ByteArray)
             customPersonMarkerIcon = personIcon.toBitmap()
             customArrowMarkerIcon = arrowIcon.toBitmap()
+            setMarkerTracking()
             mapSnapShot().setUserTrackMarker(
                 personMarker = personIcon, arrowMarker = arrowIcon
             )
@@ -1105,21 +1109,26 @@ class FlutterOsmView(
 
 
         //locationNewOverlay!!.setPersonIcon()
-        setMarkerTracking()/*if (!locationNewOverlay.isMyLocationEnabled) {
+        /*if (!locationNewOverlay.isMyLocationEnabled) {
             isEnabled = true
             locationNewOverlay.enableMyLocation()
         }
         mapSnapShot().setEnableMyLocation(isEnabled)*/
+        if (!map!!.overlays.contains(locationNewOverlay)) {
+            map!!.overlays.add(locationNewOverlay)
+        }
+        locationNewOverlay.enableMyLocation()
         locationNewOverlay.runOnFirstFix {
             scope!!.launch(Main) {
-                val currentPosition = GeoPoint(locationNewOverlay.currentLocation)
-                map!!.controller.animateTo(currentPosition)
+                val currentPosition = locationNewOverlay.mGeoPoint
+
+                map!!.controller.stopAnimation(true)
+                map!!.controller.setCenter(currentPosition)
+                //map!!.controller.animateTo(currentPosition)
             }
 
         }
-        if (!map!!.overlays.contains(locationNewOverlay)) {
-            map!!.overlays.add(locationNewOverlay)
-        }
+
 
     }
 
@@ -1131,20 +1140,22 @@ class FlutterOsmView(
         try {
             if (homeMarker != null) {
                 folderMarkers.items.remove(homeMarker)
-                map?.invalidate()
-            }
-            if (locationNewOverlay.isMyLocationEnabled) {
-                locationNewOverlay.disableMyLocation()
             }
+
+            map?.invalidate()
+            /*if (locationNewOverlay.isMyLocationEnabled) {
+                 locationNewOverlay.disableMyLocation()
+             }*/
+
             locationNewOverlay.disableRotateDirection = disableRotation
-            if (!locationNewOverlay.isMyLocationEnabled) {
+            if (!locationNewOverlay.mIsLocationEnabled) {
                 isEnabled = true
                 locationNewOverlay.enableMyLocation()
                 mapSnapShot().setEnableMyLocation(isEnabled)
             }
             locationNewOverlay.toggleFollow(enableStopFollow)
             when {
-                locationNewOverlay.isFollowLocationEnabled -> {
+                locationNewOverlay.mIsFollowing -> {
                     isTracking = true
                     locationNewOverlay.onChangedLocation { userLocation ->
                         scope?.launch {