react-native-google-maps-plus 1.7.0-dev.6 → 1.7.0-dev.8

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

@@ -4,6 +4,7 @@ import android.graphics.Color
 import com.facebook.react.uimanager.PixelUtil.dpToPx
 import com.google.android.gms.maps.model.Circle
 import com.google.android.gms.maps.model.CircleOptions
+import com.rngooglemapsplus.extensions.onUi
 import com.rngooglemapsplus.extensions.toColor
 import com.rngooglemapsplus.extensions.toLatLng
 
@@ -23,7 +24,7 @@ class MapCircleBuilder {
     prev: RNCircle,
     next: RNCircle,
     circle: Circle,
-  ) {
+  ) = onUi {
     if (prev.center.latitude != next.center.latitude ||
       prev.center.longitude != next.center.longitude
     ) {

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

@@ -19,7 +19,7 @@ class MapHeatmapBuilder {
           heatmap.gradient?.let {
             val colors = it.colors.map { c -> c.toColor() }.toIntArray()
             val startPoints = it.startPoints.map { p -> p.toFloat() }.toFloatArray()
-            gradient(Gradient(colors, startPoints))
+            gradient(Gradient(colors, startPoints, it.colorMapSize.toInt()))
           }
         }.build()
 

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

@@ -0,0 +1,22 @@
+package com.rngooglemapsplus.extensions
+
+import com.facebook.react.bridge.UiThreadUtil
+import kotlinx.coroutines.CompletableDeferred
+import kotlinx.coroutines.runBlocking
+
+inline fun onUi(crossinline block: () -> Unit) {
+  if (UiThreadUtil.isOnUiThread()) {
+    block()
+  } else {
+    UiThreadUtil.runOnUiThread { block() }
+  }
+}
+
+inline fun <T> onUiSync(crossinline block: () -> T): T {
+  if (UiThreadUtil.isOnUiThread()) return block()
+  val result = CompletableDeferred<T>()
+  UiThreadUtil.runOnUiThread {
+    runCatching(block).onSuccess(result::complete).onFailure(result::completeExceptionally)
+  }
+  return runBlocking { result.await() }
+}

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

@@ -16,6 +16,7 @@ import com.google.android.gms.maps.model.BitmapDescriptorFactory
 import com.google.android.gms.maps.model.Marker
 import com.google.android.gms.maps.model.MarkerOptions
 import com.rngooglemapsplus.extensions.markerStyleEquals
+import com.rngooglemapsplus.extensions.onUi
 import com.rngooglemapsplus.extensions.styleHash
 import com.rngooglemapsplus.extensions.toLatLng
 import kotlinx.coroutines.CoroutineScope
@@ -28,6 +29,7 @@ import kotlinx.coroutines.withContext
 import java.net.HttpURLConnection
 import java.net.URL
 import java.net.URLDecoder
+import java.util.concurrent.ConcurrentHashMap
 import kotlin.coroutines.coroutineContext
 
 class MapMarkerBuilder(
@@ -42,7 +44,7 @@ class MapMarkerBuilder(
       ): Int = 1
     }
 
-  private val jobsById = mutableMapOf<String, Job>()
+  private val jobsById = ConcurrentHashMap<String, Job>()
 
   init {
     // / TODO: refactor with androidsvg 1.5 release
@@ -162,7 +164,7 @@ class MapMarkerBuilder(
     prev: RNMarker,
     next: RNMarker,
     marker: Marker,
-  ) {
+  ) = onUi {
     if (prev.coordinate.latitude != next.coordinate.latitude ||
       prev.coordinate.longitude != next.coordinate.longitude
     ) {

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

@@ -4,6 +4,7 @@ import android.graphics.Color
 import com.facebook.react.uimanager.PixelUtil.dpToPx
 import com.google.android.gms.maps.model.Polygon
 import com.google.android.gms.maps.model.PolygonOptions
+import com.rngooglemapsplus.extensions.onUi
 import com.rngooglemapsplus.extensions.toColor
 import com.rngooglemapsplus.extensions.toLatLng
 
@@ -30,7 +31,7 @@ class MapPolygonBuilder {
     prev: RNPolygon,
     next: RNPolygon,
     poly: Polygon,
-  ) {
+  ) = onUi {
     val coordsChanged =
       prev.coordinates.size != next.coordinates.size ||
         !prev.coordinates.zip(next.coordinates).all { (a, b) ->

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

@@ -9,6 +9,7 @@ import com.google.android.gms.maps.model.Polyline
 import com.google.android.gms.maps.model.PolylineOptions
 import com.google.android.gms.maps.model.RoundCap
 import com.google.android.gms.maps.model.SquareCap
+import com.rngooglemapsplus.extensions.onUi
 import com.rngooglemapsplus.extensions.toColor
 import com.rngooglemapsplus.extensions.toLatLng
 
@@ -34,7 +35,7 @@ class MapPolylineBuilder {
     prev: RNPolyline,
     next: RNPolyline,
     polyline: Polyline,
-  ) {
+  ) = onUi {
     val coordsChanged =
       prev.coordinates.size != next.coordinates.size ||
         !prev.coordinates.zip(next.coordinates).all { (a, b) ->

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

@@ -1,7 +1,6 @@
 package com.rngooglemapsplus
 
 import com.facebook.proguard.annotations.DoNotStrip
-import com.facebook.react.bridge.UiThreadUtil
 import com.facebook.react.uimanager.ThemedReactContext
 import com.google.android.gms.maps.GoogleMapOptions
 import com.google.android.gms.maps.model.MapStyleOptions
@@ -155,7 +154,7 @@ class RNGoogleMapsPlusView(
 
           !prev.markerEquals(next) ->
             view.updateMarker(id) { marker ->
-              onUi { markerBuilder.update(prev, next, marker) }
+              markerBuilder.update(prev, next, marker)
             }
         }
       }
@@ -179,7 +178,7 @@ class RNGoogleMapsPlusView(
 
           !prev.polylineEquals(next) ->
             view.updatePolyline(id) { polyline ->
-              onUi { polylineBuilder.update(prev, next, polyline) }
+              polylineBuilder.update(prev, next, polyline)
             }
         }
       }
@@ -204,7 +203,7 @@ class RNGoogleMapsPlusView(
 
           !prev.polygonEquals(next) ->
             view.updatePolygon(id) { polygon ->
-              onUi { polygonBuilder.update(prev, next, polygon) }
+              polygonBuilder.update(prev, next, polygon)
             }
         }
       }
@@ -229,7 +228,7 @@ class RNGoogleMapsPlusView(
 
           !prev.circleEquals(next) ->
             view.updateCircle(id) { circle ->
-              onUi { circleBuilder.update(prev, next, circle) }
+              circleBuilder.update(prev, next, circle)
             }
         }
       }
@@ -296,7 +295,7 @@ class RNGoogleMapsPlusView(
       view.onMapReady = cb
     }
 
-  override var onMapLoaded: ((Boolean) -> Unit)? = null
+  override var onMapLoaded: ((RNRegion, RNCamera) -> Unit)? = null
     set(cb) {
       view.onMapLoaded = cb
     }
@@ -416,14 +415,12 @@ class RNGoogleMapsPlusView(
     animated: Boolean?,
     durationMs: Double?,
   ) {
-    onUi {
-      val current = view.currentCamera
-      view.setCamera(
-        camera.toCameraPosition(current),
-        animated == true,
-        durationMs?.toInt() ?: 3000,
-      )
-    }
+    val current = view.currentCamera
+    view.setCamera(
+      camera.toCameraPosition(current),
+      animated == true,
+      durationMs?.toInt() ?: 3000,
+    )
   }
 
   override fun setCameraToCoordinates(
@@ -481,11 +478,3 @@ class RNGoogleMapsPlusView(
 
   override fun isGooglePlayServicesAvailable(): Boolean = playServiceHandler.isPlayServicesAvailable()
 }
-
-private inline fun onUi(crossinline block: () -> Unit) {
-  if (UiThreadUtil.isOnUiThread()) {
-    block()
-  } else {
-    UiThreadUtil.runOnUiThread { block() }
-  }
-}

package/ios/GoogleMapViewImpl.swift

@@ -261,7 +261,7 @@ GMSIndoorDisplayDelegate {
 
   var onMapError: ((RNMapErrorCode) -> Void)?
   var onMapReady: ((Bool) -> Void)?
-  var onMapLoaded: ((Bool) -> Void)?
+  var onMapLoaded: ((RNRegion, RNCamera) -> Void)?
   var onLocationUpdate: ((RNLocation) -> Void)?
   var onLocationError: ((_ error: RNLocationErrorCode) -> Void)?
   var onMapPress: ((RNLatLng) -> Void)?
@@ -703,10 +703,14 @@ GMSIndoorDisplayDelegate {
   func mapViewDidFinishTileRendering(_ mapView: GMSMapView) {
     guard !loaded else { return }
     loaded = true
-    onMapLoaded?(true)
+    let visibleRegion = mapView.projection.visibleRegion().toRNRegion()
+    let camera = mapView.camera.toRNCamera()
+
+    self.onMapLoaded?(visibleRegion, camera)
   }
 
   func mapView(_ mapView: GMSMapView, willMove gesture: Bool) {
+    if !loaded { return }
     onMain {
       self.cameraMoveReasonIsGesture = gesture
 
@@ -718,6 +722,7 @@ GMSIndoorDisplayDelegate {
   }
 
   func mapView(_ mapView: GMSMapView, didChange position: GMSCameraPosition) {
+    if !loaded { return }
     onMain {
       let visibleRegion = mapView.projection.visibleRegion().toRNRegion()
       let camera = mapView.camera.toRNCamera()
@@ -728,6 +733,7 @@ GMSIndoorDisplayDelegate {
   }
 
   func mapView(_ mapView: GMSMapView, idleAt position: GMSCameraPosition) {
+    if !loaded { return }
     onMain {
       let visibleRegion = mapView.projection.visibleRegion().toRNRegion()
       let camera = mapView.camera.toRNCamera()

package/ios/MapCircleBuilder.swift

@@ -1,6 +1,7 @@
 import GoogleMaps
 
 final class MapCircleBuilder {
+  @MainActor
   func build(_ c: RNCircle) -> GMSCircle {
     let circle = GMSCircle()
     circle.position = c.center.toCLLocationCoordinate2D()
@@ -14,6 +15,7 @@ final class MapCircleBuilder {
     return circle
   }
 
+  @MainActor
   func update(_ prev: RNCircle, _ next: RNCircle, _ c: GMSCircle) {
     if prev.center.latitude != next.center.latitude
       || prev.center.longitude != next.center.longitude {

package/ios/MapHeatmapBuilder.swift

@@ -4,6 +4,7 @@ import GoogleMapsUtils
 import UIKit
 
 final class MapHeatmapBuilder {
+  @MainActor
   func build(_ h: RNHeatmap) -> GMUHeatmapTileLayer {
     let heatmap = GMUHeatmapTileLayer()
     heatmap.weightedData = h.weightedData.toWeightedLatLngs()
@@ -18,7 +19,7 @@ final class MapHeatmapBuilder {
       heatmap.gradient = GMUGradient(
         colors: colors,
         startPoints: startPoints,
-        colorMapSize: 256
+        colorMapSize: UInt(g.colorMapSize)
       )
     }
 

package/ios/MapMarkerBuilder.swift

@@ -10,6 +10,7 @@ final class MapMarkerBuilder {
   }()
   private var tasks: [String: Task<Void, Never>] = [:]
 
+  @MainActor
   func build(_ m: RNMarker, icon: UIImage?) -> GMSMarker {
     let marker = GMSMarker(
       position: m.coordinate.toCLLocationCoordinate2D()
@@ -160,11 +161,13 @@ final class MapMarkerBuilder {
     tasks[id] = task
   }
 
+  @MainActor
   func cancelIconTask(_ id: String) {
     tasks[id]?.cancel()
     tasks.removeValue(forKey: id)
   }
 
+  @MainActor
   func cancelAllIconTasks() {
     let ids = Array(tasks.keys)
     for id in ids {
@@ -174,6 +177,7 @@ final class MapMarkerBuilder {
     iconCache.removeAllObjects()
   }
 
+  @MainActor
   private func renderUIImage(_ m: RNMarker, _ scale: CGFloat) async -> UIImage? {
     guard let iconSvg = m.iconSvg,
           let data = iconSvg.svgString.data(using: .utf8)

package/ios/MapPolygonBuilder.swift

@@ -1,6 +1,7 @@
 import GoogleMaps
 
 final class MapPolygonBuilder {
+  @MainActor
   func build(_ p: RNPolygon) -> GMSPolygon {
     let path = GMSMutablePath()
     p.coordinates.forEach {
@@ -28,6 +29,7 @@ final class MapPolygonBuilder {
     return pg
   }
 
+  @MainActor
   func update(_ prev: RNPolygon, _ next: RNPolygon, _ pg: GMSPolygon) {
     let coordsChanged =
       prev.coordinates.count != next.coordinates.count

package/ios/MapPolylineBuilder.swift

@@ -1,6 +1,7 @@
 import GoogleMaps
 
 final class MapPolylineBuilder {
+  @MainActor
   func build(_ p: RNPolyline) -> GMSPolyline {
     let path = GMSMutablePath()
     p.coordinates.forEach {
@@ -22,6 +23,7 @@ final class MapPolylineBuilder {
     return pl
   }
 
+  @MainActor
   func update(_ prev: RNPolyline, _ next: RNPolyline, _ pl: GMSPolyline) {
     let coordsChanged =
       prev.coordinates.count != next.coordinates.count

package/ios/MapUrlTileOverlayBuilder.swift

@@ -1,6 +1,7 @@
 import GoogleMaps
 
 class MapUrlTileOverlayBuilder {
+  @MainActor
   func build(_ t: RNUrlTileOverlay) -> GMSURLTileLayer {
 
     let constructor: GMSTileURLConstructor = { (x: UInt, y: UInt, zoom: UInt) in

package/ios/RNGoogleMapsPlusView.swift

@@ -325,7 +325,7 @@ final class RNGoogleMapsPlusView: HybridRNGoogleMapsPlusViewSpec {
     didSet { impl.onMapReady = onMapReady }
   }
   @MainActor
-  var onMapLoaded: ((Bool) -> Void)? {
+  var onMapLoaded: ((RNRegion, RNCamera) -> Void)? {
     didSet { impl.onMapLoaded = onMapLoaded }
   }
   @MainActor
@@ -385,19 +385,19 @@ final class RNGoogleMapsPlusView: HybridRNGoogleMapsPlusViewSpec {
     didSet { impl.onIndoorLevelActivated = onIndoorLevelActivated }
   }
   @MainActor
-  var onInfoWindowPress: ((String?) -> Void)?{
+  var onInfoWindowPress: ((String?) -> Void)? {
     didSet { impl.onInfoWindowPress = onInfoWindowPress }
   }
   @MainActor
-  var onInfoWindowClose: ((String?) -> Void)?{
+  var onInfoWindowClose: ((String?) -> Void)? {
     didSet { impl.onInfoWindowClose = onInfoWindowClose }
   }
   @MainActor
-  var onInfoWindowLongPress: ((String?) -> Void)?{
+  var onInfoWindowLongPress: ((String?) -> Void)? {
     didSet { impl.onInfoWindowLongPress = onInfoWindowLongPress }
   }
   @MainActor
-  var onMyLocationPress: ((RNLocation) -> Void)?{
+  var onMyLocationPress: ((RNLocation) -> Void)? {
     didSet { impl.onMyLocationPress = onMyLocationPress }
   }
   @MainActor

package/lib/typescript/src/RNGoogleMapsPlusView.nitro.d.ts

@@ -22,7 +22,7 @@ export interface RNGoogleMapsPlusViewProps extends HybridViewProps {
     locationConfig?: RNLocationConfig;
     onMapError?: (error: RNMapErrorCode) => void;
     onMapReady?: (ready: boolean) => void;
-    onMapLoaded?: (loaded: boolean) => void;
+    onMapLoaded?: (region: RNRegion, camera: RNCamera) => void;
     onLocationUpdate?: (location: RNLocation) => void;
     onLocationError?: (error: RNLocationErrorCode) => void;
     onMapPress?: (coordinate: RNLatLng) => void;

package/lib/typescript/src/RNGoogleMapsPlusView.nitro.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RNGoogleMapsPlusView.nitro.d.ts","sourceRoot":"","sources":["../../../src/RNGoogleMapsPlusView.nitro.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"RNGoogleMapsPlusView.nitro.d.ts","sourceRoot":"","sources":["../../../src/RNGoogleMapsPlusView.nitro.ts"],"names":[],"mappings":"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"}

package/nitrogen/generated/android/RNGoogleMapsPlusOnLoad.cpp

@@ -19,6 +19,7 @@
 #include "JHybridRNGoogleMapsPlusViewSpec.hpp"
 #include "JFunc_void_RNMapErrorCode.hpp"
 #include "JFunc_void_bool.hpp"
+#include "JFunc_void_RNRegion_RNCamera.hpp"
 #include "JFunc_void_RNLocation.hpp"
 #include "JFunc_void_RNLocationErrorCode.hpp"
 #include "JFunc_void_RNLatLng.hpp"
@@ -44,6 +45,7 @@ int initialize(JavaVM* vm) {
     margelo::nitro::rngooglemapsplus::JHybridRNGoogleMapsPlusViewSpec::registerNatives();
     margelo::nitro::rngooglemapsplus::JFunc_void_RNMapErrorCode_cxx::registerNatives();
     margelo::nitro::rngooglemapsplus::JFunc_void_bool_cxx::registerNatives();
+    margelo::nitro::rngooglemapsplus::JFunc_void_RNRegion_RNCamera_cxx::registerNatives();
     margelo::nitro::rngooglemapsplus::JFunc_void_RNLocation_cxx::registerNatives();
     margelo::nitro::rngooglemapsplus::JFunc_void_RNLocationErrorCode_cxx::registerNatives();
     margelo::nitro::rngooglemapsplus::JFunc_void_RNLatLng_cxx::registerNatives();

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

@@ -0,0 +1,83 @@
+///
+/// JFunc_void_RNRegion_RNCamera.hpp
+/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
+/// https://github.com/mrousavy/nitro
+/// Copyright © 2025 Marc Rousavy @ Margelo
+///
+
+#pragma once
+
+#include <fbjni/fbjni.h>
+#include <functional>
+
+#include "RNRegion.hpp"
+#include "RNCamera.hpp"
+#include <functional>
+#include "JRNRegion.hpp"
+#include "RNLatLng.hpp"
+#include "JRNLatLng.hpp"
+#include "RNLatLngBounds.hpp"
+#include "JRNLatLngBounds.hpp"
+#include "JRNCamera.hpp"
+#include <optional>
+
+namespace margelo::nitro::rngooglemapsplus {
+
+  using namespace facebook;
+
+  /**
+   * Represents the Java/Kotlin callback `(region: RNRegion, camera: RNCamera) -> Unit`.
+   * This can be passed around between C++ and Java/Kotlin.
+   */
+  struct JFunc_void_RNRegion_RNCamera: public jni::JavaClass<JFunc_void_RNRegion_RNCamera> {
+  public:
+    static auto constexpr kJavaDescriptor = "Lcom/rngooglemapsplus/Func_void_RNRegion_RNCamera;";
+
+  public:
+    /**
+     * Invokes the function this `JFunc_void_RNRegion_RNCamera` instance holds through JNI.
+     */
+    void invoke(const RNRegion& region, const RNCamera& camera) const {
+      static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JRNRegion> /* region */, jni::alias_ref<JRNCamera> /* camera */)>("invoke");
+      method(self(), JRNRegion::fromCpp(region), JRNCamera::fromCpp(camera));
+    }
+  };
+
+  /**
+   * An implementation of Func_void_RNRegion_RNCamera that is backed by a C++ implementation (using `std::function<...>`)
+   */
+  struct JFunc_void_RNRegion_RNCamera_cxx final: public jni::HybridClass<JFunc_void_RNRegion_RNCamera_cxx, JFunc_void_RNRegion_RNCamera> {
+  public:
+    static jni::local_ref<JFunc_void_RNRegion_RNCamera::javaobject> fromCpp(const std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */)>& func) {
+      return JFunc_void_RNRegion_RNCamera_cxx::newObjectCxxArgs(func);
+    }
+
+  public:
+    /**
+     * Invokes the C++ `std::function<...>` this `JFunc_void_RNRegion_RNCamera_cxx` instance holds.
+     */
+    void invoke_cxx(jni::alias_ref<JRNRegion> region, jni::alias_ref<JRNCamera> camera) {
+      _func(region->toCpp(), camera->toCpp());
+    }
+
+  public:
+    [[nodiscard]]
+    inline const std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */)>& getFunction() const {
+      return _func;
+    }
+
+  public:
+    static auto constexpr kJavaDescriptor = "Lcom/rngooglemapsplus/Func_void_RNRegion_RNCamera_cxx;";
+    static void registerNatives() {
+      registerHybrid({makeNativeMethod("invoke_cxx", JFunc_void_RNRegion_RNCamera_cxx::invoke_cxx)});
+    }
+
+  private:
+    explicit JFunc_void_RNRegion_RNCamera_cxx(const std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */)>& func): _func(func) { }
+
+  private:
+    friend HybridBase;
+    std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */)> _func;
+  };
+
+} // namespace margelo::nitro::rngooglemapsplus

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

@@ -63,6 +63,10 @@ namespace margelo::nitro::rngooglemapsplus { struct RNIOSLocationConfig; }
 namespace margelo::nitro::rngooglemapsplus { enum class RNIOSLocationAccuracy; }
 // Forward declaration of `RNMapErrorCode` to properly resolve imports.
 namespace margelo::nitro::rngooglemapsplus { enum class RNMapErrorCode; }
+// Forward declaration of `RNRegion` to properly resolve imports.
+namespace margelo::nitro::rngooglemapsplus { struct RNRegion; }
+// Forward declaration of `RNLatLngBounds` to properly resolve imports.
+namespace margelo::nitro::rngooglemapsplus { struct RNLatLngBounds; }
 // Forward declaration of `RNLocation` to properly resolve imports.
 namespace margelo::nitro::rngooglemapsplus { struct RNLocation; }
 // Forward declaration of `RNLocationAndroid` to properly resolve imports.
@@ -75,10 +79,6 @@ namespace margelo::nitro::rngooglemapsplus { enum class RNLocationErrorCode; }
 namespace margelo::nitro::rngooglemapsplus { struct RNIndoorBuilding; }
 // Forward declaration of `RNIndoorLevel` to properly resolve imports.
 namespace margelo::nitro::rngooglemapsplus { struct RNIndoorLevel; }
-// Forward declaration of `RNRegion` to properly resolve imports.
-namespace margelo::nitro::rngooglemapsplus { struct RNRegion; }
-// Forward declaration of `RNLatLngBounds` to properly resolve imports.
-namespace margelo::nitro::rngooglemapsplus { struct RNLatLngBounds; }
 // Forward declaration of `RNLocationPermissionResult` to properly resolve imports.
 namespace margelo::nitro::rngooglemapsplus { struct RNLocationPermissionResult; }
 // Forward declaration of `RNAndroidLocationPermissionResult` to properly resolve imports.
@@ -156,6 +156,11 @@ namespace margelo::nitro::rngooglemapsplus { enum class RNSnapshotResultType; }
 #include "JFunc_void_RNMapErrorCode.hpp"
 #include "JRNMapErrorCode.hpp"
 #include "JFunc_void_bool.hpp"
+#include "RNRegion.hpp"
+#include "JFunc_void_RNRegion_RNCamera.hpp"
+#include "JRNRegion.hpp"
+#include "RNLatLngBounds.hpp"
+#include "JRNLatLngBounds.hpp"
 #include "RNLocation.hpp"
 #include "JFunc_void_RNLocation.hpp"
 #include "JRNLocation.hpp"
@@ -176,11 +181,7 @@ namespace margelo::nitro::rngooglemapsplus { enum class RNSnapshotResultType; }
 #include "RNIndoorLevel.hpp"
 #include "JRNIndoorLevel.hpp"
 #include "JFunc_void_RNIndoorLevel.hpp"
-#include "RNRegion.hpp"
 #include "JFunc_void_RNRegion_RNCamera_bool.hpp"
-#include "JRNRegion.hpp"
-#include "RNLatLngBounds.hpp"
-#include "JRNLatLngBounds.hpp"
 #include <NitroModules/Promise.hpp>
 #include <NitroModules/JPromise.hpp>
 #include "RNLocationPermissionResult.hpp"
@@ -549,24 +550,24 @@ namespace margelo::nitro::rngooglemapsplus {
     static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_bool::javaobject> /* onMapReady */)>("setOnMapReady_cxx");
     method(_javaPart, onMapReady.has_value() ? JFunc_void_bool_cxx::fromCpp(onMapReady.value()) : nullptr);
   }
-  std::optional<std::function<void(bool /* loaded */)>> JHybridRNGoogleMapsPlusViewSpec::getOnMapLoaded() {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void_bool::javaobject>()>("getOnMapLoaded_cxx");
+  std::optional<std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */)>> JHybridRNGoogleMapsPlusViewSpec::getOnMapLoaded() {
+    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void_RNRegion_RNCamera::javaobject>()>("getOnMapLoaded_cxx");
     auto __result = method(_javaPart);
-    return __result != nullptr ? std::make_optional([&]() -> std::function<void(bool /* loaded */)> {
-      if (__result->isInstanceOf(JFunc_void_bool_cxx::javaClassStatic())) [[likely]] {
-        auto downcast = jni::static_ref_cast<JFunc_void_bool_cxx::javaobject>(__result);
+    return __result != nullptr ? std::make_optional([&]() -> std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */)> {
+      if (__result->isInstanceOf(JFunc_void_RNRegion_RNCamera_cxx::javaClassStatic())) [[likely]] {
+        auto downcast = jni::static_ref_cast<JFunc_void_RNRegion_RNCamera_cxx::javaobject>(__result);
         return downcast->cthis()->getFunction();
       } else {
         auto __resultRef = jni::make_global(__result);
-        return [__resultRef](bool loaded) -> void {
-          return __resultRef->invoke(loaded);
+        return [__resultRef](RNRegion region, RNCamera camera) -> void {
+          return __resultRef->invoke(region,camera);
         };
       }
     }()) : std::nullopt;
   }
-  void JHybridRNGoogleMapsPlusViewSpec::setOnMapLoaded(const std::optional<std::function<void(bool /* loaded */)>>& onMapLoaded) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_bool::javaobject> /* onMapLoaded */)>("setOnMapLoaded_cxx");
-    method(_javaPart, onMapLoaded.has_value() ? JFunc_void_bool_cxx::fromCpp(onMapLoaded.value()) : nullptr);
+  void JHybridRNGoogleMapsPlusViewSpec::setOnMapLoaded(const std::optional<std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */)>>& onMapLoaded) {
+    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_RNRegion_RNCamera::javaobject> /* onMapLoaded */)>("setOnMapLoaded_cxx");
+    method(_javaPart, onMapLoaded.has_value() ? JFunc_void_RNRegion_RNCamera_cxx::fromCpp(onMapLoaded.value()) : nullptr);
   }
   std::optional<std::function<void(const RNLocation& /* location */)>> JHybridRNGoogleMapsPlusViewSpec::getOnLocationUpdate() {
     static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void_RNLocation::javaobject>()>("getOnLocationUpdate_cxx");

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

@@ -91,8 +91,8 @@ namespace margelo::nitro::rngooglemapsplus {
     void setOnMapError(const std::optional<std::function<void(RNMapErrorCode /* error */)>>& onMapError) override;
     std::optional<std::function<void(bool /* ready */)>> getOnMapReady() override;
     void setOnMapReady(const std::optional<std::function<void(bool /* ready */)>>& onMapReady) override;
-    std::optional<std::function<void(bool /* loaded */)>> getOnMapLoaded() override;
-    void setOnMapLoaded(const std::optional<std::function<void(bool /* loaded */)>>& onMapLoaded) override;
+    std::optional<std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */)>> getOnMapLoaded() override;
+    void setOnMapLoaded(const std::optional<std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */)>>& onMapLoaded) override;
     std::optional<std::function<void(const RNLocation& /* location */)>> getOnLocationUpdate() override;
     void setOnLocationUpdate(const std::optional<std::function<void(const RNLocation& /* location */)>>& onLocationUpdate) override;
     std::optional<std::function<void(RNLocationErrorCode /* error */)>> getOnLocationError() override;