react-native-google-maps-plus 1.10.0-dev.2 → 1.10.0-dev.4

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

@@ -845,7 +845,6 @@ class GoogleMapsViewImpl(
       mapView?.removeAllViews()
       super.removeAllViews()
       reactContext.unregisterComponentCallbacks(componentCallbacks)
-      mapViewInitialized = false
     }
 
   override fun requestLayout() {

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

@@ -19,7 +19,6 @@ import com.google.android.gms.location.LocationServices
 import com.google.android.gms.location.LocationSettingsRequest
 import com.google.android.gms.location.Priority
 import com.google.android.gms.maps.LocationSource
-import com.google.android.gms.tasks.OnSuccessListener
 import com.rngooglemapsplus.extensions.toLocationErrorCode
 
 private const val REQ_LOCATION_SETTINGS = 2001
@@ -56,6 +55,8 @@ class LocationHandler(
     this.interval = interval ?: INTERVAL_DEFAULT
     this.minUpdateInterval = minUpdateInterval ?: MIN_UPDATE_INTERVAL
     buildLocationRequest(this.priority, this.interval, this.minUpdateInterval)
+
+    if (!isActive) return
     stop()
     start()
   }
@@ -142,13 +143,12 @@ class LocationHandler(
     }
     try {
       fusedLocationClientProviderClient.lastLocation
-        .addOnSuccessListener(
-          OnSuccessListener { location ->
-            if (location != null) {
-              onUpdate?.invoke(location)
-            }
-          },
-        ).addOnFailureListener { e ->
+        .addOnSuccessListener { location ->
+          if (location != null) {
+            listener?.onLocationChanged(location)
+            onUpdate?.invoke(location)
+          }
+        }.addOnFailureListener { e ->
           val error = e.toLocationErrorCode(context)
           onError?.invoke(error)
         }
@@ -164,16 +164,16 @@ class LocationHandler(
             }
           }
         }
+
+      val req = locationRequest ?: return
+      val callback = locationCallback ?: return
+
       fusedLocationClientProviderClient
-        .requestLocationUpdates(
-          locationRequest!!,
-          locationCallback!!,
-          Looper.getMainLooper(),
-        ).addOnFailureListener { e ->
-          val error = e.toLocationErrorCode(context)
-          onError?.invoke(error)
+        .requestLocationUpdates(req, callback, Looper.getMainLooper())
+        .addOnFailureListener { e ->
+          onError?.invoke(e.toLocationErrorCode(context))
         }
-    } catch (se: SecurityException) {
+    } catch (_: SecurityException) {
       onError?.invoke(RNLocationErrorCode.PERMISSION_DENIED)
     } catch (ex: Exception) {
       val error = ex.toLocationErrorCode(context)
@@ -184,20 +184,17 @@ class LocationHandler(
   fun stop() {
     if (!isActive) return
     isActive = false
-    if (locationCallback != null) {
-      fusedLocationClientProviderClient.removeLocationUpdates(locationCallback!!)
-      fusedLocationClientProviderClient.flushLocations()
-      locationCallback = null
-    }
+    val callback = locationCallback ?: return
+    fusedLocationClientProviderClient.removeLocationUpdates(callback)
+    fusedLocationClientProviderClient.flushLocations()
+    locationCallback = null
   }
 
   override fun activate(listener: LocationSource.OnLocationChangedListener) {
     this.listener = listener
-    start()
   }
 
   override fun deactivate() {
     listener = null
-    stop()
   }
 }

package/ios/GoogleMapViewImpl.swift

@@ -10,8 +10,8 @@ GMSIndoorDisplayDelegate {
   private let locationHandler: LocationHandler
   private let markerBuilder: MapMarkerBuilder
   private var mapView: GMSMapView?
-  private var initialized = false
-  private var loaded = false
+  private var mapViewInitialized = false
+  private var mapViewLoaded = false
   private var deInitialized = false
 
   private var pendingMarkers: [(id: String, marker: GMSMarker)] = []
@@ -97,8 +97,8 @@ GMSIndoorDisplayDelegate {
 
   @MainActor
   func initMapView() {
-    if initialized { return }
-    initialized = true
+    if mapViewInitialized { return }
+    mapViewInitialized = true
     googleMapOptions.frame = bounds
 
     mapView = GMSMapView.init(options: googleMapOptions)
@@ -221,7 +221,7 @@ GMSIndoorDisplayDelegate {
   @MainActor
   var trafficEnabled: Bool? {
     didSet {
-      mapView?.isTrafficEnabled = false
+      mapView?.isTrafficEnabled = trafficEnabled ?? false
     }
   }
 
@@ -717,7 +717,6 @@ GMSIndoorDisplayDelegate {
       self.mapView?.indoorDisplay.delegate = nil
       self.mapView?.delegate = nil
       self.mapView = nil
-      self.initialized = false
     }
   }
 
@@ -752,8 +751,8 @@ GMSIndoorDisplayDelegate {
   }
 
   func mapViewDidFinishTileRendering(_ mapView: GMSMapView) {
-    guard !loaded else { return }
-    loaded = true
+    guard !mapViewLoaded else { return }
+    mapViewLoaded = true
     let visibleRegion = mapView.projection.visibleRegion().toRNRegion()
     let camera = mapView.camera.toRNCamera()
 
@@ -761,7 +760,7 @@ GMSIndoorDisplayDelegate {
   }
 
   func mapView(_ mapView: GMSMapView, willMove gesture: Bool) {
-    if !loaded { return }
+    if !mapViewLoaded { return }
     onMain {
       self.cameraMoveReasonIsGesture = gesture
 
@@ -773,7 +772,7 @@ GMSIndoorDisplayDelegate {
   }
 
   func mapView(_ mapView: GMSMapView, didChange position: GMSCameraPosition) {
-    if !loaded { return }
+    if !mapViewLoaded { return }
     onMain {
       let visibleRegion = mapView.projection.visibleRegion().toRNRegion()
       let camera = mapView.camera.toRNCamera()
@@ -784,7 +783,7 @@ GMSIndoorDisplayDelegate {
   }
 
   func mapView(_ mapView: GMSMapView, idleAt position: GMSCameraPosition) {
-    if !loaded { return }
+    if !mapViewLoaded { return }
     onMain {
       let visibleRegion = mapView.projection.visibleRegion().toRNRegion()
       let camera = mapView.camera.toRNCamera()

package/package.json

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