react-native-google-maps-plus 1.8.2 → 1.8.4-dev.2

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

@@ -5,6 +5,8 @@ import MarkerTag
 import PolygonTag
 import PolylineTag
 import android.annotation.SuppressLint
+import android.content.ComponentCallbacks2
+import android.content.res.Configuration
 import android.graphics.Bitmap
 import android.location.Location
 import android.util.Size
@@ -17,6 +19,7 @@ import com.google.android.gms.maps.CameraUpdateFactory
 import com.google.android.gms.maps.GoogleMap
 import com.google.android.gms.maps.GoogleMapOptions
 import com.google.android.gms.maps.MapView
+import com.google.android.gms.maps.MapsInitializer
 import com.google.android.gms.maps.model.CameraPosition
 import com.google.android.gms.maps.model.Circle
 import com.google.android.gms.maps.model.CircleOptions
@@ -104,7 +107,24 @@ class GoogleMapsViewImpl(
 
   private var cameraMoveReason = -1
 
+  val componentCallbacks =
+    object : ComponentCallbacks2 {
+      override fun onConfigurationChanged(newConfig: Configuration) {}
+
+      override fun onLowMemory() {
+        mapView?.onLowMemory()
+        markerBuilder.clearIconCache()
+      }
+
+      override fun onTrimMemory(level: Int) {
+        mapView?.onLowMemory()
+        markerBuilder.cancelAllJobs()
+      }
+    }
+
   init {
+    MapsInitializer.initialize(reactContext)
+    reactContext.registerComponentCallbacks(componentCallbacks)
     reactContext.addLifecycleEventListener(this)
   }
 
@@ -820,6 +840,7 @@ class GoogleMapsViewImpl(
         removeAllViews()
       }
       super.removeAllViews()
+      reactContext.unregisterComponentCallbacks(componentCallbacks)
       reactContext.removeLifecycleEventListener(this)
       initialized = false
     }

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

