react-native-google-maps-plus 1.1.0-dev.1 → 1.1.0-dev.2

package/RNGoogleMapsPlus.podspec

@@ -21,6 +21,8 @@ Pod::Spec.new do |s|
     "cpp/**/*.{hpp,cpp}",
   ]
 
+  s.resource_bundles = {'RNGoogleMapsPlusPrivacy' => ['Resources/PrivacyInfo.xcprivacy']}
+
   s.dependency 'React-jsi'
   s.dependency 'React-callinvoker'
 

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

@@ -32,7 +32,7 @@ class GoogleMapsViewImpl(
   val reactContext: ThemedReactContext,
   val locationHandler: LocationHandler,
   val playServiceHandler: PlayServicesHandler,
-  val markerBuilder: MarkerBuilder,
+  val markerBuilder: MapMarkerBuilder,
 ) : FrameLayout(reactContext),
   GoogleMap.OnCameraMoveStartedListener,
   GoogleMap.OnCameraMoveListener,

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

@@ -10,6 +10,7 @@ import com.google.android.gms.maps.model.BitmapDescriptor
 import com.google.android.gms.maps.model.BitmapDescriptorFactory
 import com.google.android.gms.maps.model.LatLng
 import com.google.android.gms.maps.model.MarkerOptions
+import com.rngooglemapsplus.extensions.styleHash
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -19,7 +20,7 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import kotlin.coroutines.coroutineContext
 
