react-native-google-maps-plus 1.10.0-dev.5 → 1.10.0-dev.7

package/android/src/main/java/com/rngooglemapsplus/LocationHandler.kt

@@ -34,10 +34,12 @@ class LocationHandler(
   private var listener: LocationSource.OnLocationChangedListener? = null
   private var locationRequest: LocationRequest? = null
   private var locationCallback: LocationCallback? = null
+  private var lastLocation: Location? = null
+  private var isActive = false
+
   private var priority: Int = PRIORITY_DEFAULT
   private var interval: Long = INTERVAL_DEFAULT
   private var minUpdateInterval: Long = MIN_UPDATE_INTERVAL
-  private var isActive = false
 
   var onUpdate: ((Location) -> Unit)? = null
   var onError: ((RNLocationErrorCode) -> Unit)? = null
@@ -128,6 +130,17 @@ class LocationHandler(
       }
   }
 
+  private fun isNewerLocation(location: Location): Boolean {
+    val prev = lastLocation ?: return true
+    return location.elapsedRealtimeNanos > prev.elapsedRealtimeNanos
+  }
+
+  private fun notifyListener(location: Location) {
+    lastLocation = location
+    listener?.onLocationChanged(location)
+    onUpdate?.invoke(location)
+  }
+
   @SuppressLint("MissingPermission")
   fun start() {
     if (isActive) return
@@ -142,23 +155,22 @@ class LocationHandler(
       return
     }
     try {
-      fusedLocationClientProviderClient.lastLocation
+      fusedLocationClientProviderClient
+        .getCurrentLocation(Priority.PRIORITY_HIGH_ACCURACY, null)
         .addOnSuccessListener { location ->
-          if (location != null) {
-            listener?.onLocationChanged(location)
-            onUpdate?.invoke(location)
-          }
+          if (location == null) return@addOnSuccessListener
+          if (!isNewerLocation(location)) return@addOnSuccessListener
+          notifyListener(location)
         }.addOnFailureListener { e ->
-          val error = e.toLocationErrorCode(context)
-          onError?.invoke(error)
+          onError?.invoke(e.toLocationErrorCode(context))
         }
       locationCallback =
         object : LocationCallback() {
           override fun onLocationResult(locationResult: LocationResult) {
             val location = locationResult.lastLocation
             if (location != null) {
-              listener?.onLocationChanged(location)
-              onUpdate?.invoke(location)
+              if (!isNewerLocation(location)) return
+              notifyListener(location)
             } else {
               onError?.invoke(RNLocationErrorCode.POSITION_UNAVAILABLE)
             }
@@ -192,6 +204,9 @@ class LocationHandler(
 
   override fun activate(listener: LocationSource.OnLocationChangedListener) {
     this.listener = listener
+    lastLocation?.let {
+      listener.onLocationChanged(it)
+    }
   }
 
   override fun deactivate() {

package/ios/LocationHandler.swift

@@ -85,10 +85,7 @@ final class LocationHandler: NSObject, CLLocationManagerDelegate {
     guard !isActive else { return }
     isActive = true
 
-    manager.location.map {
-      onUpdate?($0)
-    }
-
+    manager.requestLocation()
     manager.startUpdatingLocation()
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-google-maps-plus",
-  "version": "1.10.0-dev.5",
+  "version": "1.10.0-dev.7",
   "description": "React Native wrapper for Android & iOS Google Maps SDK",
   "main": "./lib/module/index.js",
   "module": "./lib/module/index.js",