@@ -45,7 +45,7 @@ class MapMarkerBuilder(
   private val scope: CoroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.Default),
 ) {
   private val iconCache =
-    object : LruCache<Int, BitmapDescriptor>(512) {
+    object : LruCache<Int, BitmapDescriptor>(256) {
       override fun sizeOf(
         key: Int,
         value: BitmapDescriptor,
@@ -265,19 +265,32 @@ class MapMarkerBuilder(
         try {
           ensureActive()
           val bmp = renderBitmap(m)
-          if (bmp != null) {
+
+          if (bmp == null) {
+            withContext(Dispatchers.Main) { onReady(null) }
+            return@launch
+          }
+          ensureActive()
+          val desc = BitmapDescriptorFactory.fromBitmap(bmp)
+
+          iconCache.put(key, desc)
+          bmp.recycle()
+
+          withContext(Dispatchers.Main) {
             ensureActive()
-            val desc = BitmapDescriptorFactory.fromBitmap(bmp)
-            iconCache.put(key, desc)
-            bmp.recycle()
-            withContext(Dispatchers.Main) {
-              ensureActive()
-              onReady(desc)
-            }
+            onReady(desc)
           }
         } catch (_: OutOfMemoryError) {
-          iconCache.evictAll()
+          clearIconCache()
+          withContext(Dispatchers.Main) {
+            ensureActive()
+            onReady(null)
+          }
         } catch (_: Throwable) {
+          withContext(Dispatchers.Main) {
+            ensureActive()
+            onReady(null)
+          }
         } finally {
           jobsById.remove(m.id)
         }
@@ -297,6 +310,10 @@ class MapMarkerBuilder(
       jobsById[id]?.cancel()
     }
     jobsById.clear()
+    clearIconCache()
+  }
+
+  fun clearIconCache() {
     iconCache.evictAll()
   }
 

package/ios/GoogleMapViewImpl.swift

@@ -42,19 +42,39 @@ GMSIndoorDisplayDelegate {
     setupAppLifecycleObservers()
   }
 
+  @MainActor
+  private var lifecycleTasks = [Task<Void, Never>]()
+
   @MainActor
   private func setupAppLifecycleObservers() {
-    NotificationCenter.default.addObserver(
-      self,
-      selector: #selector(appDidBecomeActive),
-      name: UIApplication.didBecomeActiveNotification,
-      object: nil
+    lifecycleTasks.append(
+      Task { @MainActor in
+        for await _ in NotificationCenter.default.notifications(
+          named: UIApplication.didBecomeActiveNotification
+        ) {
+          appDidBecomeActive()
+        }
+      }
+    )
+
+    lifecycleTasks.append(
+      Task { @MainActor in
+        for await _ in NotificationCenter.default.notifications(
+          named: UIApplication.didEnterBackgroundNotification
+        ) {
+          appDidEnterBackground()
+        }
+      }
     )
-    NotificationCenter.default.addObserver(
-      self,
-      selector: #selector(appDidEnterBackground),
-      name: UIApplication.didEnterBackgroundNotification,
-      object: nil
+
+    lifecycleTasks.append(
+      Task { @MainActor in
+        for await _ in NotificationCenter.default.notifications(
+          named: UIApplication.didReceiveMemoryWarningNotification
+        ) {
+          onLowMemory()
+        }
+      }
     )
   }
 
@@ -688,16 +708,20 @@ GMSIndoorDisplayDelegate {
     }
   }
 
-  @objc private func appDidBecomeActive() {
+  private func appDidBecomeActive() {
     if window != nil {
       locationHandler.start()
     }
   }
 
-  @objc private func appDidEnterBackground() {
+  private func appDidEnterBackground() {
     locationHandler.stop()
   }
 
+  private func onLowMemory() {
+    markerBuilder.cancelAllIconTasks()
+  }
+
   override func didMoveToWindow() {
     super.didMoveToWindow()
     if window != nil {
@@ -708,8 +732,9 @@ GMSIndoorDisplayDelegate {
   }
 
   deinit {
-    NotificationCenter.default.removeObserver(self)
     deinitInternal()
+    lifecycleTasks.forEach { $0.cancel() }
+    lifecycleTasks.removeAll()
   }
 
   func mapViewDidFinishTileRendering(_ mapView: GMSMapView) {

package/ios/MapMarkerBuilder.swift

@@ -5,7 +5,7 @@ import UIKit
 final class MapMarkerBuilder {
   private let iconCache: NSCache<NSNumber, UIImage> = {
     let c = NSCache<NSNumber, UIImage>()
-    c.countLimit = 512
+    c.countLimit = 256
     return c
   }()
   private var tasks: [String: Task<Void, Never>] = [:]
@@ -205,6 +205,7 @@ final class MapMarkerBuilder {
     }
     tasks.removeAll()
     iconCache.removeAllObjects()
+    CATransaction.flush()
   }
 
   @MainActor

package/nitrogen/generated/android/c++/JHybridRNGoogleMapsPlusModuleSpec.cpp

@@ -46,6 +46,12 @@ namespace margelo::nitro::rngooglemapsplus {
     method(_javaPart);
   }
 
+  std::string JHybridRNGoogleMapsPlusModuleSpec::toString() {
+    static const auto method = javaClassStatic()->getMethod<jni::JString()>("toString");
+    auto javaString = method(_javaPart);
+    return javaString->toStdString();
+  }
+
   // Properties
   
 

package/nitrogen/generated/android/c++/JHybridRNGoogleMapsPlusModuleSpec.hpp

@@ -41,6 +41,7 @@ namespace margelo::nitro::rngooglemapsplus {
   public:
     size_t getExternalMemorySize() noexcept override;
     void dispose() noexcept override;
+    std::string toString() override;
 
   public:
     inline const jni::global_ref<JHybridRNGoogleMapsPlusModuleSpec::javaobject>& getJavaPart() const noexcept {

package/nitrogen/generated/android/c++/JHybridRNGoogleMapsPlusViewSpec.cpp

@@ -225,6 +225,12 @@ namespace margelo::nitro::rngooglemapsplus {
     method(_javaPart);
   }
 
+  std::string JHybridRNGoogleMapsPlusViewSpec::toString() {
+    static const auto method = javaClassStatic()->getMethod<jni::JString()>("toString");
+    auto javaString = method(_javaPart);
+    return javaString->toStdString();
+  }
+
   // Properties
   std::optional<RNInitialProps> JHybridRNGoogleMapsPlusViewSpec::getInitialProps() {
     static const auto method = javaClassStatic()->getMethod<jni::local_ref<JRNInitialProps>()>("getInitialProps");

package/nitrogen/generated/android/c++/JHybridRNGoogleMapsPlusViewSpec.hpp

@@ -41,6 +41,7 @@ namespace margelo::nitro::rngooglemapsplus {
   public:
     size_t getExternalMemorySize() noexcept override;
     void dispose() noexcept override;
+    std::string toString() override;
 
   public:
     inline const jni::global_ref<JHybridRNGoogleMapsPlusViewSpec::javaobject>& getJavaPart() const noexcept {

package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/Func_void_RNIndoorBuilding.kt

@@ -10,7 +10,6 @@ package com.rngooglemapsplus
 import androidx.annotation.Keep
 import com.facebook.jni.HybridData
 import com.facebook.proguard.annotations.DoNotStrip
-import com.margelo.nitro.core.*
 import dalvik.annotation.optimization.FastNative
 
 

package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/Func_void_RNIndoorLevel.kt

@@ -10,7 +10,6 @@ package com.rngooglemapsplus
 import androidx.annotation.Keep
 import com.facebook.jni.HybridData
 import com.facebook.proguard.annotations.DoNotStrip
-import com.margelo.nitro.core.*
 import dalvik.annotation.optimization.FastNative
 
 

package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/Func_void_RNLatLng.kt

@@ -10,7 +10,6 @@ package com.rngooglemapsplus
 import androidx.annotation.Keep
 import com.facebook.jni.HybridData
 import com.facebook.proguard.annotations.DoNotStrip
-import com.margelo.nitro.core.*
 import dalvik.annotation.optimization.FastNative
 
 

package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/Func_void_RNLocation.kt

@@ -10,7 +10,6 @@ package com.rngooglemapsplus
 import androidx.annotation.Keep
 import com.facebook.jni.HybridData
 import com.facebook.proguard.annotations.DoNotStrip
-import com.margelo.nitro.core.*
 import dalvik.annotation.optimization.FastNative
 
 

package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/Func_void_RNLocationErrorCode.kt

@@ -10,7 +10,6 @@ package com.rngooglemapsplus
 import androidx.annotation.Keep
 import com.facebook.jni.HybridData
 import com.facebook.proguard.annotations.DoNotStrip
-import com.margelo.nitro.core.*
 import dalvik.annotation.optimization.FastNative
 
 

package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/Func_void_RNMapErrorCode.kt

@@ -10,7 +10,6 @@ package com.rngooglemapsplus
 import androidx.annotation.Keep
 import com.facebook.jni.HybridData
 import com.facebook.proguard.annotations.DoNotStrip
-import com.margelo.nitro.core.*
 import dalvik.annotation.optimization.FastNative
 
 

package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/Func_void_RNRegion_RNCamera.kt

@@ -10,7 +10,6 @@ package com.rngooglemapsplus
 import androidx.annotation.Keep
 import com.facebook.jni.HybridData
 import com.facebook.proguard.annotations.DoNotStrip
-import com.margelo.nitro.core.*
 import dalvik.annotation.optimization.FastNative
 
 

package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/Func_void_RNRegion_RNCamera_bool.kt

@@ -10,7 +10,6 @@ package com.rngooglemapsplus
 import androidx.annotation.Keep
 import com.facebook.jni.HybridData
 import com.facebook.proguard.annotations.DoNotStrip
-import com.margelo.nitro.core.*
 import dalvik.annotation.optimization.FastNative
 
 

package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/Func_void_bool.kt

@@ -10,7 +10,6 @@ package com.rngooglemapsplus
 import androidx.annotation.Keep
 import com.facebook.jni.HybridData
 import com.facebook.proguard.annotations.DoNotStrip
-import com.margelo.nitro.core.*
 import dalvik.annotation.optimization.FastNative
 
 

package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/Func_void_std__string.kt

@@ -10,7 +10,6 @@ package com.rngooglemapsplus
 import androidx.annotation.Keep
 import com.facebook.jni.HybridData
 import com.facebook.proguard.annotations.DoNotStrip
-import com.margelo.nitro.core.*
 import dalvik.annotation.optimization.FastNative
 
 

package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/Func_void_std__string_RNLatLng.kt

@@ -10,7 +10,6 @@ package com.rngooglemapsplus
 import androidx.annotation.Keep
 import com.facebook.jni.HybridData
 import com.facebook.proguard.annotations.DoNotStrip
-import com.margelo.nitro.core.*
 import dalvik.annotation.optimization.FastNative
 
 

package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/Func_void_std__string_std__string_RNLatLng.kt

@@ -10,7 +10,6 @@ package com.rngooglemapsplus
 import androidx.annotation.Keep
 import com.facebook.jni.HybridData
 import com.facebook.proguard.annotations.DoNotStrip
-import com.margelo.nitro.core.*
 import dalvik.annotation.optimization.FastNative
 
 

package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/HybridRNGoogleMapsPlusModuleSpec.kt

@@ -10,7 +10,8 @@ package com.rngooglemapsplus
 import androidx.annotation.Keep
 import com.facebook.jni.HybridData
 import com.facebook.proguard.annotations.DoNotStrip
-import com.margelo.nitro.core.*
+import com.margelo.nitro.core.Promise
+import com.margelo.nitro.core.HybridObject
 
 /**
  * A Kotlin class representing the RNGoogleMapsPlusModule HybridObject.
@@ -36,6 +37,11 @@ abstract class HybridRNGoogleMapsPlusModuleSpec: HybridObject() {
     super.updateNative(hybridData)
   }
 
+  // Default implementation of `HybridObject.toString()`
+  override fun toString(): String {
+    return "[HybridObject RNGoogleMapsPlusModule]"
+  }
+
   // Properties
   
 

package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/HybridRNGoogleMapsPlusViewSpec.kt

@@ -10,8 +10,8 @@ package com.rngooglemapsplus
 import androidx.annotation.Keep
 import com.facebook.jni.HybridData
 import com.facebook.proguard.annotations.DoNotStrip
-import com.margelo.nitro.core.*
-import com.margelo.nitro.views.*
+import com.margelo.nitro.core.Promise
+import com.margelo.nitro.views.HybridView
 
 /**
  * A Kotlin class representing the RNGoogleMapsPlusView HybridObject.
@@ -37,6 +37,11 @@ abstract class HybridRNGoogleMapsPlusViewSpec: HybridView() {
     super.updateNative(hybridData)
   }
 
+  // Default implementation of `HybridObject.toString()`
+  override fun toString(): String {
+    return "[HybridObject RNGoogleMapsPlusView]"
+  }
+
   // Properties
   @get:DoNotStrip
   @get:Keep

package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/RNAndroidLocationConfig.kt

@@ -9,7 +9,6 @@ package com.rngooglemapsplus
 
 import androidx.annotation.Keep
 import com.facebook.proguard.annotations.DoNotStrip
-import com.margelo.nitro.core.*
 
 
 /**
@@ -28,6 +27,8 @@ data class RNAndroidLocationConfig(
   @Keep
   val minUpdateInterval: Double?
 ) {
+  /* primary constructor */
+
   private companion object {
     /**
      * Constructor called from C++

package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/RNCamera.kt

@@ -9,7 +9,6 @@ package com.rngooglemapsplus
 
 import androidx.annotation.Keep
 import com.facebook.proguard.annotations.DoNotStrip
-import com.margelo.nitro.core.*
 
 
 /**
@@ -31,6 +30,8 @@ data class RNCamera(
   @Keep
   val tilt: Double
 ) {
+  /* primary constructor */
+
   private companion object {
     /**
      * Constructor called from C++

package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/RNCameraUpdate.kt

@@ -9,7 +9,6 @@ package com.rngooglemapsplus
 
 import androidx.annotation.Keep
 import com.facebook.proguard.annotations.DoNotStrip
-import com.margelo.nitro.core.*
 
 
 /**
@@ -31,6 +30,8 @@ data class RNCameraUpdate(
   @Keep
   val tilt: Double?
 ) {
+  /* primary constructor */
+
   private companion object {
     /**
      * Constructor called from C++

package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/RNCircle.kt

@@ -9,7 +9,6 @@ package com.rngooglemapsplus
 
 import androidx.annotation.Keep
 import com.facebook.proguard.annotations.DoNotStrip
-import com.margelo.nitro.core.*
 
 
 /**
@@ -43,6 +42,8 @@ data class RNCircle(
   @Keep
   val fillColor: String?
 ) {
+  /* primary constructor */
+
   private companion object {
     /**
      * Constructor called from C++

package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/RNHeatmap.kt

@@ -9,7 +9,6 @@ package com.rngooglemapsplus
 
 import androidx.annotation.Keep
 import com.facebook.proguard.annotations.DoNotStrip
-import com.margelo.nitro.core.*
 
 
 /**
@@ -40,6 +39,8 @@ data class RNHeatmap(
   @Keep
   val gradient: RNHeatmapGradient?
 ) {
+  /* primary constructor */
+
   private companion object {
     /**
      * Constructor called from C++

package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/RNHeatmapGradient.kt

@@ -9,7 +9,6 @@ package com.rngooglemapsplus
 
 import androidx.annotation.Keep
 import com.facebook.proguard.annotations.DoNotStrip
-import com.margelo.nitro.core.*
 
 
 /**
@@ -28,6 +27,8 @@ data class RNHeatmapGradient(
   @Keep
   val colorMapSize: Double
 ) {
+  /* primary constructor */
+
   private companion object {
     /**
      * Constructor called from C++

package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/RNHeatmapPoint.kt

@@ -9,7 +9,6 @@ package com.rngooglemapsplus
 
 import androidx.annotation.Keep
 import com.facebook.proguard.annotations.DoNotStrip
-import com.margelo.nitro.core.*
 
 
 /**
@@ -28,6 +27,8 @@ data class RNHeatmapPoint(
   @Keep
   val weight: Double
 ) {
+  /* primary constructor */
+
   private companion object {
     /**
      * Constructor called from C++

package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/RNIOSLocationConfig.kt

@@ -9,7 +9,6 @@ package com.rngooglemapsplus
 
 import androidx.annotation.Keep
 import com.facebook.proguard.annotations.DoNotStrip
-import com.margelo.nitro.core.*
 
 
 /**
@@ -25,6 +24,8 @@ data class RNIOSLocationConfig(
   @Keep
   val distanceFilterMeters: Double?
 ) {
+  /* primary constructor */
+
   private companion object {
     /**
      * Constructor called from C++

package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/RNIndoorBuilding.kt

@@ -9,7 +9,6 @@ package com.rngooglemapsplus
 
 import androidx.annotation.Keep
 import com.facebook.proguard.annotations.DoNotStrip
-import com.margelo.nitro.core.*
 
 
 /**
@@ -31,6 +30,8 @@ data class RNIndoorBuilding(
   @Keep
   val underground: Boolean?
 ) {
+  /* primary constructor */
+
   private companion object {
     /**
      * Constructor called from C++

package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/RNIndoorLevel.kt

@@ -9,7 +9,6 @@ package com.rngooglemapsplus
 
 import androidx.annotation.Keep
 import com.facebook.proguard.annotations.DoNotStrip
-import com.margelo.nitro.core.*
 
 
 /**
@@ -31,6 +30,8 @@ data class RNIndoorLevel(
   @Keep
   val active: Boolean?
 ) {
+  /* primary constructor */
+
   private companion object {
     /**
      * Constructor called from C++

package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/RNInitialProps.kt

@@ -9,7 +9,6 @@ package com.rngooglemapsplus
 
 import androidx.annotation.Keep
 import com.facebook.proguard.annotations.DoNotStrip
-import com.margelo.nitro.core.*
 
 
 /**
@@ -31,6 +30,8 @@ data class RNInitialProps(
   @Keep
   val backgroundColor: String?
 ) {
+  /* primary constructor */
+
   private companion object {
     /**
      * Constructor called from C++

package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/RNKMLayer.kt

@@ -9,7 +9,6 @@ package com.rngooglemapsplus
 
 import androidx.annotation.Keep
 import com.facebook.proguard.annotations.DoNotStrip
-import com.margelo.nitro.core.*
 
 
 /**
@@ -25,6 +24,8 @@ data class RNKMLayer(
   @Keep
   val kmlString: String
 ) {
+  /* primary constructor */
+
   private companion object {
     /**
      * Constructor called from C++

package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/RNLatLng.kt

@@ -9,7 +9,6 @@ package com.rngooglemapsplus
 
 import androidx.annotation.Keep
 import com.facebook.proguard.annotations.DoNotStrip
-import com.margelo.nitro.core.*
 
 
 /**
@@ -25,6 +24,8 @@ data class RNLatLng(
   @Keep
   val longitude: Double
 ) {
+  /* primary constructor */
+
   private companion object {
     /**
      * Constructor called from C++

package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/RNLatLngBounds.kt

@@ -9,7 +9,6 @@ package com.rngooglemapsplus
 
 import androidx.annotation.Keep
 import com.facebook.proguard.annotations.DoNotStrip
-import com.margelo.nitro.core.*
 
 
 /**
@@ -25,6 +24,8 @@ data class RNLatLngBounds(
   @Keep
   val northeast: RNLatLng
 ) {
+  /* primary constructor */
+
   private companion object {
     /**
      * Constructor called from C++

package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/RNLocation.kt

@@ -9,7 +9,6 @@ package com.rngooglemapsplus
 
 import androidx.annotation.Keep
 import com.facebook.proguard.annotations.DoNotStrip
-import com.margelo.nitro.core.*
 
 
 /**
@@ -43,6 +42,8 @@ data class RNLocation(
   @Keep
   val ios: RNLocationIOS?
 ) {
+  /* primary constructor */
+
   private companion object {
     /**
      * Constructor called from C++

package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/RNLocationAndroid.kt

@@ -9,7 +9,6 @@ package com.rngooglemapsplus
 
 import androidx.annotation.Keep
 import com.facebook.proguard.annotations.DoNotStrip
-import com.margelo.nitro.core.*
 
 
 /**
@@ -43,6 +42,8 @@ data class RNLocationAndroid(
   @Keep
   val isMock: Boolean?
 ) {
+  /* primary constructor */
+
   private companion object {
     /**
      * Constructor called from C++

package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/RNLocationConfig.kt

@@ -9,7 +9,6 @@ package com.rngooglemapsplus
 
 import androidx.annotation.Keep
 import com.facebook.proguard.annotations.DoNotStrip
-import com.margelo.nitro.core.*
 
 
 /**
@@ -25,6 +24,8 @@ data class RNLocationConfig(
   @Keep
   val ios: RNIOSLocationConfig?
 ) {
+  /* primary constructor */
+
   private companion object {
     /**
      * Constructor called from C++

package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/RNLocationIOS.kt

@@ -9,7 +9,6 @@ package com.rngooglemapsplus
 
 import androidx.annotation.Keep
 import com.facebook.proguard.annotations.DoNotStrip
-import com.margelo.nitro.core.*
 
 
 /**
@@ -40,6 +39,8 @@ data class RNLocationIOS(
   @Keep
   val timestamp: Double?
 ) {
+  /* primary constructor */
+
   private companion object {
     /**
      * Constructor called from C++

package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/RNLocationPermissionResult.kt

@@ -9,7 +9,6 @@ package com.rngooglemapsplus
 
 import androidx.annotation.Keep
 import com.facebook.proguard.annotations.DoNotStrip
-import com.margelo.nitro.core.*
 
 
 /**
@@ -25,6 +24,8 @@ data class RNLocationPermissionResult(
   @Keep
   val ios: RNIOSPermissionResult?
 ) {
+  /* primary constructor */
+
   private companion object {
     /**
      * Constructor called from C++

package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/RNMapPadding.kt

@@ -9,7 +9,6 @@ package com.rngooglemapsplus
 
 import androidx.annotation.Keep
 import com.facebook.proguard.annotations.DoNotStrip
-import com.margelo.nitro.core.*
 
 
 /**
@@ -31,6 +30,8 @@ data class RNMapPadding(
   @Keep
   val right: Double
 ) {
+  /* primary constructor */
+
   private companion object {
     /**
      * Constructor called from C++

package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/RNMapUiSettings.kt

@@ -9,7 +9,6 @@ package com.rngooglemapsplus
 
 import androidx.annotation.Keep
 import com.facebook.proguard.annotations.DoNotStrip
-import com.margelo.nitro.core.*
 
 
 /**
@@ -58,6 +57,8 @@ data class RNMapUiSettings(
   @Keep
   val consumeOnMyLocationButtonPress: Boolean?
 ) {
+  /* primary constructor */
+
   private companion object {
     /**
      * Constructor called from C++

package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/RNMapZoomConfig.kt

@@ -9,7 +9,6 @@ package com.rngooglemapsplus
 
 import androidx.annotation.Keep
 import com.facebook.proguard.annotations.DoNotStrip
-import com.margelo.nitro.core.*
 
 
 /**
@@ -25,6 +24,8 @@ data class RNMapZoomConfig(
   @Keep
   val max: Double?
 ) {
+  /* primary constructor */
+
   private companion object {
     /**
      * Constructor called from C++

package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/RNMarker.kt

@@ -9,7 +9,6 @@ package com.rngooglemapsplus
 
 import androidx.annotation.Keep
 import com.facebook.proguard.annotations.DoNotStrip
-import com.margelo.nitro.core.*
 
 
 /**
@@ -58,6 +57,8 @@ data class RNMarker(
   @Keep
   val infoWindowIconSvg: RNMarkerSvg?
 ) {
+  /* primary constructor */
+
   private companion object {
     /**
      * Constructor called from C++

package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/RNMarkerSvg.kt

@@ -9,7 +9,6 @@ package com.rngooglemapsplus
 
 import androidx.annotation.Keep
 import com.facebook.proguard.annotations.DoNotStrip
-import com.margelo.nitro.core.*
 
 
 /**
@@ -28,6 +27,8 @@ data class RNMarkerSvg(
   @Keep
   val svgString: String
 ) {
+  /* primary constructor */
+
   private companion object {
     /**
      * Constructor called from C++

package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/RNPolygon.kt

@@ -9,7 +9,6 @@ package com.rngooglemapsplus
 
 import androidx.annotation.Keep
 import com.facebook.proguard.annotations.DoNotStrip
-import com.margelo.nitro.core.*
 
 
 /**
@@ -46,6 +45,8 @@ data class RNPolygon(
   @Keep
   val geodesic: Boolean?
 ) {
+  /* primary constructor */
+
   private companion object {
     /**
      * Constructor called from C++

package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/RNPolygonHole.kt

@@ -9,7 +9,6 @@ package com.rngooglemapsplus
 
 import androidx.annotation.Keep
 import com.facebook.proguard.annotations.DoNotStrip
-import com.margelo.nitro.core.*
 
 
 /**
@@ -22,6 +21,8 @@ data class RNPolygonHole(
   @Keep
   val coordinates: Array<RNLatLng>
 ) {
+  /* primary constructor */
+
   private companion object {
     /**
      * Constructor called from C++

package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/RNPolyline.kt

@@ -9,7 +9,6 @@ package com.rngooglemapsplus
 
 import androidx.annotation.Keep
 import com.facebook.proguard.annotations.DoNotStrip
-import com.margelo.nitro.core.*
 
 
 /**
@@ -46,6 +45,8 @@ data class RNPolyline(
   @Keep
   val width: Double?
 ) {
+  /* primary constructor */
+
   private companion object {
     /**
      * Constructor called from C++

package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/RNPosition.kt

@@ -9,7 +9,6 @@ package com.rngooglemapsplus
 
 import androidx.annotation.Keep
 import com.facebook.proguard.annotations.DoNotStrip
-import com.margelo.nitro.core.*
 
 
 /**
@@ -25,6 +24,8 @@ data class RNPosition(
   @Keep
   val y: Double
 ) {
+  /* primary constructor */
+
   private companion object {
     /**
      * Constructor called from C++

package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/RNRegion.kt

@@ -9,7 +9,6 @@ package com.rngooglemapsplus
 
 import androidx.annotation.Keep
 import com.facebook.proguard.annotations.DoNotStrip
-import com.margelo.nitro.core.*
 
 
 /**
@@ -34,6 +33,8 @@ data class RNRegion(
   @Keep
   val latLngBounds: RNLatLngBounds
 ) {
+  /* primary constructor */
+
   private companion object {
     /**
      * Constructor called from C++

package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/RNSize.kt

@@ -9,7 +9,6 @@ package com.rngooglemapsplus
 
 import androidx.annotation.Keep
 import com.facebook.proguard.annotations.DoNotStrip
-import com.margelo.nitro.core.*
 
 
 /**
@@ -25,6 +24,8 @@ data class RNSize(
   @Keep
   val height: Double
 ) {
+  /* primary constructor */
+
   private companion object {
     /**
      * Constructor called from C++

package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/RNSnapshotOptions.kt

@@ -9,7 +9,6 @@ package com.rngooglemapsplus
 
 import androidx.annotation.Keep
 import com.facebook.proguard.annotations.DoNotStrip
-import com.margelo.nitro.core.*
 
 
 /**
@@ -31,6 +30,8 @@ data class RNSnapshotOptions(
   @Keep
   val resultType: RNSnapshotResultType
 ) {
+  /* primary constructor */
+
   private companion object {
     /**
      * Constructor called from C++

package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/RNUrlTileOverlay.kt

@@ -9,7 +9,6 @@ package com.rngooglemapsplus
 
 import androidx.annotation.Keep
 import com.facebook.proguard.annotations.DoNotStrip
-import com.margelo.nitro.core.*
 
 
 /**
@@ -37,6 +36,8 @@ data class RNUrlTileOverlay(
   @Keep
   val fadeIn: Boolean?
 ) {
+  /* primary constructor */
+
   private companion object {
     /**
      * Constructor called from C++

package/nitrogen/generated/ios/RNGoogleMapsPlus-Swift-Cxx-Bridge.hpp

@@ -145,7 +145,6 @@ namespace RNGoogleMapsPlus { class HybridRNGoogleMapsPlusViewSpec_cxx; }
 #include "RNSize.hpp"
 #include "RNUrlTileOverlay.hpp"
 #include "RNUserInterfaceStyle.hpp"
-#include <NitroModules/FastVectorCopy.hpp>
 #include <NitroModules/Promise.hpp>
 #include <NitroModules/PromiseHolder.hpp>
 #include <NitroModules/Result.hpp>
@@ -680,11 +679,10 @@ namespace margelo::nitro::rngooglemapsplus::bridge::swift {
    * Specialized version of `std::vector<double>`.
    */
   using std__vector_double_ = std::vector<double>;
-  inline std::vector<double> copy_std__vector_double_(const double* CONTIGUOUS_MEMORY NON_NULL data, size_t size) noexcept {
-    return margelo::nitro::FastVectorCopy<double>(data, size);
-  }
-  inline const double* CONTIGUOUS_MEMORY NON_NULL get_data_std__vector_double_(const std::vector<double>& vector) noexcept {
-    return vector.data();
+  inline std::vector<double> create_std__vector_double_(size_t size) noexcept {
+    std::vector<double> vector;
+    vector.reserve(size);
+    return vector;
   }
   
   // pragma MARK: std::optional<RNHeatmapGradient>

package/nitrogen/generated/ios/c++/HybridRNGoogleMapsPlusModuleSpecSwift.hpp

@@ -59,6 +59,9 @@ namespace margelo::nitro::rngooglemapsplus {
     void dispose() noexcept override {
       _swiftPart.dispose();
     }
+    std::string toString() override {
+      return _swiftPart.toString();
+    }
 
   public:
     // Properties

package/nitrogen/generated/ios/c++/HybridRNGoogleMapsPlusViewSpecSwift.hpp

@@ -185,6 +185,9 @@ namespace margelo::nitro::rngooglemapsplus {
     void dispose() noexcept override {
       _swiftPart.dispose();
     }
+    std::string toString() override {
+      return _swiftPart.toString();
+    }
 
   public:
     // Properties

package/nitrogen/generated/ios/swift/HybridRNGoogleMapsPlusModuleSpec.swift

@@ -7,6 +7,7 @@
 
 import Foundation
 import NitroModules
+import NitroModules
 
 /// See ``HybridRNGoogleMapsPlusModuleSpec``
 public protocol HybridRNGoogleMapsPlusModuleSpec_protocol: HybridObject {
@@ -20,6 +21,13 @@ public protocol HybridRNGoogleMapsPlusModuleSpec_protocol: HybridObject {
   func isGooglePlayServicesAvailable() throws -> Bool
 }
 
+public extension HybridRNGoogleMapsPlusModuleSpec_protocol {
+  /// Default implementation of ``HybridObject.toString``
+  func toString() -> String {
+    return "[HybridObject RNGoogleMapsPlusModule]"
+  }
+}
+
 /// See ``HybridRNGoogleMapsPlusModuleSpec``
 open class HybridRNGoogleMapsPlusModuleSpec_base {
   private weak var cxxWrapper: HybridRNGoogleMapsPlusModuleSpec_cxx? = nil

package/nitrogen/generated/ios/swift/HybridRNGoogleMapsPlusModuleSpec_cxx.swift

@@ -7,6 +7,7 @@
 
 import Foundation
 import NitroModules
+import NitroModules
 
 /**
  * A class implementation that bridges HybridRNGoogleMapsPlusModuleSpec over to C++.
@@ -76,7 +77,7 @@ open class HybridRNGoogleMapsPlusModuleSpec_cxx {
    */
   public func getCxxPart() -> bridge.std__shared_ptr_HybridRNGoogleMapsPlusModuleSpec_ {
     let cachedCxxPart = self.__cxxPart.lock()
-    if cachedCxxPart.__convertToBool() {
+    if Bool(fromCxx: cachedCxxPart) {
       return cachedCxxPart
     } else {
       let newCxxPart = bridge.create_std__shared_ptr_HybridRNGoogleMapsPlusModuleSpec_(self.toUnsafe())
@@ -105,6 +106,14 @@ open class HybridRNGoogleMapsPlusModuleSpec_cxx {
     self.__implementation.dispose()
   }
 
+  /**
+   * Call toString() on the Swift class.
+   */
+  @inline(__always)
+  public func toString() -> String {
+    return self.__implementation.toString()
+  }
+
   // Properties
   
 

package/nitrogen/generated/ios/swift/HybridRNGoogleMapsPlusViewSpec.swift

@@ -7,6 +7,7 @@
 
 import Foundation
 import NitroModules
+import NitroModules
 
 /// See ``HybridRNGoogleMapsPlusViewSpec``
 public protocol HybridRNGoogleMapsPlusViewSpec_protocol: HybridObject, HybridView {
@@ -70,6 +71,13 @@ public protocol HybridRNGoogleMapsPlusViewSpec_protocol: HybridObject, HybridVie
   func isGooglePlayServicesAvailable() throws -> Bool
 }
 
+public extension HybridRNGoogleMapsPlusViewSpec_protocol {
+  /// Default implementation of ``HybridObject.toString``
+  func toString() -> String {
+    return "[HybridObject RNGoogleMapsPlusView]"
+  }
+}
+
 /// See ``HybridRNGoogleMapsPlusViewSpec``
 open class HybridRNGoogleMapsPlusViewSpec_base {
   private weak var cxxWrapper: HybridRNGoogleMapsPlusViewSpec_cxx? = nil

package/nitrogen/generated/ios/swift/HybridRNGoogleMapsPlusViewSpec_cxx.swift

@@ -7,6 +7,7 @@
 
 import Foundation
 import NitroModules
+import NitroModules
 
 /**
  * A class implementation that bridges HybridRNGoogleMapsPlusViewSpec over to C++.
@@ -76,7 +77,7 @@ open class HybridRNGoogleMapsPlusViewSpec_cxx {
    */
   public func getCxxPart() -> bridge.std__shared_ptr_HybridRNGoogleMapsPlusViewSpec_ {
     let cachedCxxPart = self.__cxxPart.lock()
-    if cachedCxxPart.__convertToBool() {
+    if Bool(fromCxx: cachedCxxPart) {
       return cachedCxxPart
     } else {
       let newCxxPart = bridge.create_std__shared_ptr_HybridRNGoogleMapsPlusViewSpec_(self.toUnsafe())
@@ -105,6 +106,14 @@ open class HybridRNGoogleMapsPlusViewSpec_cxx {
     self.__implementation.dispose()
   }
 
+  /**
+   * Call toString() on the Swift class.
+   */
+  @inline(__always)
+  public func toString() -> String {
+    return self.__implementation.toString()
+  }
+
   // Properties
   public final var initialProps: bridge.std__optional_RNInitialProps_ {
     @inline(__always)

package/nitrogen/generated/ios/swift/RNHeatmapGradient.swift

@@ -25,9 +25,13 @@ public extension RNHeatmapGradient {
         __vector.push_back(std.string(__item))
       }
       return __vector
-    }(), startPoints.withUnsafeBufferPointer { __pointer -> bridge.std__vector_double_ in
-      return bridge.copy_std__vector_double_(__pointer.baseAddress!, startPoints.count)
-    }, colorMapSize)
+    }(), { () -> bridge.std__vector_double_ in
+      var __vector = bridge.create_std__vector_double_(startPoints.count)
+      for __item in startPoints {
+        __vector.push_back(__item)
+      }
+      return __vector
+    }(), colorMapSize)
   }
 
   var colors: [String] {
@@ -50,17 +54,17 @@ public extension RNHeatmapGradient {
   var startPoints: [Double] {
     @inline(__always)
     get {
-      return { () -> [Double] in
-        let __data = bridge.get_data_std__vector_double_(self.__startPoints)
-        let __size = self.__startPoints.size()
-        return Array(UnsafeBufferPointer(start: __data, count: __size))
-      }()
+      return self.__startPoints.map({ __item in __item })
     }
     @inline(__always)
     set {
-      self.__startPoints = newValue.withUnsafeBufferPointer { __pointer -> bridge.std__vector_double_ in
-        return bridge.copy_std__vector_double_(__pointer.baseAddress!, newValue.count)
-      }
+      self.__startPoints = { () -> bridge.std__vector_double_ in
+        var __vector = bridge.create_std__vector_double_(newValue.count)
+        for __item in newValue {
+          __vector.push_back(__item)
+        }
+        return __vector
+      }()
     }
   }
   

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-google-maps-plus",
-  "version": "1.8.2",
+  "version": "1.8.4-dev.2",
   "description": "React Native wrapper for Android & iOS Google Maps SDK",
   "main": "./lib/module/index.js",
   "module": "./lib/module/index.js",
@@ -80,9 +80,9 @@
   "devDependencies": {
     "@commitlint/cli": "20.1.0",
     "@commitlint/config-conventional": "20.0.0",
-    "@eslint/compat": "1.4.0",
+    "@eslint/compat": "1.4.1",
     "@eslint/eslintrc": "3.3.1",
-    "@eslint/js": "9.38.0",
+    "@eslint/js": "9.39.1",
     "@expo/config-plugins": "54.0.2",
     "@jamesacarr/eslint-formatter-github-actions": "0.2.0",
     "@react-native/babel-preset": "0.82.1",
@@ -95,18 +95,18 @@
     "clang-format-node": "2.0.3",
     "conventional-changelog-conventionalcommits": "9.1.0",
     "del-cli": "7.0.0",
-    "eslint": "9.38.0",
+    "eslint": "9.39.1",
     "eslint-config-prettier": "10.1.8",
     "eslint-plugin-ft-flow": "3.0.11",
     "eslint-plugin-prettier": "5.5.4",
     "jest": "30.2.0",
-    "lefthook": "2.0.0",
-    "nitrogen": "0.30.2",
+    "lefthook": "2.0.2",
+    "nitrogen": "0.31.4",
     "prettier": "3.6.2",
     "react": "19.1.1",
     "react-native": "0.82.1",
-    "react-native-builder-bob": "0.40.13",
-    "react-native-nitro-modules": "0.30.2",
+    "react-native-builder-bob": "0.40.14",
+    "react-native-nitro-modules": "0.31.4",
     "semantic-release": "25.0.1",
     "typescript": "5.9.3"
   },