-class MarkerBuilder(
+class MapMarkerBuilder(
   private val scope: CoroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.Default),
 ) {
   private val iconCache =
@@ -34,7 +35,7 @@ class MarkerBuilder(
 
   fun build(
     m: RNMarker,
-    icon: BitmapDescriptor,
+    icon: BitmapDescriptor?,
   ): MarkerOptions =
     MarkerOptions().apply {
       position(LatLng(m.coordinate.latitude, m.coordinate.longitude))
@@ -46,10 +47,13 @@ class MarkerBuilder(
   fun buildIconAsync(
     id: String,
     m: RNMarker,
-    onReady: (BitmapDescriptor) -> Unit,
+    onReady: (BitmapDescriptor?) -> Unit,
   ) {
     jobsById[id]?.cancel()
-
+    if (m.iconSvg == null) {
+      onReady(null)
+      return
+    }
     val key = m.styleHash()
     iconCache.get(key)?.let { cached ->
       onReady(cached)
@@ -98,17 +102,28 @@ class MarkerBuilder(
 
   private suspend fun renderBitmap(m: RNMarker): Bitmap? {
     var bmp: Bitmap? = null
+    if (m.iconSvg == null) {
+      return null
+    }
     try {
       coroutineContext.ensureActive()
-      val svg = SVG.getFromString(m.iconSvg)
+      val svg = SVG.getFromString(m.iconSvg.svgString)
 
       coroutineContext.ensureActive()
-      svg.setDocumentWidth(m.width.dpToPx())
-      svg.setDocumentHeight(m.height.dpToPx())
+      svg.setDocumentWidth(m.iconSvg.width.dpToPx())
+      svg.setDocumentHeight(m.iconSvg.height.dpToPx())
 
       coroutineContext.ensureActive()
       bmp =
-        createBitmap(m.width.dpToPx().toInt(), m.height.dpToPx().toInt(), Bitmap.Config.ARGB_8888)
+        createBitmap(
+          m.iconSvg.width
+            .dpToPx()
+            .toInt(),
+          m.iconSvg.height
+            .dpToPx()
+            .toInt(),
+          Bitmap.Config.ARGB_8888,
+        )
 
       coroutineContext.ensureActive()
       val canvas = Canvas(bmp)
@@ -125,22 +140,3 @@ class MarkerBuilder(
     }
   }
 }
-
-fun RNMarker.markerEquals(b: RNMarker): Boolean =
-  id == b.id &&
-    zIndex == b.zIndex &&
-    coordinate == b.coordinate &&
-    anchor == b.anchor &&
-    markerStyleEquals(b)
-
-fun RNMarker.markerStyleEquals(b: RNMarker): Boolean =
-  width == b.width &&
-    height == b.height &&
-    iconSvg == b.iconSvg
-
-fun RNMarker.styleHash(): Int =
-  arrayOf<Any?>(
-    width,
-    height,
-    iconSvg,
-  ).contentHashCode()

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

@@ -8,6 +8,8 @@ import com.google.android.gms.maps.model.LatLng
 import com.google.android.gms.maps.model.MapStyleOptions
 import com.margelo.nitro.core.Promise
 import com.rngooglemapsplus.extensions.circleEquals
+import com.rngooglemapsplus.extensions.markerEquals
+import com.rngooglemapsplus.extensions.markerStyleEquals
 import com.rngooglemapsplus.extensions.polygonEquals
 import com.rngooglemapsplus.extensions.polylineEquals
 import com.rngooglemapsplus.extensions.toCameraPosition
@@ -23,7 +25,7 @@ class RNGoogleMapsPlusView(
   private var locationHandler = LocationHandler(context)
   private var playServiceHandler = PlayServicesHandler(context)
 
-  private val markerBuilder = MarkerBuilder()
+  private val markerBuilder = MapMarkerBuilder()
   private val polylineBuilder = MapPolylineBuilder()
   private val polygonBuilder = MapPolygonBuilder()
   private val circleBuilder = MapCircleBuilder()

package/android/src/main/java/com/rngooglemapsplus/extensions/RNMarkerExtension.kt

@@ -0,0 +1,17 @@
+package com.rngooglemapsplus.extensions
+
+import com.rngooglemapsplus.RNMarker
+
+fun RNMarker.markerEquals(b: RNMarker): Boolean =
+  id == b.id &&
+    zIndex == b.zIndex &&
+    coordinate == b.coordinate &&
+    anchor == b.anchor &&
+    markerStyleEquals(b)
+
+fun RNMarker.markerStyleEquals(b: RNMarker): Boolean = iconSvg == b.iconSvg
+
+fun RNMarker.styleHash(): Int =
+  arrayOf<Any?>(
+    iconSvg,
+  ).contentHashCode()

package/ios/MapMarkerBuilder.swift

@@ -11,7 +11,7 @@ final class MapMarkerBuilder {
     attributes: .concurrent
   )
 
-  func build(_ m: RNMarker, icon: UIImage) -> GMSMarker {
+  func build(_ m: RNMarker, icon: UIImage?) -> GMSMarker {
     let marker = GMSMarker(
       position: CLLocationCoordinate2D(
         latitude: m.coordinate.latitude,
@@ -40,6 +40,11 @@ final class MapMarkerBuilder {
   ) {
     tasks[id]?.cancel()
 
+    if m.iconSvg == nil {
+      onReady(nil)
+      return
+    }
+
     let key = m.styleHash()
     if let cached = iconCache.object(forKey: key) {
       onReady(cached)
@@ -85,7 +90,6 @@ final class MapMarkerBuilder {
 
     if !prev.markerStyleEquals(next) {
       buildIconAsync(next.id, next) { img in
-        guard let img else { return }
         m.tracksViewChanges = true
         m.icon = img
         if prev.anchor?.x != next.anchor?.x || prev.anchor?.y != next.anchor?.y {
@@ -117,21 +121,26 @@ final class MapMarkerBuilder {
   }
 
   private func renderUIImage(_ m: RNMarker) async -> UIImage? {
-    await withTaskCancellationHandler(
+    guard let iconSvg = m.iconSvg else {
+      return nil
+    }
+
+    return await withTaskCancellationHandler(
       operation: {
-        await withCheckedContinuation { cont in
+        await withCheckedContinuation {
+          (cont: CheckedContinuation<UIImage?, Never>) in
           queue.async {
             if Task.isCancelled {
               cont.resume(returning: nil)
               return
             }
 
-            let targetW = max(1, Int(CGFloat(m.width)))
-            let targetH = max(1, Int(CGFloat(m.height)))
+            let targetW = max(1, Int(CGFloat(iconSvg.width)))
+            let targetH = max(1, Int(CGFloat(iconSvg.height)))
             let size = CGSize(width: targetW, height: targetH)
 
             guard
-              let data = m.iconSvg.data(using: .utf8),
+              let data = iconSvg.svgString.data(using: .utf8),
               let svgImg = SVGKImage(data: data)
             else {
               cont.resume(returning: nil)

package/ios/RNGoogleMapsPlusView.swift

@@ -140,7 +140,6 @@ final class RNGoogleMapsPlusView: HybridRNGoogleMapsPlusViewSpec {
             }
           } else {
             markerBuilder.buildIconAsync(next.id, next) { icon in
-              guard let icon else { return }
               let marker = self.markerBuilder.build(next, icon: icon)
               self.impl.addMarker(id: id, marker: marker)
             }

package/ios/extensions/RNMarker+Extension.swift

@@ -10,15 +10,16 @@ extension RNMarker {
   }
 
   func markerStyleEquals(_ b: RNMarker) -> Bool {
-    width == b.width && height == b.height
-      && iconSvg == b.iconSvg
+    iconSvg?.width == b.iconSvg?.width && iconSvg?.height == b.iconSvg?.height
+      && iconSvg?.svgString == b.iconSvg?.svgString
+
   }
 
   func styleHash() -> NSString {
     var hasher = Hasher()
-    hasher.combine(width)
-    hasher.combine(height)
-    hasher.combine(iconSvg)
+    hasher.combine(iconSvg?.width)
+    hasher.combine(iconSvg?.height)
+    hasher.combine(iconSvg?.svgString)
     return String(hasher.finalize()) as NSString
   }
 }

package/lib/module/types.js.map

@@ -1 +1 @@
-{"version":3,"names":["RNAndroidLocationPriority","RNIOSLocationAccuracy","RNAndroidLocationPermissionResult","RNIOSPermissionResult","RNLocationErrorCode","RNMapErrorCode"],"sourceRoot":"../../src","sources":["types.ts"],"mappings":";;AA0CA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAIA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAIA;AACA;AACA;;AA2FA,WAAYA,yBAAyB,0BAAzBA,yBAAyB;EAAzBA,yBAAyB,CAAzBA,yBAAyB;EAAzBA,yBAAyB,CAAzBA,yBAAyB;EAAzBA,yBAAyB,CAAzBA,yBAAyB;EAAzBA,yBAAyB,CAAzBA,yBAAyB;EAAA,OAAzBA,yBAAyB;AAAA;AAYrC,WAAYC,qBAAqB,0BAArBA,qBAAqB;EAArBA,qBAAqB,CAArBA,qBAAqB;EAArBA,qBAAqB,CAArBA,qBAAqB;EAArBA,qBAAqB,CAArBA,qBAAqB;EAArBA,qBAAqB,CAArBA,qBAAqB;EAAA,OAArBA,qBAAqB;AAAA;AAYjC,WAAYC,iCAAiC,0BAAjCA,iCAAiC;EAAjCA,iCAAiC,CAAjCA,iCAAiC;EAAjCA,iCAAiC,CAAjCA,iCAAiC;EAAjCA,iCAAiC,CAAjCA,iCAAiC;EAAA,OAAjCA,iCAAiC;AAAA;AAM7C,WAAYC,qBAAqB,0BAArBA,qBAAqB;EAArBA,qBAAqB,CAArBA,qBAAqB;EAArBA,qBAAqB,CAArBA,qBAAqB;EAAA,OAArBA,qBAAqB;AAAA;AAUjC,WAAYC,mBAAmB,0BAAnBA,mBAAmB;EAAnBA,mBAAmB,CAAnBA,mBAAmB;EAAnBA,mBAAmB,CAAnBA,mBAAmB;EAAnBA,mBAAmB,CAAnBA,mBAAmB;EAAnBA,mBAAmB,CAAnBA,mBAAmB;EAAnBA,mBAAmB,CAAnBA,mBAAmB;EAAnBA,mBAAmB,CAAnBA,mBAAmB;EAAA,OAAnBA,mBAAmB;AAAA;AAS/B,WAAYC,cAAc,0BAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAA,OAAdA,cAAc;AAAA","ignoreList":[]}
+{"version":3,"names":["RNAndroidLocationPriority","RNIOSLocationAccuracy","RNAndroidLocationPermissionResult","RNIOSPermissionResult","RNLocationErrorCode","RNMapErrorCode"],"sourceRoot":"../../src","sources":["types.ts"],"mappings":";;AA0CA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAIA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAIA;AACA;AACA;;AA+FA,WAAYA,yBAAyB,0BAAzBA,yBAAyB;EAAzBA,yBAAyB,CAAzBA,yBAAyB;EAAzBA,yBAAyB,CAAzBA,yBAAyB;EAAzBA,yBAAyB,CAAzBA,yBAAyB;EAAzBA,yBAAyB,CAAzBA,yBAAyB;EAAA,OAAzBA,yBAAyB;AAAA;AAYrC,WAAYC,qBAAqB,0BAArBA,qBAAqB;EAArBA,qBAAqB,CAArBA,qBAAqB;EAArBA,qBAAqB,CAArBA,qBAAqB;EAArBA,qBAAqB,CAArBA,qBAAqB;EAArBA,qBAAqB,CAArBA,qBAAqB;EAAA,OAArBA,qBAAqB;AAAA;AAYjC,WAAYC,iCAAiC,0BAAjCA,iCAAiC;EAAjCA,iCAAiC,CAAjCA,iCAAiC;EAAjCA,iCAAiC,CAAjCA,iCAAiC;EAAjCA,iCAAiC,CAAjCA,iCAAiC;EAAA,OAAjCA,iCAAiC;AAAA;AAM7C,WAAYC,qBAAqB,0BAArBA,qBAAqB;EAArBA,qBAAqB,CAArBA,qBAAqB;EAArBA,qBAAqB,CAArBA,qBAAqB;EAAA,OAArBA,qBAAqB;AAAA;AAUjC,WAAYC,mBAAmB,0BAAnBA,mBAAmB;EAAnBA,mBAAmB,CAAnBA,mBAAmB;EAAnBA,mBAAmB,CAAnBA,mBAAmB;EAAnBA,mBAAmB,CAAnBA,mBAAmB;EAAnBA,mBAAmB,CAAnBA,mBAAmB;EAAnBA,mBAAmB,CAAnBA,mBAAmB;EAAnBA,mBAAmB,CAAnBA,mBAAmB;EAAA,OAAnBA,mBAAmB;AAAA;AAS/B,WAAYC,cAAc,0BAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAA,OAAdA,cAAc;AAAA","ignoreList":[]}

package/lib/typescript/src/types.d.ts

@@ -74,9 +74,12 @@ export type RNMarker = {
     zIndex?: number;
     coordinate: RNLatLng;
     anchor?: RNPosition;
+    iconSvg?: RNMarkerSvg;
+};
+export type RNMarkerSvg = {
     width: number;
     height: number;
-    iconSvg: string;
+    svgString: string;
 };
 export type RNPolygon = {
     id: string;

package/lib/typescript/src/types.d.ts.map

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

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

@@ -25,6 +25,8 @@ namespace margelo::nitro::rngooglemapsplus { enum class RNMapType; }
 namespace margelo::nitro::rngooglemapsplus { struct RNMarker; }
 // Forward declaration of `RNPosition` to properly resolve imports.
 namespace margelo::nitro::rngooglemapsplus { struct RNPosition; }
+// Forward declaration of `RNMarkerSvg` to properly resolve imports.
+namespace margelo::nitro::rngooglemapsplus { struct RNMarkerSvg; }
 // Forward declaration of `RNPolygon` to properly resolve imports.
 namespace margelo::nitro::rngooglemapsplus { struct RNPolygon; }
 // Forward declaration of `RNPolyline` to properly resolve imports.
@@ -81,6 +83,8 @@ namespace margelo::nitro::rngooglemapsplus { enum class RNIOSPermissionResult; }
 #include "JRNMarker.hpp"
 #include "RNPosition.hpp"
 #include "JRNPosition.hpp"
+#include "RNMarkerSvg.hpp"
+#include "JRNMarkerSvg.hpp"
 #include "RNPolygon.hpp"
 #include "JRNPolygon.hpp"
 #include "RNPolyline.hpp"

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

@@ -11,8 +11,10 @@
 #include "RNMarker.hpp"
 
 #include "JRNLatLng.hpp"
+#include "JRNMarkerSvg.hpp"
 #include "JRNPosition.hpp"
 #include "RNLatLng.hpp"
+#include "RNMarkerSvg.hpp"
 #include "RNPosition.hpp"
 #include <optional>
 #include <string>
@@ -44,20 +46,14 @@ namespace margelo::nitro::rngooglemapsplus {
       jni::local_ref<JRNLatLng> coordinate = this->getFieldValue(fieldCoordinate);
       static const auto fieldAnchor = clazz->getField<JRNPosition>("anchor");
       jni::local_ref<JRNPosition> anchor = this->getFieldValue(fieldAnchor);
-      static const auto fieldWidth = clazz->getField<double>("width");
-      double width = this->getFieldValue(fieldWidth);
-      static const auto fieldHeight = clazz->getField<double>("height");
-      double height = this->getFieldValue(fieldHeight);
-      static const auto fieldIconSvg = clazz->getField<jni::JString>("iconSvg");
-      jni::local_ref<jni::JString> iconSvg = this->getFieldValue(fieldIconSvg);
+      static const auto fieldIconSvg = clazz->getField<JRNMarkerSvg>("iconSvg");
+      jni::local_ref<JRNMarkerSvg> iconSvg = this->getFieldValue(fieldIconSvg);
       return RNMarker(
         id->toStdString(),
         zIndex != nullptr ? std::make_optional(zIndex->value()) : std::nullopt,
         coordinate->toCpp(),
         anchor != nullptr ? std::make_optional(anchor->toCpp()) : std::nullopt,
-        width,
-        height,
-        iconSvg->toStdString()
+        iconSvg != nullptr ? std::make_optional(iconSvg->toCpp()) : std::nullopt
       );
     }
 
@@ -72,9 +68,7 @@ namespace margelo::nitro::rngooglemapsplus {
         value.zIndex.has_value() ? jni::JDouble::valueOf(value.zIndex.value()) : nullptr,
         JRNLatLng::fromCpp(value.coordinate),
         value.anchor.has_value() ? JRNPosition::fromCpp(value.anchor.value()) : nullptr,
-        value.width,
-        value.height,
-        jni::make_jstring(value.iconSvg)
+        value.iconSvg.has_value() ? JRNMarkerSvg::fromCpp(value.iconSvg.value()) : nullptr
       );
     }
   };

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

@@ -0,0 +1,61 @@
+///
+/// JRNMarkerSvg.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 "RNMarkerSvg.hpp"
+
+#include <string>
+
+namespace margelo::nitro::rngooglemapsplus {
+
+  using namespace facebook;
+
+  /**
+   * The C++ JNI bridge between the C++ struct "RNMarkerSvg" and the the Kotlin data class "RNMarkerSvg".
+   */
+  struct JRNMarkerSvg final: public jni::JavaClass<JRNMarkerSvg> {
+  public:
+    static auto constexpr kJavaDescriptor = "Lcom/rngooglemapsplus/RNMarkerSvg;";
+
+  public:
+    /**
+     * Convert this Java/Kotlin-based struct to the C++ struct RNMarkerSvg by copying all values to C++.
+     */
+    [[maybe_unused]]
+    [[nodiscard]]
+    RNMarkerSvg toCpp() const {
+      static const auto clazz = javaClassStatic();
+      static const auto fieldWidth = clazz->getField<double>("width");
+      double width = this->getFieldValue(fieldWidth);
+      static const auto fieldHeight = clazz->getField<double>("height");
+      double height = this->getFieldValue(fieldHeight);
+      static const auto fieldSvgString = clazz->getField<jni::JString>("svgString");
+      jni::local_ref<jni::JString> svgString = this->getFieldValue(fieldSvgString);
+      return RNMarkerSvg(
+        width,
+        height,
+        svgString->toStdString()
+      );
+    }
+
+  public:
+    /**
+     * Create a Java/Kotlin-based struct by copying all values from the given C++ struct to Java.
+     */
+    [[maybe_unused]]
+    static jni::local_ref<JRNMarkerSvg::javaobject> fromCpp(const RNMarkerSvg& value) {
+      return newInstance(
+        value.width,
+        value.height,
+        jni::make_jstring(value.svgString)
+      );
+    }
+  };
+
+} // namespace margelo::nitro::rngooglemapsplus

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

@@ -35,13 +35,7 @@ data class RNMarker
     val anchor: RNPosition?,
     @DoNotStrip
     @Keep
-    val width: Double,
-    @DoNotStrip
-    @Keep
-    val height: Double,
-    @DoNotStrip
-    @Keep
-    val iconSvg: String
+    val iconSvg: RNMarkerSvg?
   ) {
   /* main constructor */
 }

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

@@ -0,0 +1,35 @@
+///
+/// RNMarkerSvg.kt
+/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
+/// https://github.com/mrousavy/nitro
+/// Copyright © 2025 Marc Rousavy @ Margelo
+///
+
+package com.rngooglemapsplus
+
+import androidx.annotation.Keep
+import com.facebook.proguard.annotations.DoNotStrip
+import com.margelo.nitro.core.*
+
+
+/**
+ * Represents the JavaScript object/struct "RNMarkerSvg".
+ */
+@DoNotStrip
+@Keep
+data class RNMarkerSvg
+  @DoNotStrip
+  @Keep
+  constructor(
+    @DoNotStrip
+    @Keep
+    val width: Double,
+    @DoNotStrip
+    @Keep
+    val height: Double,
+    @DoNotStrip
+    @Keep
+    val svgString: String
+  ) {
+  /* main constructor */
+}

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

@@ -52,6 +52,8 @@ namespace margelo::nitro::rngooglemapsplus { struct RNMapPadding; }
 namespace margelo::nitro::rngooglemapsplus { enum class RNMapType; }
 // Forward declaration of `RNMapUiSettings` to properly resolve imports.
 namespace margelo::nitro::rngooglemapsplus { struct RNMapUiSettings; }
+// Forward declaration of `RNMarkerSvg` to properly resolve imports.
+namespace margelo::nitro::rngooglemapsplus { struct RNMarkerSvg; }
 // Forward declaration of `RNMarker` to properly resolve imports.
 namespace margelo::nitro::rngooglemapsplus { struct RNMarker; }
 // Forward declaration of `RNPolygon` to properly resolve imports.
@@ -95,6 +97,7 @@ namespace RNGoogleMapsPlus { class HybridRNGoogleMapsPlusViewSpec_cxx; }
 #include "RNMapType.hpp"
 #include "RNMapUiSettings.hpp"
 #include "RNMarker.hpp"
+#include "RNMarkerSvg.hpp"
 #include "RNPolygon.hpp"
 #include "RNPolyline.hpp"
 #include "RNPosition.hpp"
@@ -406,6 +409,21 @@ namespace margelo::nitro::rngooglemapsplus::bridge::swift {
     return *optional;
   }
   
+  // pragma MARK: std::optional<RNMarkerSvg>
+  /**
+   * Specialized version of `std::optional<RNMarkerSvg>`.
+   */
+  using std__optional_RNMarkerSvg_ = std::optional<RNMarkerSvg>;
+  inline std::optional<RNMarkerSvg> create_std__optional_RNMarkerSvg_(const RNMarkerSvg& value) noexcept {
+    return std::optional<RNMarkerSvg>(value);
+  }
+  inline bool has_value_std__optional_RNMarkerSvg_(const std::optional<RNMarkerSvg>& optional) noexcept {
+    return optional.has_value();
+  }
+  inline RNMarkerSvg get_std__optional_RNMarkerSvg_(const std::optional<RNMarkerSvg>& optional) noexcept {
+    return *optional;
+  }
+  
   // pragma MARK: std::vector<RNMarker>
   /**
    * Specialized version of `std::vector<RNMarker>`.

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

@@ -52,6 +52,8 @@ namespace margelo::nitro::rngooglemapsplus { struct RNMapPadding; }
 namespace margelo::nitro::rngooglemapsplus { enum class RNMapType; }
 // Forward declaration of `RNMapUiSettings` to properly resolve imports.
 namespace margelo::nitro::rngooglemapsplus { struct RNMapUiSettings; }
+// Forward declaration of `RNMarkerSvg` to properly resolve imports.
+namespace margelo::nitro::rngooglemapsplus { struct RNMarkerSvg; }
 // Forward declaration of `RNMarker` to properly resolve imports.
 namespace margelo::nitro::rngooglemapsplus { struct RNMarker; }
 // Forward declaration of `RNPolygon` to properly resolve imports.
@@ -89,6 +91,7 @@ namespace margelo::nitro::rngooglemapsplus { enum class RNUserInterfaceStyle; }
 #include "RNMapType.hpp"
 #include "RNMapUiSettings.hpp"
 #include "RNMarker.hpp"
+#include "RNMarkerSvg.hpp"
 #include "RNPolygon.hpp"
 #include "RNPolyline.hpp"
 #include "RNPosition.hpp"

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

@@ -30,6 +30,8 @@ namespace margelo::nitro::rngooglemapsplus { enum class RNMapType; }
 namespace margelo::nitro::rngooglemapsplus { struct RNMarker; }
 // Forward declaration of `RNPosition` to properly resolve imports.
 namespace margelo::nitro::rngooglemapsplus { struct RNPosition; }
+// Forward declaration of `RNMarkerSvg` to properly resolve imports.
+namespace margelo::nitro::rngooglemapsplus { struct RNMarkerSvg; }
 // Forward declaration of `RNPolygon` to properly resolve imports.
 namespace margelo::nitro::rngooglemapsplus { struct RNPolygon; }
 // Forward declaration of `RNPolyline` to properly resolve imports.
@@ -77,6 +79,7 @@ namespace margelo::nitro::rngooglemapsplus { enum class RNIOSPermissionResult; }
 #include "RNMarker.hpp"
 #include <vector>
 #include "RNPosition.hpp"
+#include "RNMarkerSvg.hpp"
 #include "RNPolygon.hpp"
 #include "RNPolyline.hpp"
 #include "RNLineCapType.hpp"

package/nitrogen/generated/ios/swift/RNMarker.swift

@@ -18,7 +18,7 @@ public extension RNMarker {
   /**
    * Create a new instance of `RNMarker`.
    */
-  init(id: String, zIndex: Double?, coordinate: RNLatLng, anchor: RNPosition?, width: Double, height: Double, iconSvg: String) {
+  init(id: String, zIndex: Double?, coordinate: RNLatLng, anchor: RNPosition?, iconSvg: RNMarkerSvg?) {
     self.init(std.string(id), { () -> bridge.std__optional_double_ in
       if let __unwrappedValue = zIndex {
         return bridge.create_std__optional_double_(__unwrappedValue)
@@ -31,7 +31,13 @@ public extension RNMarker {
       } else {
         return .init()
       }
-    }(), width, height, std.string(iconSvg))
+    }(), { () -> bridge.std__optional_RNMarkerSvg_ in
+      if let __unwrappedValue = iconSvg {
+        return bridge.create_std__optional_RNMarkerSvg_(__unwrappedValue)
+      } else {
+        return .init()
+      }
+    }())
   }
 
   var id: String {
@@ -97,36 +103,27 @@ public extension RNMarker {
     }
   }
   
-  var width: Double {
+  var iconSvg: RNMarkerSvg? {
     @inline(__always)
     get {
-      return self.__width
-    }
-    @inline(__always)
-    set {
-      self.__width = newValue
-    }
-  }
-  
-  var height: Double {
-    @inline(__always)
-    get {
-      return self.__height
-    }
-    @inline(__always)
-    set {
-      self.__height = newValue
-    }
-  }
-  
-  var iconSvg: String {
-    @inline(__always)
-    get {
-      return String(self.__iconSvg)
+      return { () -> RNMarkerSvg? in
+        if bridge.has_value_std__optional_RNMarkerSvg_(self.__iconSvg) {
+          let __unwrapped = bridge.get_std__optional_RNMarkerSvg_(self.__iconSvg)
+          return __unwrapped
+        } else {
+          return nil
+        }
+      }()
     }
     @inline(__always)
     set {
-      self.__iconSvg = std.string(newValue)
+      self.__iconSvg = { () -> bridge.std__optional_RNMarkerSvg_ in
+        if let __unwrappedValue = newValue {
+          return bridge.create_std__optional_RNMarkerSvg_(__unwrappedValue)
+        } else {
+          return .init()
+        }
+      }()
     }
   }
 }

package/nitrogen/generated/ios/swift/RNMarkerSvg.swift

@@ -0,0 +1,57 @@
+///
+/// RNMarkerSvg.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 `RNMarkerSvg`, backed by a C++ struct.
+ */
+public typealias RNMarkerSvg = margelo.nitro.rngooglemapsplus.RNMarkerSvg
+
+public extension RNMarkerSvg {
+  private typealias bridge = margelo.nitro.rngooglemapsplus.bridge.swift
+
+  /**
+   * Create a new instance of `RNMarkerSvg`.
+   */
+  init(width: Double, height: Double, svgString: String) {
+    self.init(width, height, std.string(svgString))
+  }
+
+  var width: Double {
+    @inline(__always)
+    get {
+      return self.__width
+    }
+    @inline(__always)
+    set {
+      self.__width = newValue
+    }
+  }
+  
+  var height: Double {
+    @inline(__always)
+    get {
+      return self.__height
+    }
+    @inline(__always)
+    set {
+      self.__height = newValue
+    }
+  }
+  
+  var svgString: String {
+    @inline(__always)
+    get {
+      return String(self.__svgString)
+    }
+    @inline(__always)
+    set {
+      self.__svgString = std.string(newValue)
+    }
+  }
+}

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

@@ -22,11 +22,14 @@
 namespace margelo::nitro::rngooglemapsplus { struct RNLatLng; }
 // Forward declaration of `RNPosition` to properly resolve imports.
 namespace margelo::nitro::rngooglemapsplus { struct RNPosition; }
+// Forward declaration of `RNMarkerSvg` to properly resolve imports.
+namespace margelo::nitro::rngooglemapsplus { struct RNMarkerSvg; }
 
 #include <string>
 #include <optional>
 #include "RNLatLng.hpp"
 #include "RNPosition.hpp"
+#include "RNMarkerSvg.hpp"
 
 namespace margelo::nitro::rngooglemapsplus {
 
@@ -39,13 +42,11 @@ namespace margelo::nitro::rngooglemapsplus {
     std::optional<double> zIndex     SWIFT_PRIVATE;
     RNLatLng coordinate     SWIFT_PRIVATE;
     std::optional<RNPosition> anchor     SWIFT_PRIVATE;
-    double width     SWIFT_PRIVATE;
-    double height     SWIFT_PRIVATE;
-    std::string iconSvg     SWIFT_PRIVATE;
+    std::optional<RNMarkerSvg> iconSvg     SWIFT_PRIVATE;
 
   public:
     RNMarker() = default;
-    explicit RNMarker(std::string id, std::optional<double> zIndex, RNLatLng coordinate, std::optional<RNPosition> anchor, double width, double height, std::string iconSvg): id(id), zIndex(zIndex), coordinate(coordinate), anchor(anchor), width(width), height(height), iconSvg(iconSvg) {}
+    explicit RNMarker(std::string id, std::optional<double> zIndex, RNLatLng coordinate, std::optional<RNPosition> anchor, std::optional<RNMarkerSvg> iconSvg): id(id), zIndex(zIndex), coordinate(coordinate), anchor(anchor), iconSvg(iconSvg) {}
   };
 
 } // namespace margelo::nitro::rngooglemapsplus
@@ -62,9 +63,7 @@ namespace margelo::nitro {
         JSIConverter<std::optional<double>>::fromJSI(runtime, obj.getProperty(runtime, "zIndex")),
         JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLng>::fromJSI(runtime, obj.getProperty(runtime, "coordinate")),
         JSIConverter<std::optional<margelo::nitro::rngooglemapsplus::RNPosition>>::fromJSI(runtime, obj.getProperty(runtime, "anchor")),
-        JSIConverter<double>::fromJSI(runtime, obj.getProperty(runtime, "width")),
-        JSIConverter<double>::fromJSI(runtime, obj.getProperty(runtime, "height")),
-        JSIConverter<std::string>::fromJSI(runtime, obj.getProperty(runtime, "iconSvg"))
+        JSIConverter<std::optional<margelo::nitro::rngooglemapsplus::RNMarkerSvg>>::fromJSI(runtime, obj.getProperty(runtime, "iconSvg"))
       );
     }
     static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::nitro::rngooglemapsplus::RNMarker& arg) {
@@ -73,9 +72,7 @@ namespace margelo::nitro {
       obj.setProperty(runtime, "zIndex", JSIConverter<std::optional<double>>::toJSI(runtime, arg.zIndex));
       obj.setProperty(runtime, "coordinate", JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLng>::toJSI(runtime, arg.coordinate));
       obj.setProperty(runtime, "anchor", JSIConverter<std::optional<margelo::nitro::rngooglemapsplus::RNPosition>>::toJSI(runtime, arg.anchor));
-      obj.setProperty(runtime, "width", JSIConverter<double>::toJSI(runtime, arg.width));
-      obj.setProperty(runtime, "height", JSIConverter<double>::toJSI(runtime, arg.height));
-      obj.setProperty(runtime, "iconSvg", JSIConverter<std::string>::toJSI(runtime, arg.iconSvg));
+      obj.setProperty(runtime, "iconSvg", JSIConverter<std::optional<margelo::nitro::rngooglemapsplus::RNMarkerSvg>>::toJSI(runtime, arg.iconSvg));
       return obj;
     }
     static inline bool canConvert(jsi::Runtime& runtime, const jsi::Value& value) {
@@ -87,9 +84,7 @@ namespace margelo::nitro {
       if (!JSIConverter<std::optional<double>>::canConvert(runtime, obj.getProperty(runtime, "zIndex"))) return false;
       if (!JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLng>::canConvert(runtime, obj.getProperty(runtime, "coordinate"))) return false;
       if (!JSIConverter<std::optional<margelo::nitro::rngooglemapsplus::RNPosition>>::canConvert(runtime, obj.getProperty(runtime, "anchor"))) return false;
-      if (!JSIConverter<double>::canConvert(runtime, obj.getProperty(runtime, "width"))) return false;
-      if (!JSIConverter<double>::canConvert(runtime, obj.getProperty(runtime, "height"))) return false;
-      if (!JSIConverter<std::string>::canConvert(runtime, obj.getProperty(runtime, "iconSvg"))) return false;
+      if (!JSIConverter<std::optional<margelo::nitro::rngooglemapsplus::RNMarkerSvg>>::canConvert(runtime, obj.getProperty(runtime, "iconSvg"))) return false;
       return true;
     }
   };

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

@@ -0,0 +1,75 @@
+///
+/// RNMarkerSvg.hpp
+/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
+/// https://github.com/mrousavy/nitro
+/// Copyright © 2025 Marc Rousavy @ Margelo
+///
+
+#pragma once
+
+#if __has_include(<NitroModules/JSIConverter.hpp>)
+#include <NitroModules/JSIConverter.hpp>
+#else
+#error NitroModules cannot be found! Are you sure you installed NitroModules properly?
+#endif
+#if __has_include(<NitroModules/NitroDefines.hpp>)
+#include <NitroModules/NitroDefines.hpp>
+#else
+#error NitroModules cannot be found! Are you sure you installed NitroModules properly?
+#endif
+
+
+
+#include <string>
+
+namespace margelo::nitro::rngooglemapsplus {
+
+  /**
+   * A struct which can be represented as a JavaScript object (RNMarkerSvg).
+   */
+  struct RNMarkerSvg {
+  public:
+    double width     SWIFT_PRIVATE;
+    double height     SWIFT_PRIVATE;
+    std::string svgString     SWIFT_PRIVATE;
+
+  public:
+    RNMarkerSvg() = default;
+    explicit RNMarkerSvg(double width, double height, std::string svgString): width(width), height(height), svgString(svgString) {}
+  };
+
+} // namespace margelo::nitro::rngooglemapsplus
+
+namespace margelo::nitro {
+
+  // C++ RNMarkerSvg <> JS RNMarkerSvg (object)
+  template <>
+  struct JSIConverter<margelo::nitro::rngooglemapsplus::RNMarkerSvg> final {
+    static inline margelo::nitro::rngooglemapsplus::RNMarkerSvg fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
+      jsi::Object obj = arg.asObject(runtime);
+      return margelo::nitro::rngooglemapsplus::RNMarkerSvg(
+        JSIConverter<double>::fromJSI(runtime, obj.getProperty(runtime, "width")),
+        JSIConverter<double>::fromJSI(runtime, obj.getProperty(runtime, "height")),
+        JSIConverter<std::string>::fromJSI(runtime, obj.getProperty(runtime, "svgString"))
+      );
+    }
+    static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::nitro::rngooglemapsplus::RNMarkerSvg& arg) {
+      jsi::Object obj(runtime);
+      obj.setProperty(runtime, "width", JSIConverter<double>::toJSI(runtime, arg.width));
+      obj.setProperty(runtime, "height", JSIConverter<double>::toJSI(runtime, arg.height));
+      obj.setProperty(runtime, "svgString", JSIConverter<std::string>::toJSI(runtime, arg.svgString));
+      return obj;
+    }
+    static inline bool canConvert(jsi::Runtime& runtime, const jsi::Value& value) {
+      if (!value.isObject()) {
+        return false;
+      }
+      jsi::Object obj = value.getObject(runtime);
+      if (!JSIConverter<double>::canConvert(runtime, obj.getProperty(runtime, "width"))) return false;
+      if (!JSIConverter<double>::canConvert(runtime, obj.getProperty(runtime, "height"))) return false;
+      if (!JSIConverter<std::string>::canConvert(runtime, obj.getProperty(runtime, "svgString"))) return false;
+      return true;
+    }
+  };
+
+} // namespace margelo::nitro

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-google-maps-plus",
-  "version": "1.1.0-dev.1",
+  "version": "1.1.0-dev.2",
   "description": "React-native wrapper for android & IOS google maps sdk",
   "main": "./lib/module/index.js",
   "module": "./lib/module/index.js",

package/src/types.ts

@@ -131,9 +131,13 @@ export type RNMarker = {
   zIndex?: number;
   coordinate: RNLatLng;
   anchor?: RNPosition;
+  iconSvg?: RNMarkerSvg;
+};
+
+export type RNMarkerSvg = {
   width: number;
   height: number;
-  iconSvg: string;
+  svgString: string;
 };
 
 export type RNPolygon = {