react-native-google-maps-plus 1.7.0-dev.9 → 1.7.0

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

@@ -173,8 +173,8 @@ namespace margelo::nitro::rngooglemapsplus { enum class RNSnapshotResultType; }
 #include "JRNLocationErrorCode.hpp"
 #include "JFunc_void_RNLatLng.hpp"
 #include "JFunc_void_std__string_std__string_RNLatLng.hpp"
-#include "JFunc_void_std__optional_std__string_.hpp"
-#include "JFunc_void_std__optional_std__string__RNLatLng.hpp"
+#include "JFunc_void_std__string.hpp"
+#include "JFunc_void_std__string_RNLatLng.hpp"
 #include "RNIndoorBuilding.hpp"
 #include "JFunc_void_RNIndoorBuilding.hpp"
 #include "JRNIndoorBuilding.hpp"
@@ -664,138 +664,138 @@ namespace margelo::nitro::rngooglemapsplus {
     static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_std__string_std__string_RNLatLng::javaobject> /* onPoiPress */)>("setOnPoiPress_cxx");
     method(_javaPart, onPoiPress.has_value() ? JFunc_void_std__string_std__string_RNLatLng_cxx::fromCpp(onPoiPress.value()) : nullptr);
   }
-  std::optional<std::function<void(const std::optional<std::string>& /* id */)>> JHybridRNGoogleMapsPlusViewSpec::getOnMarkerPress() {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void_std__optional_std__string_::javaobject>()>("getOnMarkerPress_cxx");
+  std::optional<std::function<void(const std::string& /* id */)>> JHybridRNGoogleMapsPlusViewSpec::getOnMarkerPress() {
+    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void_std__string::javaobject>()>("getOnMarkerPress_cxx");
     auto __result = method(_javaPart);
-    return __result != nullptr ? std::make_optional([&]() -> std::function<void(const std::optional<std::string>& /* id */)> {
-      if (__result->isInstanceOf(JFunc_void_std__optional_std__string__cxx::javaClassStatic())) [[likely]] {
-        auto downcast = jni::static_ref_cast<JFunc_void_std__optional_std__string__cxx::javaobject>(__result);
+    return __result != nullptr ? std::make_optional([&]() -> std::function<void(const std::string& /* id */)> {
+      if (__result->isInstanceOf(JFunc_void_std__string_cxx::javaClassStatic())) [[likely]] {
+        auto downcast = jni::static_ref_cast<JFunc_void_std__string_cxx::javaobject>(__result);
         return downcast->cthis()->getFunction();
       } else {
         auto __resultRef = jni::make_global(__result);
-        return [__resultRef](std::optional<std::string> id) -> void {
+        return [__resultRef](std::string id) -> void {
           return __resultRef->invoke(id);
         };
       }
     }()) : std::nullopt;
   }
-  void JHybridRNGoogleMapsPlusViewSpec::setOnMarkerPress(const std::optional<std::function<void(const std::optional<std::string>& /* id */)>>& onMarkerPress) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_std__optional_std__string_::javaobject> /* onMarkerPress */)>("setOnMarkerPress_cxx");
-    method(_javaPart, onMarkerPress.has_value() ? JFunc_void_std__optional_std__string__cxx::fromCpp(onMarkerPress.value()) : nullptr);
+  void JHybridRNGoogleMapsPlusViewSpec::setOnMarkerPress(const std::optional<std::function<void(const std::string& /* id */)>>& onMarkerPress) {
+    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_std__string::javaobject> /* onMarkerPress */)>("setOnMarkerPress_cxx");
+    method(_javaPart, onMarkerPress.has_value() ? JFunc_void_std__string_cxx::fromCpp(onMarkerPress.value()) : nullptr);
   }
-  std::optional<std::function<void(const std::optional<std::string>& /* id */)>> JHybridRNGoogleMapsPlusViewSpec::getOnPolylinePress() {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void_std__optional_std__string_::javaobject>()>("getOnPolylinePress_cxx");
+  std::optional<std::function<void(const std::string& /* id */)>> JHybridRNGoogleMapsPlusViewSpec::getOnPolylinePress() {
+    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void_std__string::javaobject>()>("getOnPolylinePress_cxx");
     auto __result = method(_javaPart);
-    return __result != nullptr ? std::make_optional([&]() -> std::function<void(const std::optional<std::string>& /* id */)> {
-      if (__result->isInstanceOf(JFunc_void_std__optional_std__string__cxx::javaClassStatic())) [[likely]] {
-        auto downcast = jni::static_ref_cast<JFunc_void_std__optional_std__string__cxx::javaobject>(__result);
+    return __result != nullptr ? std::make_optional([&]() -> std::function<void(const std::string& /* id */)> {
+      if (__result->isInstanceOf(JFunc_void_std__string_cxx::javaClassStatic())) [[likely]] {
+        auto downcast = jni::static_ref_cast<JFunc_void_std__string_cxx::javaobject>(__result);
         return downcast->cthis()->getFunction();
       } else {
         auto __resultRef = jni::make_global(__result);
-        return [__resultRef](std::optional<std::string> id) -> void {
+        return [__resultRef](std::string id) -> void {
           return __resultRef->invoke(id);
         };
       }
     }()) : std::nullopt;
   }
-  void JHybridRNGoogleMapsPlusViewSpec::setOnPolylinePress(const std::optional<std::function<void(const std::optional<std::string>& /* id */)>>& onPolylinePress) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_std__optional_std__string_::javaobject> /* onPolylinePress */)>("setOnPolylinePress_cxx");
-    method(_javaPart, onPolylinePress.has_value() ? JFunc_void_std__optional_std__string__cxx::fromCpp(onPolylinePress.value()) : nullptr);
+  void JHybridRNGoogleMapsPlusViewSpec::setOnPolylinePress(const std::optional<std::function<void(const std::string& /* id */)>>& onPolylinePress) {
+    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_std__string::javaobject> /* onPolylinePress */)>("setOnPolylinePress_cxx");
+    method(_javaPart, onPolylinePress.has_value() ? JFunc_void_std__string_cxx::fromCpp(onPolylinePress.value()) : nullptr);
   }
-  std::optional<std::function<void(const std::optional<std::string>& /* id */)>> JHybridRNGoogleMapsPlusViewSpec::getOnPolygonPress() {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void_std__optional_std__string_::javaobject>()>("getOnPolygonPress_cxx");
+  std::optional<std::function<void(const std::string& /* id */)>> JHybridRNGoogleMapsPlusViewSpec::getOnPolygonPress() {
+    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void_std__string::javaobject>()>("getOnPolygonPress_cxx");
     auto __result = method(_javaPart);
-    return __result != nullptr ? std::make_optional([&]() -> std::function<void(const std::optional<std::string>& /* id */)> {
-      if (__result->isInstanceOf(JFunc_void_std__optional_std__string__cxx::javaClassStatic())) [[likely]] {
-        auto downcast = jni::static_ref_cast<JFunc_void_std__optional_std__string__cxx::javaobject>(__result);
+    return __result != nullptr ? std::make_optional([&]() -> std::function<void(const std::string& /* id */)> {
+      if (__result->isInstanceOf(JFunc_void_std__string_cxx::javaClassStatic())) [[likely]] {
+        auto downcast = jni::static_ref_cast<JFunc_void_std__string_cxx::javaobject>(__result);
         return downcast->cthis()->getFunction();
       } else {
         auto __resultRef = jni::make_global(__result);
-        return [__resultRef](std::optional<std::string> id) -> void {
+        return [__resultRef](std::string id) -> void {
           return __resultRef->invoke(id);
         };
       }
     }()) : std::nullopt;
   }
-  void JHybridRNGoogleMapsPlusViewSpec::setOnPolygonPress(const std::optional<std::function<void(const std::optional<std::string>& /* id */)>>& onPolygonPress) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_std__optional_std__string_::javaobject> /* onPolygonPress */)>("setOnPolygonPress_cxx");
-    method(_javaPart, onPolygonPress.has_value() ? JFunc_void_std__optional_std__string__cxx::fromCpp(onPolygonPress.value()) : nullptr);
+  void JHybridRNGoogleMapsPlusViewSpec::setOnPolygonPress(const std::optional<std::function<void(const std::string& /* id */)>>& onPolygonPress) {
+    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_std__string::javaobject> /* onPolygonPress */)>("setOnPolygonPress_cxx");
+    method(_javaPart, onPolygonPress.has_value() ? JFunc_void_std__string_cxx::fromCpp(onPolygonPress.value()) : nullptr);
   }
-  std::optional<std::function<void(const std::optional<std::string>& /* id */)>> JHybridRNGoogleMapsPlusViewSpec::getOnCirclePress() {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void_std__optional_std__string_::javaobject>()>("getOnCirclePress_cxx");
+  std::optional<std::function<void(const std::string& /* id */)>> JHybridRNGoogleMapsPlusViewSpec::getOnCirclePress() {
+    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void_std__string::javaobject>()>("getOnCirclePress_cxx");
     auto __result = method(_javaPart);
-    return __result != nullptr ? std::make_optional([&]() -> std::function<void(const std::optional<std::string>& /* id */)> {
-      if (__result->isInstanceOf(JFunc_void_std__optional_std__string__cxx::javaClassStatic())) [[likely]] {
-        auto downcast = jni::static_ref_cast<JFunc_void_std__optional_std__string__cxx::javaobject>(__result);
+    return __result != nullptr ? std::make_optional([&]() -> std::function<void(const std::string& /* id */)> {
+      if (__result->isInstanceOf(JFunc_void_std__string_cxx::javaClassStatic())) [[likely]] {
+        auto downcast = jni::static_ref_cast<JFunc_void_std__string_cxx::javaobject>(__result);
         return downcast->cthis()->getFunction();
       } else {
         auto __resultRef = jni::make_global(__result);
-        return [__resultRef](std::optional<std::string> id) -> void {
+        return [__resultRef](std::string id) -> void {
           return __resultRef->invoke(id);
         };
       }
     }()) : std::nullopt;
   }
-  void JHybridRNGoogleMapsPlusViewSpec::setOnCirclePress(const std::optional<std::function<void(const std::optional<std::string>& /* id */)>>& onCirclePress) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_std__optional_std__string_::javaobject> /* onCirclePress */)>("setOnCirclePress_cxx");
-    method(_javaPart, onCirclePress.has_value() ? JFunc_void_std__optional_std__string__cxx::fromCpp(onCirclePress.value()) : nullptr);
+  void JHybridRNGoogleMapsPlusViewSpec::setOnCirclePress(const std::optional<std::function<void(const std::string& /* id */)>>& onCirclePress) {
+    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_std__string::javaobject> /* onCirclePress */)>("setOnCirclePress_cxx");
+    method(_javaPart, onCirclePress.has_value() ? JFunc_void_std__string_cxx::fromCpp(onCirclePress.value()) : nullptr);
   }
-  std::optional<std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)>> JHybridRNGoogleMapsPlusViewSpec::getOnMarkerDragStart() {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void_std__optional_std__string__RNLatLng::javaobject>()>("getOnMarkerDragStart_cxx");
+  std::optional<std::function<void(const std::string& /* id */, const RNLatLng& /* location */)>> JHybridRNGoogleMapsPlusViewSpec::getOnMarkerDragStart() {
+    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void_std__string_RNLatLng::javaobject>()>("getOnMarkerDragStart_cxx");
     auto __result = method(_javaPart);
-    return __result != nullptr ? std::make_optional([&]() -> std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)> {
-      if (__result->isInstanceOf(JFunc_void_std__optional_std__string__RNLatLng_cxx::javaClassStatic())) [[likely]] {
-        auto downcast = jni::static_ref_cast<JFunc_void_std__optional_std__string__RNLatLng_cxx::javaobject>(__result);
+    return __result != nullptr ? std::make_optional([&]() -> std::function<void(const std::string& /* id */, const RNLatLng& /* location */)> {
+      if (__result->isInstanceOf(JFunc_void_std__string_RNLatLng_cxx::javaClassStatic())) [[likely]] {
+        auto downcast = jni::static_ref_cast<JFunc_void_std__string_RNLatLng_cxx::javaobject>(__result);
         return downcast->cthis()->getFunction();
       } else {
         auto __resultRef = jni::make_global(__result);
-        return [__resultRef](std::optional<std::string> id, RNLatLng location) -> void {
+        return [__resultRef](std::string id, RNLatLng location) -> void {
           return __resultRef->invoke(id,location);
         };
       }
     }()) : std::nullopt;
   }
-  void JHybridRNGoogleMapsPlusViewSpec::setOnMarkerDragStart(const std::optional<std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)>>& onMarkerDragStart) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_std__optional_std__string__RNLatLng::javaobject> /* onMarkerDragStart */)>("setOnMarkerDragStart_cxx");
-    method(_javaPart, onMarkerDragStart.has_value() ? JFunc_void_std__optional_std__string__RNLatLng_cxx::fromCpp(onMarkerDragStart.value()) : nullptr);
+  void JHybridRNGoogleMapsPlusViewSpec::setOnMarkerDragStart(const std::optional<std::function<void(const std::string& /* id */, const RNLatLng& /* location */)>>& onMarkerDragStart) {
+    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_std__string_RNLatLng::javaobject> /* onMarkerDragStart */)>("setOnMarkerDragStart_cxx");
+    method(_javaPart, onMarkerDragStart.has_value() ? JFunc_void_std__string_RNLatLng_cxx::fromCpp(onMarkerDragStart.value()) : nullptr);
   }
-  std::optional<std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)>> JHybridRNGoogleMapsPlusViewSpec::getOnMarkerDrag() {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void_std__optional_std__string__RNLatLng::javaobject>()>("getOnMarkerDrag_cxx");
+  std::optional<std::function<void(const std::string& /* id */, const RNLatLng& /* location */)>> JHybridRNGoogleMapsPlusViewSpec::getOnMarkerDrag() {
+    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void_std__string_RNLatLng::javaobject>()>("getOnMarkerDrag_cxx");
     auto __result = method(_javaPart);
-    return __result != nullptr ? std::make_optional([&]() -> std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)> {
-      if (__result->isInstanceOf(JFunc_void_std__optional_std__string__RNLatLng_cxx::javaClassStatic())) [[likely]] {
-        auto downcast = jni::static_ref_cast<JFunc_void_std__optional_std__string__RNLatLng_cxx::javaobject>(__result);
+    return __result != nullptr ? std::make_optional([&]() -> std::function<void(const std::string& /* id */, const RNLatLng& /* location */)> {
+      if (__result->isInstanceOf(JFunc_void_std__string_RNLatLng_cxx::javaClassStatic())) [[likely]] {
+        auto downcast = jni::static_ref_cast<JFunc_void_std__string_RNLatLng_cxx::javaobject>(__result);
         return downcast->cthis()->getFunction();
       } else {
         auto __resultRef = jni::make_global(__result);
-        return [__resultRef](std::optional<std::string> id, RNLatLng location) -> void {
+        return [__resultRef](std::string id, RNLatLng location) -> void {
           return __resultRef->invoke(id,location);
         };
       }
     }()) : std::nullopt;
   }
-  void JHybridRNGoogleMapsPlusViewSpec::setOnMarkerDrag(const std::optional<std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)>>& onMarkerDrag) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_std__optional_std__string__RNLatLng::javaobject> /* onMarkerDrag */)>("setOnMarkerDrag_cxx");
-    method(_javaPart, onMarkerDrag.has_value() ? JFunc_void_std__optional_std__string__RNLatLng_cxx::fromCpp(onMarkerDrag.value()) : nullptr);
+  void JHybridRNGoogleMapsPlusViewSpec::setOnMarkerDrag(const std::optional<std::function<void(const std::string& /* id */, const RNLatLng& /* location */)>>& onMarkerDrag) {
+    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_std__string_RNLatLng::javaobject> /* onMarkerDrag */)>("setOnMarkerDrag_cxx");
+    method(_javaPart, onMarkerDrag.has_value() ? JFunc_void_std__string_RNLatLng_cxx::fromCpp(onMarkerDrag.value()) : nullptr);
   }
-  std::optional<std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)>> JHybridRNGoogleMapsPlusViewSpec::getOnMarkerDragEnd() {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void_std__optional_std__string__RNLatLng::javaobject>()>("getOnMarkerDragEnd_cxx");
+  std::optional<std::function<void(const std::string& /* id */, const RNLatLng& /* location */)>> JHybridRNGoogleMapsPlusViewSpec::getOnMarkerDragEnd() {
+    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void_std__string_RNLatLng::javaobject>()>("getOnMarkerDragEnd_cxx");
     auto __result = method(_javaPart);
-    return __result != nullptr ? std::make_optional([&]() -> std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)> {
-      if (__result->isInstanceOf(JFunc_void_std__optional_std__string__RNLatLng_cxx::javaClassStatic())) [[likely]] {
-        auto downcast = jni::static_ref_cast<JFunc_void_std__optional_std__string__RNLatLng_cxx::javaobject>(__result);
+    return __result != nullptr ? std::make_optional([&]() -> std::function<void(const std::string& /* id */, const RNLatLng& /* location */)> {
+      if (__result->isInstanceOf(JFunc_void_std__string_RNLatLng_cxx::javaClassStatic())) [[likely]] {
+        auto downcast = jni::static_ref_cast<JFunc_void_std__string_RNLatLng_cxx::javaobject>(__result);
         return downcast->cthis()->getFunction();
       } else {
         auto __resultRef = jni::make_global(__result);
-        return [__resultRef](std::optional<std::string> id, RNLatLng location) -> void {
+        return [__resultRef](std::string id, RNLatLng location) -> void {
           return __resultRef->invoke(id,location);
         };
       }
     }()) : std::nullopt;
   }
-  void JHybridRNGoogleMapsPlusViewSpec::setOnMarkerDragEnd(const std::optional<std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)>>& onMarkerDragEnd) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_std__optional_std__string__RNLatLng::javaobject> /* onMarkerDragEnd */)>("setOnMarkerDragEnd_cxx");
-    method(_javaPart, onMarkerDragEnd.has_value() ? JFunc_void_std__optional_std__string__RNLatLng_cxx::fromCpp(onMarkerDragEnd.value()) : nullptr);
+  void JHybridRNGoogleMapsPlusViewSpec::setOnMarkerDragEnd(const std::optional<std::function<void(const std::string& /* id */, const RNLatLng& /* location */)>>& onMarkerDragEnd) {
+    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_std__string_RNLatLng::javaobject> /* onMarkerDragEnd */)>("setOnMarkerDragEnd_cxx");
+    method(_javaPart, onMarkerDragEnd.has_value() ? JFunc_void_std__string_RNLatLng_cxx::fromCpp(onMarkerDragEnd.value()) : nullptr);
   }
   std::optional<std::function<void(const RNIndoorBuilding& /* indoorBuilding */)>> JHybridRNGoogleMapsPlusViewSpec::getOnIndoorBuildingFocused() {
     static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void_RNIndoorBuilding::javaobject>()>("getOnIndoorBuildingFocused_cxx");
@@ -835,62 +835,62 @@ namespace margelo::nitro::rngooglemapsplus {
     static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_RNIndoorLevel::javaobject> /* onIndoorLevelActivated */)>("setOnIndoorLevelActivated_cxx");
     method(_javaPart, onIndoorLevelActivated.has_value() ? JFunc_void_RNIndoorLevel_cxx::fromCpp(onIndoorLevelActivated.value()) : nullptr);
   }
-  std::optional<std::function<void(const std::optional<std::string>& /* id */)>> JHybridRNGoogleMapsPlusViewSpec::getOnInfoWindowPress() {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void_std__optional_std__string_::javaobject>()>("getOnInfoWindowPress_cxx");
+  std::optional<std::function<void(const std::string& /* id */)>> JHybridRNGoogleMapsPlusViewSpec::getOnInfoWindowPress() {
+    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void_std__string::javaobject>()>("getOnInfoWindowPress_cxx");
     auto __result = method(_javaPart);
-    return __result != nullptr ? std::make_optional([&]() -> std::function<void(const std::optional<std::string>& /* id */)> {
-      if (__result->isInstanceOf(JFunc_void_std__optional_std__string__cxx::javaClassStatic())) [[likely]] {
-        auto downcast = jni::static_ref_cast<JFunc_void_std__optional_std__string__cxx::javaobject>(__result);
+    return __result != nullptr ? std::make_optional([&]() -> std::function<void(const std::string& /* id */)> {
+      if (__result->isInstanceOf(JFunc_void_std__string_cxx::javaClassStatic())) [[likely]] {
+        auto downcast = jni::static_ref_cast<JFunc_void_std__string_cxx::javaobject>(__result);
         return downcast->cthis()->getFunction();
       } else {
         auto __resultRef = jni::make_global(__result);
-        return [__resultRef](std::optional<std::string> id) -> void {
+        return [__resultRef](std::string id) -> void {
           return __resultRef->invoke(id);
         };
       }
     }()) : std::nullopt;
   }
-  void JHybridRNGoogleMapsPlusViewSpec::setOnInfoWindowPress(const std::optional<std::function<void(const std::optional<std::string>& /* id */)>>& onInfoWindowPress) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_std__optional_std__string_::javaobject> /* onInfoWindowPress */)>("setOnInfoWindowPress_cxx");
-    method(_javaPart, onInfoWindowPress.has_value() ? JFunc_void_std__optional_std__string__cxx::fromCpp(onInfoWindowPress.value()) : nullptr);
+  void JHybridRNGoogleMapsPlusViewSpec::setOnInfoWindowPress(const std::optional<std::function<void(const std::string& /* id */)>>& onInfoWindowPress) {
+    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_std__string::javaobject> /* onInfoWindowPress */)>("setOnInfoWindowPress_cxx");
+    method(_javaPart, onInfoWindowPress.has_value() ? JFunc_void_std__string_cxx::fromCpp(onInfoWindowPress.value()) : nullptr);
   }
-  std::optional<std::function<void(const std::optional<std::string>& /* id */)>> JHybridRNGoogleMapsPlusViewSpec::getOnInfoWindowClose() {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void_std__optional_std__string_::javaobject>()>("getOnInfoWindowClose_cxx");
+  std::optional<std::function<void(const std::string& /* id */)>> JHybridRNGoogleMapsPlusViewSpec::getOnInfoWindowClose() {
+    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void_std__string::javaobject>()>("getOnInfoWindowClose_cxx");
     auto __result = method(_javaPart);
-    return __result != nullptr ? std::make_optional([&]() -> std::function<void(const std::optional<std::string>& /* id */)> {
-      if (__result->isInstanceOf(JFunc_void_std__optional_std__string__cxx::javaClassStatic())) [[likely]] {
-        auto downcast = jni::static_ref_cast<JFunc_void_std__optional_std__string__cxx::javaobject>(__result);
+    return __result != nullptr ? std::make_optional([&]() -> std::function<void(const std::string& /* id */)> {
+      if (__result->isInstanceOf(JFunc_void_std__string_cxx::javaClassStatic())) [[likely]] {
+        auto downcast = jni::static_ref_cast<JFunc_void_std__string_cxx::javaobject>(__result);
         return downcast->cthis()->getFunction();
       } else {
         auto __resultRef = jni::make_global(__result);
-        return [__resultRef](std::optional<std::string> id) -> void {
+        return [__resultRef](std::string id) -> void {
           return __resultRef->invoke(id);
         };
       }
     }()) : std::nullopt;
   }
-  void JHybridRNGoogleMapsPlusViewSpec::setOnInfoWindowClose(const std::optional<std::function<void(const std::optional<std::string>& /* id */)>>& onInfoWindowClose) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_std__optional_std__string_::javaobject> /* onInfoWindowClose */)>("setOnInfoWindowClose_cxx");
-    method(_javaPart, onInfoWindowClose.has_value() ? JFunc_void_std__optional_std__string__cxx::fromCpp(onInfoWindowClose.value()) : nullptr);
+  void JHybridRNGoogleMapsPlusViewSpec::setOnInfoWindowClose(const std::optional<std::function<void(const std::string& /* id */)>>& onInfoWindowClose) {
+    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_std__string::javaobject> /* onInfoWindowClose */)>("setOnInfoWindowClose_cxx");
+    method(_javaPart, onInfoWindowClose.has_value() ? JFunc_void_std__string_cxx::fromCpp(onInfoWindowClose.value()) : nullptr);
   }
-  std::optional<std::function<void(const std::optional<std::string>& /* id */)>> JHybridRNGoogleMapsPlusViewSpec::getOnInfoWindowLongPress() {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void_std__optional_std__string_::javaobject>()>("getOnInfoWindowLongPress_cxx");
+  std::optional<std::function<void(const std::string& /* id */)>> JHybridRNGoogleMapsPlusViewSpec::getOnInfoWindowLongPress() {
+    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void_std__string::javaobject>()>("getOnInfoWindowLongPress_cxx");
     auto __result = method(_javaPart);
-    return __result != nullptr ? std::make_optional([&]() -> std::function<void(const std::optional<std::string>& /* id */)> {
-      if (__result->isInstanceOf(JFunc_void_std__optional_std__string__cxx::javaClassStatic())) [[likely]] {
-        auto downcast = jni::static_ref_cast<JFunc_void_std__optional_std__string__cxx::javaobject>(__result);
+    return __result != nullptr ? std::make_optional([&]() -> std::function<void(const std::string& /* id */)> {
+      if (__result->isInstanceOf(JFunc_void_std__string_cxx::javaClassStatic())) [[likely]] {
+        auto downcast = jni::static_ref_cast<JFunc_void_std__string_cxx::javaobject>(__result);
         return downcast->cthis()->getFunction();
       } else {
         auto __resultRef = jni::make_global(__result);
-        return [__resultRef](std::optional<std::string> id) -> void {
+        return [__resultRef](std::string id) -> void {
           return __resultRef->invoke(id);
         };
       }
     }()) : std::nullopt;
   }
-  void JHybridRNGoogleMapsPlusViewSpec::setOnInfoWindowLongPress(const std::optional<std::function<void(const std::optional<std::string>& /* id */)>>& onInfoWindowLongPress) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_std__optional_std__string_::javaobject> /* onInfoWindowLongPress */)>("setOnInfoWindowLongPress_cxx");
-    method(_javaPart, onInfoWindowLongPress.has_value() ? JFunc_void_std__optional_std__string__cxx::fromCpp(onInfoWindowLongPress.value()) : nullptr);
+  void JHybridRNGoogleMapsPlusViewSpec::setOnInfoWindowLongPress(const std::optional<std::function<void(const std::string& /* id */)>>& onInfoWindowLongPress) {
+    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_std__string::javaobject> /* onInfoWindowLongPress */)>("setOnInfoWindowLongPress_cxx");
+    method(_javaPart, onInfoWindowLongPress.has_value() ? JFunc_void_std__string_cxx::fromCpp(onInfoWindowLongPress.value()) : nullptr);
   }
   std::optional<std::function<void(const RNLocation& /* location */)>> JHybridRNGoogleMapsPlusViewSpec::getOnMyLocationPress() {
     static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void_RNLocation::javaobject>()>("getOnMyLocationPress_cxx");
@@ -989,6 +989,14 @@ namespace margelo::nitro::rngooglemapsplus {
   }
 
   // Methods
+  void JHybridRNGoogleMapsPlusViewSpec::showMarkerInfoWindow(const std::string& id) {
+    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<jni::JString> /* id */)>("showMarkerInfoWindow");
+    method(_javaPart, jni::make_jstring(id));
+  }
+  void JHybridRNGoogleMapsPlusViewSpec::hideMarkerInfoWindow(const std::string& id) {
+    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<jni::JString> /* id */)>("hideMarkerInfoWindow");
+    method(_javaPart, jni::make_jstring(id));
+  }
   void JHybridRNGoogleMapsPlusViewSpec::setCamera(const RNCamera& camera, std::optional<bool> animated, std::optional<double> durationMs) {
     static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JRNCamera> /* camera */, jni::alias_ref<jni::JBoolean> /* animated */, jni::alias_ref<jni::JDouble> /* durationMs */)>("setCamera");
     method(_javaPart, JRNCamera::fromCpp(camera), animated.has_value() ? jni::JBoolean::valueOf(animated.value()) : nullptr, durationMs.has_value() ? jni::JDouble::valueOf(durationMs.value()) : nullptr);

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

@@ -103,30 +103,30 @@ namespace margelo::nitro::rngooglemapsplus {
     void setOnMapLongPress(const std::optional<std::function<void(const RNLatLng& /* coordinate */)>>& onMapLongPress) override;
     std::optional<std::function<void(const std::string& /* placeId */, const std::string& /* name */, const RNLatLng& /* coordinate */)>> getOnPoiPress() override;
     void setOnPoiPress(const std::optional<std::function<void(const std::string& /* placeId */, const std::string& /* name */, const RNLatLng& /* coordinate */)>>& onPoiPress) override;
-    std::optional<std::function<void(const std::optional<std::string>& /* id */)>> getOnMarkerPress() override;
-    void setOnMarkerPress(const std::optional<std::function<void(const std::optional<std::string>& /* id */)>>& onMarkerPress) override;
-    std::optional<std::function<void(const std::optional<std::string>& /* id */)>> getOnPolylinePress() override;
-    void setOnPolylinePress(const std::optional<std::function<void(const std::optional<std::string>& /* id */)>>& onPolylinePress) override;
-    std::optional<std::function<void(const std::optional<std::string>& /* id */)>> getOnPolygonPress() override;
-    void setOnPolygonPress(const std::optional<std::function<void(const std::optional<std::string>& /* id */)>>& onPolygonPress) override;
-    std::optional<std::function<void(const std::optional<std::string>& /* id */)>> getOnCirclePress() override;
-    void setOnCirclePress(const std::optional<std::function<void(const std::optional<std::string>& /* id */)>>& onCirclePress) override;
-    std::optional<std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)>> getOnMarkerDragStart() override;
-    void setOnMarkerDragStart(const std::optional<std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)>>& onMarkerDragStart) override;
-    std::optional<std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)>> getOnMarkerDrag() override;
-    void setOnMarkerDrag(const std::optional<std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)>>& onMarkerDrag) override;
-    std::optional<std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)>> getOnMarkerDragEnd() override;
-    void setOnMarkerDragEnd(const std::optional<std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)>>& onMarkerDragEnd) override;
+    std::optional<std::function<void(const std::string& /* id */)>> getOnMarkerPress() override;
+    void setOnMarkerPress(const std::optional<std::function<void(const std::string& /* id */)>>& onMarkerPress) override;
+    std::optional<std::function<void(const std::string& /* id */)>> getOnPolylinePress() override;
+    void setOnPolylinePress(const std::optional<std::function<void(const std::string& /* id */)>>& onPolylinePress) override;
+    std::optional<std::function<void(const std::string& /* id */)>> getOnPolygonPress() override;
+    void setOnPolygonPress(const std::optional<std::function<void(const std::string& /* id */)>>& onPolygonPress) override;
+    std::optional<std::function<void(const std::string& /* id */)>> getOnCirclePress() override;
+    void setOnCirclePress(const std::optional<std::function<void(const std::string& /* id */)>>& onCirclePress) override;
+    std::optional<std::function<void(const std::string& /* id */, const RNLatLng& /* location */)>> getOnMarkerDragStart() override;
+    void setOnMarkerDragStart(const std::optional<std::function<void(const std::string& /* id */, const RNLatLng& /* location */)>>& onMarkerDragStart) override;
+    std::optional<std::function<void(const std::string& /* id */, const RNLatLng& /* location */)>> getOnMarkerDrag() override;
+    void setOnMarkerDrag(const std::optional<std::function<void(const std::string& /* id */, const RNLatLng& /* location */)>>& onMarkerDrag) override;
+    std::optional<std::function<void(const std::string& /* id */, const RNLatLng& /* location */)>> getOnMarkerDragEnd() override;
+    void setOnMarkerDragEnd(const std::optional<std::function<void(const std::string& /* id */, const RNLatLng& /* location */)>>& onMarkerDragEnd) override;
     std::optional<std::function<void(const RNIndoorBuilding& /* indoorBuilding */)>> getOnIndoorBuildingFocused() override;
     void setOnIndoorBuildingFocused(const std::optional<std::function<void(const RNIndoorBuilding& /* indoorBuilding */)>>& onIndoorBuildingFocused) override;
     std::optional<std::function<void(const RNIndoorLevel& /* indoorLevel */)>> getOnIndoorLevelActivated() override;
     void setOnIndoorLevelActivated(const std::optional<std::function<void(const RNIndoorLevel& /* indoorLevel */)>>& onIndoorLevelActivated) override;
-    std::optional<std::function<void(const std::optional<std::string>& /* id */)>> getOnInfoWindowPress() override;
-    void setOnInfoWindowPress(const std::optional<std::function<void(const std::optional<std::string>& /* id */)>>& onInfoWindowPress) override;
-    std::optional<std::function<void(const std::optional<std::string>& /* id */)>> getOnInfoWindowClose() override;
-    void setOnInfoWindowClose(const std::optional<std::function<void(const std::optional<std::string>& /* id */)>>& onInfoWindowClose) override;
-    std::optional<std::function<void(const std::optional<std::string>& /* id */)>> getOnInfoWindowLongPress() override;
-    void setOnInfoWindowLongPress(const std::optional<std::function<void(const std::optional<std::string>& /* id */)>>& onInfoWindowLongPress) override;
+    std::optional<std::function<void(const std::string& /* id */)>> getOnInfoWindowPress() override;
+    void setOnInfoWindowPress(const std::optional<std::function<void(const std::string& /* id */)>>& onInfoWindowPress) override;
+    std::optional<std::function<void(const std::string& /* id */)>> getOnInfoWindowClose() override;
+    void setOnInfoWindowClose(const std::optional<std::function<void(const std::string& /* id */)>>& onInfoWindowClose) override;
+    std::optional<std::function<void(const std::string& /* id */)>> getOnInfoWindowLongPress() override;
+    void setOnInfoWindowLongPress(const std::optional<std::function<void(const std::string& /* id */)>>& onInfoWindowLongPress) override;
     std::optional<std::function<void(const RNLocation& /* location */)>> getOnMyLocationPress() override;
     void setOnMyLocationPress(const std::optional<std::function<void(const RNLocation& /* location */)>>& onMyLocationPress) override;
     std::optional<std::function<void(bool /* pressed */)>> getOnMyLocationButtonPress() override;
@@ -140,6 +140,8 @@ namespace margelo::nitro::rngooglemapsplus {
 
   public:
     // Methods
+    void showMarkerInfoWindow(const std::string& id) override;
+    void hideMarkerInfoWindow(const std::string& id) override;
     void setCamera(const RNCamera& camera, std::optional<bool> animated, std::optional<double> durationMs) override;
     void setCameraToCoordinates(const std::vector<RNLatLng>& coordinates, const std::optional<RNMapPadding>& padding, std::optional<bool> animated, std::optional<double> durationMs) override;
     void setCameraBounds(const std::optional<RNLatLngBounds>& bounds) override;

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

@@ -64,6 +64,8 @@ namespace margelo::nitro::rngooglemapsplus {
       jni::local_ref<JRNPosition> infoWindowAnchor = this->getFieldValue(fieldInfoWindowAnchor);
       static const auto fieldIconSvg = clazz->getField<JRNMarkerSvg>("iconSvg");
       jni::local_ref<JRNMarkerSvg> iconSvg = this->getFieldValue(fieldIconSvg);
+      static const auto fieldInfoWindowIconSvg = clazz->getField<JRNMarkerSvg>("infoWindowIconSvg");
+      jni::local_ref<JRNMarkerSvg> infoWindowIconSvg = this->getFieldValue(fieldInfoWindowIconSvg);
       return RNMarker(
         id->toStdString(),
         zIndex != nullptr ? std::make_optional(zIndex->value()) : std::nullopt,
@@ -77,7 +79,8 @@ namespace margelo::nitro::rngooglemapsplus {
         draggable != nullptr ? std::make_optional(static_cast<bool>(draggable->value())) : std::nullopt,
         rotation != nullptr ? std::make_optional(rotation->value()) : std::nullopt,
         infoWindowAnchor != nullptr ? std::make_optional(infoWindowAnchor->toCpp()) : std::nullopt,
-        iconSvg != nullptr ? std::make_optional(iconSvg->toCpp()) : std::nullopt
+        iconSvg != nullptr ? std::make_optional(iconSvg->toCpp()) : std::nullopt,
+        infoWindowIconSvg != nullptr ? std::make_optional(infoWindowIconSvg->toCpp()) : std::nullopt
       );
     }
 
@@ -87,7 +90,7 @@ namespace margelo::nitro::rngooglemapsplus {
      */
     [[maybe_unused]]
     static jni::local_ref<JRNMarker::javaobject> fromCpp(const RNMarker& value) {
-      using JSignature = JRNMarker(jni::alias_ref<jni::JString>, jni::alias_ref<jni::JDouble>, jni::alias_ref<JRNLatLng>, jni::alias_ref<JRNPosition>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JDouble>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JDouble>, jni::alias_ref<JRNPosition>, jni::alias_ref<JRNMarkerSvg>);
+      using JSignature = JRNMarker(jni::alias_ref<jni::JString>, jni::alias_ref<jni::JDouble>, jni::alias_ref<JRNLatLng>, jni::alias_ref<JRNPosition>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JDouble>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JDouble>, jni::alias_ref<JRNPosition>, jni::alias_ref<JRNMarkerSvg>, jni::alias_ref<JRNMarkerSvg>);
       static const auto clazz = javaClassStatic();
       static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
       return create(
@@ -104,7 +107,8 @@ namespace margelo::nitro::rngooglemapsplus {
         value.draggable.has_value() ? jni::JBoolean::valueOf(value.draggable.value()) : nullptr,
         value.rotation.has_value() ? jni::JDouble::valueOf(value.rotation.value()) : nullptr,
         value.infoWindowAnchor.has_value() ? JRNPosition::fromCpp(value.infoWindowAnchor.value()) : nullptr,
-        value.iconSvg.has_value() ? JRNMarkerSvg::fromCpp(value.iconSvg.value()) : nullptr
+        value.iconSvg.has_value() ? JRNMarkerSvg::fromCpp(value.iconSvg.value()) : nullptr,
+        value.infoWindowIconSvg.has_value() ? JRNMarkerSvg::fromCpp(value.infoWindowIconSvg.value()) : nullptr
       );
     }
   };

package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/{Func_void_std__optional_std__string_.kt → Func_void_std__string.kt}

@@ -1,5 +1,5 @@
 ///
-/// Func_void_std__optional_std__string_.kt
+/// Func_void_std__string.kt
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
 /// Copyright © 2025 Marc Rousavy @ Margelo
@@ -15,25 +15,25 @@ import dalvik.annotation.optimization.FastNative
 
 
 /**
- * Represents the JavaScript callback `(id: optional) => void`.
+ * Represents the JavaScript callback `(id: string) => void`.
  * This can be either implemented in C++ (in which case it might be a callback coming from JS),
  * or in Kotlin/Java (in which case it is a native callback).
  */
 @DoNotStrip
 @Keep
 @Suppress("ClassName", "RedundantUnitReturnType")
-fun interface Func_void_std__optional_std__string_: (String?) -> Unit {
+fun interface Func_void_std__string: (String) -> Unit {
   /**
    * Call the given JS callback.
    * @throws Throwable if the JS function itself throws an error, or if the JS function/runtime has already been deleted.
    */
   @DoNotStrip
   @Keep
-  override fun invoke(id: String?): Unit
+  override fun invoke(id: String): Unit
 }
 
 /**
- * Represents the JavaScript callback `(id: optional) => void`.
+ * Represents the JavaScript callback `(id: string) => void`.
  * This is implemented in C++, via a `std::function<...>`.
  * The callback might be coming from JS.
  */
@@ -44,7 +44,7 @@ fun interface Func_void_std__optional_std__string_: (String?) -> Unit {
   "RedundantSuppression", "RedundantUnitReturnType", "FunctionName",
   "ConvertSecondaryConstructorToPrimary", "ClassName", "LocalVariableName",
 )
-class Func_void_std__optional_std__string__cxx: Func_void_std__optional_std__string_ {
+class Func_void_std__string_cxx: Func_void_std__string {
   @DoNotStrip
   @Keep
   private val mHybridData: HybridData
@@ -57,25 +57,25 @@ class Func_void_std__optional_std__string__cxx: Func_void_std__optional_std__str
 
   @DoNotStrip
   @Keep
-  override fun invoke(id: String?): Unit
+  override fun invoke(id: String): Unit
     = invoke_cxx(id)
 
   @FastNative
-  private external fun invoke_cxx(id: String?): Unit
+  private external fun invoke_cxx(id: String): Unit
 }
 
 /**
- * Represents the JavaScript callback `(id: optional) => void`.
- * This is implemented in Java/Kotlin, via a `(String?) -> Unit`.
+ * Represents the JavaScript callback `(id: string) => void`.
+ * This is implemented in Java/Kotlin, via a `(String) -> Unit`.
  * The callback is always coming from native.
  */
 @DoNotStrip
 @Keep
 @Suppress("ClassName", "RedundantUnitReturnType", "unused")
-class Func_void_std__optional_std__string__java(private val function: (String?) -> Unit): Func_void_std__optional_std__string_ {
+class Func_void_std__string_java(private val function: (String) -> Unit): Func_void_std__string {
   @DoNotStrip
   @Keep
-  override fun invoke(id: String?): Unit {
+  override fun invoke(id: String): Unit {
     return this.function(id)
   }
 }

package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/{Func_void_std__optional_std__string__RNLatLng.kt → Func_void_std__string_RNLatLng.kt}

@@ -1,5 +1,5 @@
 ///
-/// Func_void_std__optional_std__string__RNLatLng.kt
+/// Func_void_std__string_RNLatLng.kt
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
 /// Copyright © 2025 Marc Rousavy @ Margelo
@@ -15,25 +15,25 @@ import dalvik.annotation.optimization.FastNative
 
 
 /**
- * Represents the JavaScript callback `(id: optional, location: struct) => void`.
+ * Represents the JavaScript callback `(id: string, location: struct) => void`.
  * This can be either implemented in C++ (in which case it might be a callback coming from JS),
  * or in Kotlin/Java (in which case it is a native callback).
  */
 @DoNotStrip
 @Keep
 @Suppress("ClassName", "RedundantUnitReturnType")
-fun interface Func_void_std__optional_std__string__RNLatLng: (String?, RNLatLng) -> Unit {
+fun interface Func_void_std__string_RNLatLng: (String, RNLatLng) -> Unit {
   /**
    * Call the given JS callback.
    * @throws Throwable if the JS function itself throws an error, or if the JS function/runtime has already been deleted.
    */
   @DoNotStrip
   @Keep
-  override fun invoke(id: String?, location: RNLatLng): Unit
+  override fun invoke(id: String, location: RNLatLng): Unit
 }
 
 /**
- * Represents the JavaScript callback `(id: optional, location: struct) => void`.
+ * Represents the JavaScript callback `(id: string, location: struct) => void`.
  * This is implemented in C++, via a `std::function<...>`.
  * The callback might be coming from JS.
  */
@@ -44,7 +44,7 @@ fun interface Func_void_std__optional_std__string__RNLatLng: (String?, RNLatLng)
   "RedundantSuppression", "RedundantUnitReturnType", "FunctionName",
   "ConvertSecondaryConstructorToPrimary", "ClassName", "LocalVariableName",
 )
-class Func_void_std__optional_std__string__RNLatLng_cxx: Func_void_std__optional_std__string__RNLatLng {
+class Func_void_std__string_RNLatLng_cxx: Func_void_std__string_RNLatLng {
   @DoNotStrip
   @Keep
   private val mHybridData: HybridData
@@ -57,25 +57,25 @@ class Func_void_std__optional_std__string__RNLatLng_cxx: Func_void_std__optional
 
   @DoNotStrip
   @Keep
-  override fun invoke(id: String?, location: RNLatLng): Unit
+  override fun invoke(id: String, location: RNLatLng): Unit
     = invoke_cxx(id,location)
 
   @FastNative
-  private external fun invoke_cxx(id: String?, location: RNLatLng): Unit
+  private external fun invoke_cxx(id: String, location: RNLatLng): Unit
 }
 
 /**
- * Represents the JavaScript callback `(id: optional, location: struct) => void`.
- * This is implemented in Java/Kotlin, via a `(String?, RNLatLng) -> Unit`.
+ * Represents the JavaScript callback `(id: string, location: struct) => void`.
+ * This is implemented in Java/Kotlin, via a `(String, RNLatLng) -> Unit`.
  * The callback is always coming from native.
  */
 @DoNotStrip
 @Keep
 @Suppress("ClassName", "RedundantUnitReturnType", "unused")
-class Func_void_std__optional_std__string__RNLatLng_java(private val function: (String?, RNLatLng) -> Unit): Func_void_std__optional_std__string__RNLatLng {
+class Func_void_std__string_RNLatLng_java(private val function: (String, RNLatLng) -> Unit): Func_void_std__string_RNLatLng {
   @DoNotStrip
   @Keep
-  override fun invoke(id: String?, location: RNLatLng): Unit {
+  override fun invoke(id: String, location: RNLatLng): Unit {
     return this.function(id, location)
   }
 }