react-native-google-maps-plus 1.8.1 → 1.8.2

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

@@ -619,14 +619,14 @@ open class HybridRNGoogleMapsPlusViewSpec_cxx {
     }
   }
   
-  public final var onMapLoaded: bridge.std__optional_std__function_void_const_RNRegion_____region_____const_RNCameraChange_____camera______ {
+  public final var onMapLoaded: bridge.std__optional_std__function_void_const_RNRegion_____region_____const_RNCamera_____camera______ {
     @inline(__always)
     get {
-      return { () -> bridge.std__optional_std__function_void_const_RNRegion_____region_____const_RNCameraChange_____camera______ in
+      return { () -> bridge.std__optional_std__function_void_const_RNRegion_____region_____const_RNCamera_____camera______ in
         if let __unwrappedValue = self.__implementation.onMapLoaded {
-          return bridge.create_std__optional_std__function_void_const_RNRegion_____region_____const_RNCameraChange_____camera______({ () -> bridge.Func_void_RNRegion_RNCameraChange in
-            let __closureWrapper = Func_void_RNRegion_RNCameraChange(__unwrappedValue)
-            return bridge.create_Func_void_RNRegion_RNCameraChange(__closureWrapper.toUnsafe())
+          return bridge.create_std__optional_std__function_void_const_RNRegion_____region_____const_RNCamera_____camera______({ () -> bridge.Func_void_RNRegion_RNCamera in
+            let __closureWrapper = Func_void_RNRegion_RNCamera(__unwrappedValue)
+            return bridge.create_Func_void_RNRegion_RNCamera(__closureWrapper.toUnsafe())
           }())
         } else {
           return .init()
@@ -635,12 +635,12 @@ open class HybridRNGoogleMapsPlusViewSpec_cxx {
     }
     @inline(__always)
     set {
-      self.__implementation.onMapLoaded = { () -> ((_ region: RNRegion, _ camera: RNCameraChange) -> Void)? in
-        if bridge.has_value_std__optional_std__function_void_const_RNRegion_____region_____const_RNCameraChange_____camera______(newValue) {
-          let __unwrapped = bridge.get_std__optional_std__function_void_const_RNRegion_____region_____const_RNCameraChange_____camera______(newValue)
-          return { () -> (RNRegion, RNCameraChange) -> Void in
-            let __wrappedFunction = bridge.wrap_Func_void_RNRegion_RNCameraChange(__unwrapped)
-            return { (__region: RNRegion, __camera: RNCameraChange) -> Void in
+      self.__implementation.onMapLoaded = { () -> ((_ region: RNRegion, _ camera: RNCamera) -> Void)? in
+        if bridge.has_value_std__optional_std__function_void_const_RNRegion_____region_____const_RNCamera_____camera______(newValue) {
+          let __unwrapped = bridge.get_std__optional_std__function_void_const_RNRegion_____region_____const_RNCamera_____camera______(newValue)
+          return { () -> (RNRegion, RNCamera) -> Void in
+            let __wrappedFunction = bridge.wrap_Func_void_RNRegion_RNCamera(__unwrapped)
+            return { (__region: RNRegion, __camera: RNCamera) -> Void in
               __wrappedFunction.call(__region, __camera)
             }
           }()
@@ -1259,14 +1259,14 @@ open class HybridRNGoogleMapsPlusViewSpec_cxx {
     }
   }
   
-  public final var onCameraChangeStart: bridge.std__optional_std__function_void_const_RNRegion_____region_____const_RNCameraChange_____camera_____bool____isGesture______ {
+  public final var onCameraChangeStart: bridge.std__optional_std__function_void_const_RNRegion_____region_____const_RNCamera_____camera_____bool____isGesture______ {
     @inline(__always)
     get {
-      return { () -> bridge.std__optional_std__function_void_const_RNRegion_____region_____const_RNCameraChange_____camera_____bool____isGesture______ in
+      return { () -> bridge.std__optional_std__function_void_const_RNRegion_____region_____const_RNCamera_____camera_____bool____isGesture______ in
         if let __unwrappedValue = self.__implementation.onCameraChangeStart {
-          return bridge.create_std__optional_std__function_void_const_RNRegion_____region_____const_RNCameraChange_____camera_____bool____isGesture______({ () -> bridge.Func_void_RNRegion_RNCameraChange_bool in
-            let __closureWrapper = Func_void_RNRegion_RNCameraChange_bool(__unwrappedValue)
-            return bridge.create_Func_void_RNRegion_RNCameraChange_bool(__closureWrapper.toUnsafe())
+          return bridge.create_std__optional_std__function_void_const_RNRegion_____region_____const_RNCamera_____camera_____bool____isGesture______({ () -> bridge.Func_void_RNRegion_RNCamera_bool in
+            let __closureWrapper = Func_void_RNRegion_RNCamera_bool(__unwrappedValue)
+            return bridge.create_Func_void_RNRegion_RNCamera_bool(__closureWrapper.toUnsafe())
           }())
         } else {
           return .init()
@@ -1275,12 +1275,12 @@ open class HybridRNGoogleMapsPlusViewSpec_cxx {
     }
     @inline(__always)
     set {
-      self.__implementation.onCameraChangeStart = { () -> ((_ region: RNRegion, _ camera: RNCameraChange, _ isGesture: Bool) -> Void)? in
-        if bridge.has_value_std__optional_std__function_void_const_RNRegion_____region_____const_RNCameraChange_____camera_____bool____isGesture______(newValue) {
-          let __unwrapped = bridge.get_std__optional_std__function_void_const_RNRegion_____region_____const_RNCameraChange_____camera_____bool____isGesture______(newValue)
-          return { () -> (RNRegion, RNCameraChange, Bool) -> Void in
-            let __wrappedFunction = bridge.wrap_Func_void_RNRegion_RNCameraChange_bool(__unwrapped)
-            return { (__region: RNRegion, __camera: RNCameraChange, __isGesture: Bool) -> Void in
+      self.__implementation.onCameraChangeStart = { () -> ((_ region: RNRegion, _ camera: RNCamera, _ isGesture: Bool) -> Void)? in
+        if bridge.has_value_std__optional_std__function_void_const_RNRegion_____region_____const_RNCamera_____camera_____bool____isGesture______(newValue) {
+          let __unwrapped = bridge.get_std__optional_std__function_void_const_RNRegion_____region_____const_RNCamera_____camera_____bool____isGesture______(newValue)
+          return { () -> (RNRegion, RNCamera, Bool) -> Void in
+            let __wrappedFunction = bridge.wrap_Func_void_RNRegion_RNCamera_bool(__unwrapped)
+            return { (__region: RNRegion, __camera: RNCamera, __isGesture: Bool) -> Void in
               __wrappedFunction.call(__region, __camera, __isGesture)
             }
           }()
@@ -1291,14 +1291,14 @@ open class HybridRNGoogleMapsPlusViewSpec_cxx {
     }
   }
   
-  public final var onCameraChange: bridge.std__optional_std__function_void_const_RNRegion_____region_____const_RNCameraChange_____camera_____bool____isGesture______ {
+  public final var onCameraChange: bridge.std__optional_std__function_void_const_RNRegion_____region_____const_RNCamera_____camera_____bool____isGesture______ {
     @inline(__always)
     get {
-      return { () -> bridge.std__optional_std__function_void_const_RNRegion_____region_____const_RNCameraChange_____camera_____bool____isGesture______ in
+      return { () -> bridge.std__optional_std__function_void_const_RNRegion_____region_____const_RNCamera_____camera_____bool____isGesture______ in
         if let __unwrappedValue = self.__implementation.onCameraChange {
-          return bridge.create_std__optional_std__function_void_const_RNRegion_____region_____const_RNCameraChange_____camera_____bool____isGesture______({ () -> bridge.Func_void_RNRegion_RNCameraChange_bool in
-            let __closureWrapper = Func_void_RNRegion_RNCameraChange_bool(__unwrappedValue)
-            return bridge.create_Func_void_RNRegion_RNCameraChange_bool(__closureWrapper.toUnsafe())
+          return bridge.create_std__optional_std__function_void_const_RNRegion_____region_____const_RNCamera_____camera_____bool____isGesture______({ () -> bridge.Func_void_RNRegion_RNCamera_bool in
+            let __closureWrapper = Func_void_RNRegion_RNCamera_bool(__unwrappedValue)
+            return bridge.create_Func_void_RNRegion_RNCamera_bool(__closureWrapper.toUnsafe())
           }())
         } else {
           return .init()
@@ -1307,12 +1307,12 @@ open class HybridRNGoogleMapsPlusViewSpec_cxx {
     }
     @inline(__always)
     set {
-      self.__implementation.onCameraChange = { () -> ((_ region: RNRegion, _ camera: RNCameraChange, _ isGesture: Bool) -> Void)? in
-        if bridge.has_value_std__optional_std__function_void_const_RNRegion_____region_____const_RNCameraChange_____camera_____bool____isGesture______(newValue) {
-          let __unwrapped = bridge.get_std__optional_std__function_void_const_RNRegion_____region_____const_RNCameraChange_____camera_____bool____isGesture______(newValue)
-          return { () -> (RNRegion, RNCameraChange, Bool) -> Void in
-            let __wrappedFunction = bridge.wrap_Func_void_RNRegion_RNCameraChange_bool(__unwrapped)
-            return { (__region: RNRegion, __camera: RNCameraChange, __isGesture: Bool) -> Void in
+      self.__implementation.onCameraChange = { () -> ((_ region: RNRegion, _ camera: RNCamera, _ isGesture: Bool) -> Void)? in
+        if bridge.has_value_std__optional_std__function_void_const_RNRegion_____region_____const_RNCamera_____camera_____bool____isGesture______(newValue) {
+          let __unwrapped = bridge.get_std__optional_std__function_void_const_RNRegion_____region_____const_RNCamera_____camera_____bool____isGesture______(newValue)
+          return { () -> (RNRegion, RNCamera, Bool) -> Void in
+            let __wrappedFunction = bridge.wrap_Func_void_RNRegion_RNCamera_bool(__unwrapped)
+            return { (__region: RNRegion, __camera: RNCamera, __isGesture: Bool) -> Void in
               __wrappedFunction.call(__region, __camera, __isGesture)
             }
           }()
@@ -1323,14 +1323,14 @@ open class HybridRNGoogleMapsPlusViewSpec_cxx {
     }
   }
   
-  public final var onCameraChangeComplete: bridge.std__optional_std__function_void_const_RNRegion_____region_____const_RNCameraChange_____camera_____bool____isGesture______ {
+  public final var onCameraChangeComplete: bridge.std__optional_std__function_void_const_RNRegion_____region_____const_RNCamera_____camera_____bool____isGesture______ {
     @inline(__always)
     get {
-      return { () -> bridge.std__optional_std__function_void_const_RNRegion_____region_____const_RNCameraChange_____camera_____bool____isGesture______ in
+      return { () -> bridge.std__optional_std__function_void_const_RNRegion_____region_____const_RNCamera_____camera_____bool____isGesture______ in
         if let __unwrappedValue = self.__implementation.onCameraChangeComplete {
-          return bridge.create_std__optional_std__function_void_const_RNRegion_____region_____const_RNCameraChange_____camera_____bool____isGesture______({ () -> bridge.Func_void_RNRegion_RNCameraChange_bool in
-            let __closureWrapper = Func_void_RNRegion_RNCameraChange_bool(__unwrappedValue)
-            return bridge.create_Func_void_RNRegion_RNCameraChange_bool(__closureWrapper.toUnsafe())
+          return bridge.create_std__optional_std__function_void_const_RNRegion_____region_____const_RNCamera_____camera_____bool____isGesture______({ () -> bridge.Func_void_RNRegion_RNCamera_bool in
+            let __closureWrapper = Func_void_RNRegion_RNCamera_bool(__unwrappedValue)
+            return bridge.create_Func_void_RNRegion_RNCamera_bool(__closureWrapper.toUnsafe())
           }())
         } else {
           return .init()
@@ -1339,12 +1339,12 @@ open class HybridRNGoogleMapsPlusViewSpec_cxx {
     }
     @inline(__always)
     set {
-      self.__implementation.onCameraChangeComplete = { () -> ((_ region: RNRegion, _ camera: RNCameraChange, _ isGesture: Bool) -> Void)? in
-        if bridge.has_value_std__optional_std__function_void_const_RNRegion_____region_____const_RNCameraChange_____camera_____bool____isGesture______(newValue) {
-          let __unwrapped = bridge.get_std__optional_std__function_void_const_RNRegion_____region_____const_RNCameraChange_____camera_____bool____isGesture______(newValue)
-          return { () -> (RNRegion, RNCameraChange, Bool) -> Void in
-            let __wrappedFunction = bridge.wrap_Func_void_RNRegion_RNCameraChange_bool(__unwrapped)
-            return { (__region: RNRegion, __camera: RNCameraChange, __isGesture: Bool) -> Void in
+      self.__implementation.onCameraChangeComplete = { () -> ((_ region: RNRegion, _ camera: RNCamera, _ isGesture: Bool) -> Void)? in
+        if bridge.has_value_std__optional_std__function_void_const_RNRegion_____region_____const_RNCamera_____camera_____bool____isGesture______(newValue) {
+          let __unwrapped = bridge.get_std__optional_std__function_void_const_RNRegion_____region_____const_RNCamera_____camera_____bool____isGesture______(newValue)
+          return { () -> (RNRegion, RNCamera, Bool) -> Void in
+            let __wrappedFunction = bridge.wrap_Func_void_RNRegion_RNCamera_bool(__unwrapped)
+            return { (__region: RNRegion, __camera: RNCamera, __isGesture: Bool) -> Void in
               __wrappedFunction.call(__region, __camera, __isGesture)
             }
           }()
@@ -1379,7 +1379,7 @@ open class HybridRNGoogleMapsPlusViewSpec_cxx {
   }
   
   @inline(__always)
-  public final func setCamera(camera: RNCamera, animated: bridge.std__optional_bool_, durationMs: bridge.std__optional_double_) -> bridge.Result_void_ {
+  public final func setCamera(camera: RNCameraUpdate, animated: bridge.std__optional_bool_, durationMs: bridge.std__optional_double_) -> bridge.Result_void_ {
     do {
       try self.__implementation.setCamera(camera: camera, animated: { () -> Bool? in
         if bridge.has_value_std__optional_bool_(animated) {

package/nitrogen/generated/ios/swift/RNCamera.swift

@@ -18,99 +18,51 @@ public extension RNCamera {
   /**
    * Create a new instance of `RNCamera`.
    */
-  init(center: RNLatLng?, zoom: Double?, bearing: Double?, tilt: Double?) {
-    self.init({ () -> bridge.std__optional_RNLatLng_ in
-      if let __unwrappedValue = center {
-        return bridge.create_std__optional_RNLatLng_(__unwrappedValue)
-      } else {
-        return .init()
-      }
-    }(), { () -> bridge.std__optional_double_ in
-      if let __unwrappedValue = zoom {
-        return bridge.create_std__optional_double_(__unwrappedValue)
-      } else {
-        return .init()
-      }
-    }(), { () -> bridge.std__optional_double_ in
-      if let __unwrappedValue = bearing {
-        return bridge.create_std__optional_double_(__unwrappedValue)
-      } else {
-        return .init()
-      }
-    }(), { () -> bridge.std__optional_double_ in
-      if let __unwrappedValue = tilt {
-        return bridge.create_std__optional_double_(__unwrappedValue)
-      } else {
-        return .init()
-      }
-    }())
+  init(center: RNLatLng, zoom: Double, bearing: Double, tilt: Double) {
+    self.init(center, zoom, bearing, tilt)
   }
 
-  var center: RNLatLng? {
+  var center: RNLatLng {
     @inline(__always)
     get {
-      return self.__center.value
+      return self.__center
     }
     @inline(__always)
     set {
-      self.__center = { () -> bridge.std__optional_RNLatLng_ in
-        if let __unwrappedValue = newValue {
-          return bridge.create_std__optional_RNLatLng_(__unwrappedValue)
-        } else {
-          return .init()
-        }
-      }()
+      self.__center = newValue
     }
   }
   
-  var zoom: Double? {
+  var zoom: Double {
     @inline(__always)
     get {
-      return self.__zoom.value
+      return self.__zoom
     }
     @inline(__always)
     set {
-      self.__zoom = { () -> bridge.std__optional_double_ in
-        if let __unwrappedValue = newValue {
-          return bridge.create_std__optional_double_(__unwrappedValue)
-        } else {
-          return .init()
-        }
-      }()
+      self.__zoom = newValue
     }
   }
   
-  var bearing: Double? {
+  var bearing: Double {
     @inline(__always)
     get {
-      return self.__bearing.value
+      return self.__bearing
     }
     @inline(__always)
     set {
-      self.__bearing = { () -> bridge.std__optional_double_ in
-        if let __unwrappedValue = newValue {
-          return bridge.create_std__optional_double_(__unwrappedValue)
-        } else {
-          return .init()
-        }
-      }()
+      self.__bearing = newValue
     }
   }
   
-  var tilt: Double? {
+  var tilt: Double {
     @inline(__always)
     get {
-      return self.__tilt.value
+      return self.__tilt
     }
     @inline(__always)
     set {
-      self.__tilt = { () -> bridge.std__optional_double_ in
-        if let __unwrappedValue = newValue {
-          return bridge.create_std__optional_double_(__unwrappedValue)
-        } else {
-          return .init()
-        }
-      }()
+      self.__tilt = newValue
     }
   }
 }

package/nitrogen/generated/ios/swift/RNCameraUpdate.swift

@@ -0,0 +1,116 @@
+///
+/// RNCameraUpdate.swift
+/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
+/// https://github.com/mrousavy/nitro
+/// Copyright © 2025 Marc Rousavy @ Margelo
+///
+
+import NitroModules
+
+/**
+ * Represents an instance of `RNCameraUpdate`, backed by a C++ struct.
+ */
+public typealias RNCameraUpdate = margelo.nitro.rngooglemapsplus.RNCameraUpdate
+
+public extension RNCameraUpdate {
+  private typealias bridge = margelo.nitro.rngooglemapsplus.bridge.swift
+
+  /**
+   * Create a new instance of `RNCameraUpdate`.
+   */
+  init(center: RNLatLng?, zoom: Double?, bearing: Double?, tilt: Double?) {
+    self.init({ () -> bridge.std__optional_RNLatLng_ in
+      if let __unwrappedValue = center {
+        return bridge.create_std__optional_RNLatLng_(__unwrappedValue)
+      } else {
+        return .init()
+      }
+    }(), { () -> bridge.std__optional_double_ in
+      if let __unwrappedValue = zoom {
+        return bridge.create_std__optional_double_(__unwrappedValue)
+      } else {
+        return .init()
+      }
+    }(), { () -> bridge.std__optional_double_ in
+      if let __unwrappedValue = bearing {
+        return bridge.create_std__optional_double_(__unwrappedValue)
+      } else {
+        return .init()
+      }
+    }(), { () -> bridge.std__optional_double_ in
+      if let __unwrappedValue = tilt {
+        return bridge.create_std__optional_double_(__unwrappedValue)
+      } else {
+        return .init()
+      }
+    }())
+  }
+
+  var center: RNLatLng? {
+    @inline(__always)
+    get {
+      return self.__center.value
+    }
+    @inline(__always)
+    set {
+      self.__center = { () -> bridge.std__optional_RNLatLng_ in
+        if let __unwrappedValue = newValue {
+          return bridge.create_std__optional_RNLatLng_(__unwrappedValue)
+        } else {
+          return .init()
+        }
+      }()
+    }
+  }
+  
+  var zoom: Double? {
+    @inline(__always)
+    get {
+      return self.__zoom.value
+    }
+    @inline(__always)
+    set {
+      self.__zoom = { () -> bridge.std__optional_double_ in
+        if let __unwrappedValue = newValue {
+          return bridge.create_std__optional_double_(__unwrappedValue)
+        } else {
+          return .init()
+        }
+      }()
+    }
+  }
+  
+  var bearing: Double? {
+    @inline(__always)
+    get {
+      return self.__bearing.value
+    }
+    @inline(__always)
+    set {
+      self.__bearing = { () -> bridge.std__optional_double_ in
+        if let __unwrappedValue = newValue {
+          return bridge.create_std__optional_double_(__unwrappedValue)
+        } else {
+          return .init()
+        }
+      }()
+    }
+  }
+  
+  var tilt: Double? {
+    @inline(__always)
+    get {
+      return self.__tilt.value
+    }
+    @inline(__always)
+    set {
+      self.__tilt = { () -> bridge.std__optional_double_ in
+        if let __unwrappedValue = newValue {
+          return bridge.create_std__optional_double_(__unwrappedValue)
+        } else {
+          return .init()
+        }
+      }()
+    }
+  }
+}

package/nitrogen/generated/ios/swift/RNInitialProps.swift

@@ -18,7 +18,7 @@ public extension RNInitialProps {
   /**
    * Create a new instance of `RNInitialProps`.
    */
-  init(mapId: String?, liteMode: Bool?, camera: RNCamera?, backgroundColor: String?) {
+  init(mapId: String?, liteMode: Bool?, camera: RNCameraUpdate?, backgroundColor: String?) {
     self.init({ () -> bridge.std__optional_std__string_ in
       if let __unwrappedValue = mapId {
         return bridge.create_std__optional_std__string_(std.string(__unwrappedValue))
@@ -31,9 +31,9 @@ public extension RNInitialProps {
       } else {
         return .init()
       }
-    }(), { () -> bridge.std__optional_RNCamera_ in
+    }(), { () -> bridge.std__optional_RNCameraUpdate_ in
       if let __unwrappedValue = camera {
-        return bridge.create_std__optional_RNCamera_(__unwrappedValue)
+        return bridge.create_std__optional_RNCameraUpdate_(__unwrappedValue)
       } else {
         return .init()
       }
@@ -94,16 +94,16 @@ public extension RNInitialProps {
     }
   }
   
-  var camera: RNCamera? {
+  var camera: RNCameraUpdate? {
     @inline(__always)
     get {
       return self.__camera.value
     }
     @inline(__always)
     set {
-      self.__camera = { () -> bridge.std__optional_RNCamera_ in
+      self.__camera = { () -> bridge.std__optional_RNCameraUpdate_ in
         if let __unwrappedValue = newValue {
-          return bridge.create_std__optional_RNCamera_(__unwrappedValue)
+          return bridge.create_std__optional_RNCameraUpdate_(__unwrappedValue)
         } else {
           return .init()
         }

package/nitrogen/generated/shared/c++/HybridRNGoogleMapsPlusViewSpec.hpp

@@ -45,8 +45,8 @@ namespace margelo::nitro::rngooglemapsplus { struct RNLocationConfig; }
 namespace margelo::nitro::rngooglemapsplus { enum class RNMapErrorCode; }
 // Forward declaration of `RNRegion` to properly resolve imports.
 namespace margelo::nitro::rngooglemapsplus { struct RNRegion; }
-// Forward declaration of `RNCameraChange` to properly resolve imports.
-namespace margelo::nitro::rngooglemapsplus { struct RNCameraChange; }
+// Forward declaration of `RNCamera` to properly resolve imports.
+namespace margelo::nitro::rngooglemapsplus { struct RNCamera; }
 // Forward declaration of `RNLocation` to properly resolve imports.
 namespace margelo::nitro::rngooglemapsplus { struct RNLocation; }
 // Forward declaration of `RNLocationErrorCode` to properly resolve imports.
@@ -57,8 +57,8 @@ namespace margelo::nitro::rngooglemapsplus { struct RNLatLng; }
 namespace margelo::nitro::rngooglemapsplus { struct RNIndoorBuilding; }
 // Forward declaration of `RNIndoorLevel` to properly resolve imports.
 namespace margelo::nitro::rngooglemapsplus { struct RNIndoorLevel; }
-// Forward declaration of `RNCamera` to properly resolve imports.
-namespace margelo::nitro::rngooglemapsplus { struct RNCamera; }
+// Forward declaration of `RNCameraUpdate` to properly resolve imports.
+namespace margelo::nitro::rngooglemapsplus { struct RNCameraUpdate; }
 // Forward declaration of `RNLatLngBounds` to properly resolve imports.
 namespace margelo::nitro::rngooglemapsplus { struct RNLatLngBounds; }
 // Forward declaration of `RNSnapshotOptions` to properly resolve imports.
@@ -86,13 +86,13 @@ namespace margelo::nitro::rngooglemapsplus { struct RNLocationPermissionResult;
 #include "RNMapErrorCode.hpp"
 #include <functional>
 #include "RNRegion.hpp"
-#include "RNCameraChange.hpp"
+#include "RNCamera.hpp"
 #include "RNLocation.hpp"
 #include "RNLocationErrorCode.hpp"
 #include "RNLatLng.hpp"
 #include "RNIndoorBuilding.hpp"
 #include "RNIndoorLevel.hpp"
-#include "RNCamera.hpp"
+#include "RNCameraUpdate.hpp"
 #include "RNLatLngBounds.hpp"
 #include <NitroModules/Promise.hpp>
 #include "RNSnapshotOptions.hpp"
@@ -167,8 +167,8 @@ namespace margelo::nitro::rngooglemapsplus {
       virtual void setOnMapError(const std::optional<std::function<void(RNMapErrorCode /* error */)>>& onMapError) = 0;
       virtual std::optional<std::function<void(bool /* ready */)>> getOnMapReady() = 0;
       virtual void setOnMapReady(const std::optional<std::function<void(bool /* ready */)>>& onMapReady) = 0;
-      virtual std::optional<std::function<void(const RNRegion& /* region */, const RNCameraChange& /* camera */)>> getOnMapLoaded() = 0;
-      virtual void setOnMapLoaded(const std::optional<std::function<void(const RNRegion& /* region */, const RNCameraChange& /* camera */)>>& onMapLoaded) = 0;
+      virtual std::optional<std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */)>> getOnMapLoaded() = 0;
+      virtual void setOnMapLoaded(const std::optional<std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */)>>& onMapLoaded) = 0;
       virtual std::optional<std::function<void(const RNLocation& /* location */)>> getOnLocationUpdate() = 0;
       virtual void setOnLocationUpdate(const std::optional<std::function<void(const RNLocation& /* location */)>>& onLocationUpdate) = 0;
       virtual std::optional<std::function<void(RNLocationErrorCode /* error */)>> getOnLocationError() = 0;
@@ -207,18 +207,18 @@ namespace margelo::nitro::rngooglemapsplus {
       virtual void setOnMyLocationPress(const std::optional<std::function<void(const RNLocation& /* location */)>>& onMyLocationPress) = 0;
       virtual std::optional<std::function<void(bool /* pressed */)>> getOnMyLocationButtonPress() = 0;
       virtual void setOnMyLocationButtonPress(const std::optional<std::function<void(bool /* pressed */)>>& onMyLocationButtonPress) = 0;
-      virtual std::optional<std::function<void(const RNRegion& /* region */, const RNCameraChange& /* camera */, bool /* isGesture */)>> getOnCameraChangeStart() = 0;
-      virtual void setOnCameraChangeStart(const std::optional<std::function<void(const RNRegion& /* region */, const RNCameraChange& /* camera */, bool /* isGesture */)>>& onCameraChangeStart) = 0;
-      virtual std::optional<std::function<void(const RNRegion& /* region */, const RNCameraChange& /* camera */, bool /* isGesture */)>> getOnCameraChange() = 0;
-      virtual void setOnCameraChange(const std::optional<std::function<void(const RNRegion& /* region */, const RNCameraChange& /* camera */, bool /* isGesture */)>>& onCameraChange) = 0;
-      virtual std::optional<std::function<void(const RNRegion& /* region */, const RNCameraChange& /* camera */, bool /* isGesture */)>> getOnCameraChangeComplete() = 0;
-      virtual void setOnCameraChangeComplete(const std::optional<std::function<void(const RNRegion& /* region */, const RNCameraChange& /* camera */, bool /* isGesture */)>>& onCameraChangeComplete) = 0;
+      virtual std::optional<std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */, bool /* isGesture */)>> getOnCameraChangeStart() = 0;
+      virtual void setOnCameraChangeStart(const std::optional<std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */, bool /* isGesture */)>>& onCameraChangeStart) = 0;
+      virtual std::optional<std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */, bool /* isGesture */)>> getOnCameraChange() = 0;
+      virtual void setOnCameraChange(const std::optional<std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */, bool /* isGesture */)>>& onCameraChange) = 0;
+      virtual std::optional<std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */, bool /* isGesture */)>> getOnCameraChangeComplete() = 0;
+      virtual void setOnCameraChangeComplete(const std::optional<std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */, bool /* isGesture */)>>& onCameraChangeComplete) = 0;
 
     public:
       // Methods
       virtual void showMarkerInfoWindow(const std::string& id) = 0;
       virtual void hideMarkerInfoWindow(const std::string& id) = 0;
-      virtual void setCamera(const RNCamera& camera, std::optional<bool> animated, std::optional<double> durationMs) = 0;
+      virtual void setCamera(const RNCameraUpdate& camera, std::optional<bool> animated, std::optional<double> durationMs) = 0;
       virtual void setCameraToCoordinates(const std::vector<RNLatLng>& coordinates, const std::optional<RNMapPadding>& padding, std::optional<bool> animated, std::optional<double> durationMs) = 0;
       virtual void setCameraBounds(const std::optional<RNLatLngBounds>& bounds) = 0;
       virtual void animateToBounds(const RNLatLngBounds& bounds, std::optional<double> padding, std::optional<double> durationMs, std::optional<bool> lockBounds) = 0;

package/nitrogen/generated/shared/c++/RNCamera.hpp

@@ -27,7 +27,6 @@
 namespace margelo::nitro::rngooglemapsplus { struct RNLatLng; }
 
 #include "RNLatLng.hpp"
-#include <optional>
 
 namespace margelo::nitro::rngooglemapsplus {
 
@@ -36,14 +35,14 @@ namespace margelo::nitro::rngooglemapsplus {
    */
   struct RNCamera {
   public:
-    std::optional<RNLatLng> center     SWIFT_PRIVATE;
-    std::optional<double> zoom     SWIFT_PRIVATE;
-    std::optional<double> bearing     SWIFT_PRIVATE;
-    std::optional<double> tilt     SWIFT_PRIVATE;
+    RNLatLng center     SWIFT_PRIVATE;
+    double zoom     SWIFT_PRIVATE;
+    double bearing     SWIFT_PRIVATE;
+    double tilt     SWIFT_PRIVATE;
 
   public:
     RNCamera() = default;
-    explicit RNCamera(std::optional<RNLatLng> center, std::optional<double> zoom, std::optional<double> bearing, std::optional<double> tilt): center(center), zoom(zoom), bearing(bearing), tilt(tilt) {}
+    explicit RNCamera(RNLatLng center, double zoom, double bearing, double tilt): center(center), zoom(zoom), bearing(bearing), tilt(tilt) {}
   };
 
 } // namespace margelo::nitro::rngooglemapsplus
@@ -56,18 +55,18 @@ namespace margelo::nitro {
     static inline margelo::nitro::rngooglemapsplus::RNCamera fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
       jsi::Object obj = arg.asObject(runtime);
       return margelo::nitro::rngooglemapsplus::RNCamera(
-        JSIConverter<std::optional<margelo::nitro::rngooglemapsplus::RNLatLng>>::fromJSI(runtime, obj.getProperty(runtime, "center")),
-        JSIConverter<std::optional<double>>::fromJSI(runtime, obj.getProperty(runtime, "zoom")),
-        JSIConverter<std::optional<double>>::fromJSI(runtime, obj.getProperty(runtime, "bearing")),
-        JSIConverter<std::optional<double>>::fromJSI(runtime, obj.getProperty(runtime, "tilt"))
+        JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLng>::fromJSI(runtime, obj.getProperty(runtime, "center")),
+        JSIConverter<double>::fromJSI(runtime, obj.getProperty(runtime, "zoom")),
+        JSIConverter<double>::fromJSI(runtime, obj.getProperty(runtime, "bearing")),
+        JSIConverter<double>::fromJSI(runtime, obj.getProperty(runtime, "tilt"))
       );
     }
     static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::nitro::rngooglemapsplus::RNCamera& arg) {
       jsi::Object obj(runtime);
-      obj.setProperty(runtime, "center", JSIConverter<std::optional<margelo::nitro::rngooglemapsplus::RNLatLng>>::toJSI(runtime, arg.center));
-      obj.setProperty(runtime, "zoom", JSIConverter<std::optional<double>>::toJSI(runtime, arg.zoom));
-      obj.setProperty(runtime, "bearing", JSIConverter<std::optional<double>>::toJSI(runtime, arg.bearing));
-      obj.setProperty(runtime, "tilt", JSIConverter<std::optional<double>>::toJSI(runtime, arg.tilt));
+      obj.setProperty(runtime, "center", JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLng>::toJSI(runtime, arg.center));
+      obj.setProperty(runtime, "zoom", JSIConverter<double>::toJSI(runtime, arg.zoom));
+      obj.setProperty(runtime, "bearing", JSIConverter<double>::toJSI(runtime, arg.bearing));
+      obj.setProperty(runtime, "tilt", JSIConverter<double>::toJSI(runtime, arg.tilt));
       return obj;
     }
     static inline bool canConvert(jsi::Runtime& runtime, const jsi::Value& value) {
@@ -78,10 +77,10 @@ namespace margelo::nitro {
       if (!nitro::isPlainObject(runtime, obj)) {
         return false;
       }
-      if (!JSIConverter<std::optional<margelo::nitro::rngooglemapsplus::RNLatLng>>::canConvert(runtime, obj.getProperty(runtime, "center"))) return false;
-      if (!JSIConverter<std::optional<double>>::canConvert(runtime, obj.getProperty(runtime, "zoom"))) return false;
-      if (!JSIConverter<std::optional<double>>::canConvert(runtime, obj.getProperty(runtime, "bearing"))) return false;
-      if (!JSIConverter<std::optional<double>>::canConvert(runtime, obj.getProperty(runtime, "tilt"))) return false;
+      if (!JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLng>::canConvert(runtime, obj.getProperty(runtime, "center"))) return false;
+      if (!JSIConverter<double>::canConvert(runtime, obj.getProperty(runtime, "zoom"))) return false;
+      if (!JSIConverter<double>::canConvert(runtime, obj.getProperty(runtime, "bearing"))) return false;
+      if (!JSIConverter<double>::canConvert(runtime, obj.getProperty(runtime, "tilt"))) return false;
       return true;
     }
   };