@maydon_tech/react-native-nitro-maps 0.2.0 → 0.2.2

package/android/build.gradle

@@ -106,8 +106,12 @@ android {
   }
 
   compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
+    sourceCompatibility JavaVersion.VERSION_17
+    targetCompatibility JavaVersion.VERSION_17
+  }
+
+  kotlinOptions {
+    jvmTarget = "17"
   }
 
   sourceSets {

package/android/src/main/kotlin/com/margelo/nitro/nitromap/NitroMap.kt

@@ -72,8 +72,14 @@ class HybridNitroMap(context: Context) : HybridNitroMapSpec() {
     }
 
     private fun attachMapView() {
-        if (currentMapView != null) return // already attached
+        if (currentMapView != null) {
+            // Reattaching — reuse existing MapView, just resume it
+            mapProvider.onViewAttached(currentMapView!!)
+            Log.d(TAG, "MapView reattached (resumed)")
+            return
+        }
 
+        // First time — create and add to container
         val mv = mapProvider.createMapView(mapContext)
         container.addView(mv, FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.MATCH_PARENT)
 
@@ -81,16 +87,15 @@ class HybridNitroMap(context: Context) : HybridNitroMapSpec() {
             mapProvider.onViewAttached(mv)
         }
         currentMapView = mv
-        Log.d(TAG, "MapView attached")
+        Log.d(TAG, "MapView created and attached")
     }
 
     private fun detachMapView() {
-        currentMapView?.let { mv ->
-            mapProvider.onViewDetaching()
-            container.removeView(mv)
-        }
-        currentMapView = null
-        Log.d(TAG, "MapView detached (paused, state saved)")
+        if (currentMapView == null) return
+        mapProvider.onViewDetaching()
+        // Keep currentMapView and the view in the container — reuse on reattach.
+        // The MapView and GoogleMap survive pause/resume cycles.
+        Log.d(TAG, "MapView paused (preserved for reattach)")
     }
 
     override fun dispose() {

package/android/src/main/kotlin/com/margelo/nitro/nitromap/providers/google/GoogleMapProvider+Overlays.kt

@@ -83,8 +83,8 @@ private fun buildPolygonOptions(data: PolygonData): PolygonOptions {
     opts.clickable(data.tappable)
 
     // Add holes
-    for (hole in data.holes) {
-        val holePath = hole.map { LatLng(it.latitude, it.longitude) }
+    for (ring in data.holes) {
+        val holePath = ring.coordinates.map { LatLng(it.latitude, it.longitude) }
         opts.addHole(holePath)
     }
 

package/android/src/main/kotlin/com/margelo/nitro/nitromap/providers/google/GoogleMapProvider.kt

@@ -67,6 +67,14 @@ class GoogleMapProvider(internal val context: Context) : MapProviderInterface {
 
     override fun onViewAttached(view: View) {
         val mv = view as NitroMapView
+        if (isMapReady && googleMap != null) {
+            // Resuming from detach — GoogleMap is still valid, just resume the MapView
+            mv.onStart()
+            mv.onResume()
+            Log.d(TAG, "MapView resumed — GoogleMap still valid")
+            return
+        }
+        // First attach — need async init
         mv.getMapAsync { googleMap ->
             onMapReady(googleMap, mv)
         }
@@ -74,14 +82,12 @@ class GoogleMapProvider(internal val context: Context) : MapProviderInterface {
 
     override fun onViewDetaching() {
         mapView?.let { mv ->
-            val state = Bundle()
-            mv.onSaveInstanceState(state)
-            savedState = state
             mv.onPause()
             mv.onStop()
         }
-        onMapDetaching()
-        mapView = null
+        // Keep mapView, googleMap, isMapReady, and all rendered objects alive.
+        // GoogleMap and its native markers/overlays survive pause/resume cycles.
+        Log.d(TAG, "MapView paused — all state preserved for reattach")
     }
 
     override fun onViewDestroying() {

package/ios/Providers/Google/GoogleMapProvider+Overlays.swift

@@ -164,9 +164,9 @@ extension GoogleMapProvider {
     // Add holes
     if !polygon.holes.isEmpty {
       var holePaths: [GMSPath] = []
-      for hole in polygon.holes {
+      for ring in polygon.holes {
         let holePath = GMSMutablePath()
-        for coord in hole {
+        for coord in ring.coordinates {
           holePath.add(CLLocationCoordinate2D(latitude: coord.latitude, longitude: coord.longitude))
         }
         holePaths.append(holePath)

package/lib/module/components/NitroPolygon.js

@@ -115,7 +115,9 @@ export const NitroPolygon = /*#__PURE__*/memo(function NitroPolygon({
   const buildPolygonData = useCallback(() => ({
     id: polygonId,
     coordinates,
-    holes,
+    holes: holes.map(ring => ({
+      coordinates: ring
+    })),
     fillColor: parseColor(fillColor) ?? defaultFillColor,
     strokeColor: parseColor(strokeColor) ?? defaultStrokeColor,
     strokeWidth,

package/lib/module/components/NitroPolygon.js.map

@@ -1 +1 @@
-{"version":3,"names":["memo","useCallback","useEffect","useRef","useNitroPolygon","parseColor","areColorsEqual","Colors","validateCoordinates","polygonIdCounter","generatePolygonId","defaultFillColor","r","g","b","a","defaultStrokeColor","black","arePropsEqual","prev","next","id","strokeWidth","zIndex","tappable","accessibilityLabel","fillColor","strokeColor","prevCoords","coordinates","nextCoords","length","i","latitude","longitude","prevHoles","holes","nextHoles","ph","nh","j","NitroPolygon","__DEV__","console","warn","forEach","hole","polygonId","current","buildPolygonData","arePolygonPropsEqual"],"sourceRoot":"../../../src","sources":["components/NitroPolygon.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["memo","useCallback","useEffect","useRef","useNitroPolygon","parseColor","areColorsEqual","Colors","validateCoordinates","polygonIdCounter","generatePolygonId","defaultFillColor","r","g","b","a","defaultStrokeColor","black","arePropsEqual","prev","next","id","strokeWidth","zIndex","tappable","accessibilityLabel","fillColor","strokeColor","prevCoords","coordinates","nextCoords","length","i","latitude","longitude","prevHoles","holes","nextHoles","ph","nh","j","NitroPolygon","__DEV__","console","warn","forEach","hole","polygonId","current","buildPolygonData","map","ring","arePolygonPropsEqual"],"sourceRoot":"../../../src","sources":["components/NitroPolygon.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["NitroMap","default","PriceMarker","ImageMarker","Marker","NitroPolyline","NitroPolygon","NitroCircle","NitroMapContext","NitroMapInitialize","IsNitroMapInitialized","getDefaultProvider","rgb","hex","Colors"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":";;AAAA;;AAEA;AACA,SAASA,QAAQ,EAAEC,OAAO,QAAQ,0BAAuB;;AAEzD;AACA,SAASC,WAAW,QAAQ,6BAA0B;AACtD,SAASC,WAAW,QAAQ,6BAA0B;AACtD,SAASC,MAAM,QAAQ,wBAAqB;AAC5C,SAASC,aAAa,QAAQ,+BAA4B;AAC1D,SAASC,YAAY,QAAQ,8BAA2B;AACxD,SAASC,WAAW,QAAQ,6BAA0B;;AAEtD;;AAGA,SAASC,eAAe,QAAQ,8BAA2B;AA+C3D,SACEC,kBAAkB,EAClBC,qBAAqB,EACrBC,kBAAkB,QAEb,oBAAW;;AAElB;;AASA;AACA;AACA,SAASC,GAAG,EAAEC,GAAG,EAAEC,MAAM,QAAQ,mBAAgB","ignoreList":[]}
+{"version":3,"names":["NitroMap","default","PriceMarker","ImageMarker","Marker","NitroPolyline","NitroPolygon","NitroCircle","NitroMapContext","NitroMapInitialize","IsNitroMapInitialized","getDefaultProvider","rgb","hex","Colors"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":";;AAAA;;AAEA;AACA,SAASA,QAAQ,EAAEC,OAAO,QAAQ,0BAAuB;;AAEzD;AACA,SAASC,WAAW,QAAQ,6BAA0B;AACtD,SAASC,WAAW,QAAQ,6BAA0B;AACtD,SAASC,MAAM,QAAQ,wBAAqB;AAC5C,SAASC,aAAa,QAAQ,+BAA4B;AAC1D,SAASC,YAAY,QAAQ,8BAA2B;AACxD,SAASC,WAAW,QAAQ,6BAA0B;;AAEtD;;AAGA,SAASC,eAAe,QAAQ,8BAA2B;AAoD3D,SACEC,kBAAkB,EAClBC,qBAAqB,EACrBC,kBAAkB,QAEb,oBAAW;;AAElB;;AASA;AACA;AACA,SAASC,GAAG,EAAEC,GAAG,EAAEC,MAAM,QAAQ,mBAAgB","ignoreList":[]}

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

@@ -11,7 +11,7 @@ export { NitroMapContext } from './context/NitroMapContext';
 export type { NitroMapContextValue } from './context/NitroMapContext';
 export type { Region, Coordinate, MapType, MapPressEvent, RegionChangeEvent, EdgePadding, Camera, MapBoundaries, MapStyleElement, MapStyler, MapProvider, MapStyle, MapError, Point, UserLocationChangeEvent, UserTrackingMode, } from './types/map';
 export type { MarkerStyle, PriceMarkerStyle, MarkerColor, ImageMarkerConfig, ClusterPressEvent, ClusterConfig, ClusterStrategy, MarkerAnimation, MarkerConfig, MarkerData, MarkerDragEvent, MarkerPressEvent, } from './types/marker';
-export type { PolylineData, PolygonData, CircleData } from './types/overlay';
+export type { CoordinateRing, PolylineData, PolygonData, CircleData, } from './types/overlay';
 export type { GoogleMapTheme, AppleMapTheme, YandexMapTheme, ThemeForProvider, MapTheme, } from './types/theme';
 export { NitroMapInitialize, IsNitroMapInitialized, getDefaultProvider, type NitroMapInitConfig, } from './modules';
 export type { PriceMarkerProps } from './components/PriceMarker';

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAG1D,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAGvD,YAAY,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACxE,YAAY,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,YAAY,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEtE,YAAY,EACV,MAAM,EACN,UAAU,EACV,OAAO,EACP,aAAa,EACb,iBAAiB,EACjB,WAAW,EACX,MAAM,EACN,aAAa,EACb,eAAe,EACf,SAAS,EACT,WAAW,EACX,QAAQ,EACR,QAAQ,EACR,KAAK,EACL,uBAAuB,EACvB,gBAAgB,GACjB,MAAM,aAAa,CAAC;AAErB,YAAY,EACV,WAAW,EACX,gBAAgB,EAChB,WAAW,EACX,iBAAiB,EACjB,iBAAiB,EACjB,aAAa,EACb,eAAe,EACf,eAAe,EACf,YAAY,EACZ,UAAU,EACV,eAAe,EACf,gBAAgB,GACjB,MAAM,gBAAgB,CAAC;AAExB,YAAY,EAAE,YAAY,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7E,YAAY,EACV,cAAc,EACd,aAAa,EACb,cAAc,EACd,gBAAgB,EAChB,QAAQ,GACT,MAAM,eAAe,CAAC;AAEvB,OAAO,EACL,kBAAkB,EAClB,qBAAqB,EACrB,kBAAkB,EAClB,KAAK,kBAAkB,GACxB,MAAM,WAAW,CAAC;AAInB,YAAY,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AACjE,YAAY,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AACjE,YAAY,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvD,YAAY,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AACrE,YAAY,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AACnE,YAAY,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAIjE,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAClD,YAAY,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAG1D,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAGvD,YAAY,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACxE,YAAY,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,YAAY,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEtE,YAAY,EACV,MAAM,EACN,UAAU,EACV,OAAO,EACP,aAAa,EACb,iBAAiB,EACjB,WAAW,EACX,MAAM,EACN,aAAa,EACb,eAAe,EACf,SAAS,EACT,WAAW,EACX,QAAQ,EACR,QAAQ,EACR,KAAK,EACL,uBAAuB,EACvB,gBAAgB,GACjB,MAAM,aAAa,CAAC;AAErB,YAAY,EACV,WAAW,EACX,gBAAgB,EAChB,WAAW,EACX,iBAAiB,EACjB,iBAAiB,EACjB,aAAa,EACb,eAAe,EACf,eAAe,EACf,YAAY,EACZ,UAAU,EACV,eAAe,EACf,gBAAgB,GACjB,MAAM,gBAAgB,CAAC;AAExB,YAAY,EACV,cAAc,EACd,YAAY,EACZ,WAAW,EACX,UAAU,GACX,MAAM,iBAAiB,CAAC;AAEzB,YAAY,EACV,cAAc,EACd,aAAa,EACb,cAAc,EACd,gBAAgB,EAChB,QAAQ,GACT,MAAM,eAAe,CAAC;AAEvB,OAAO,EACL,kBAAkB,EAClB,qBAAqB,EACrB,kBAAkB,EAClB,KAAK,kBAAkB,GACxB,MAAM,WAAW,CAAC;AAInB,YAAY,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AACjE,YAAY,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AACjE,YAAY,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvD,YAAY,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AACrE,YAAY,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AACnE,YAAY,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAIjE,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAClD,YAAY,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC"}

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

@@ -1,5 +1,14 @@
 import type { Coordinate } from './map';
 import type { MarkerColor } from './marker';
+/**
+ * Wrapper struct for an array of coordinates.
+ * Used to avoid nested arrays (Coordinate[][]) which trigger a Nitrogen codegen bug
+ * where variable names collide in the generated C++ JNI bridge code.
+ */
+export type CoordinateRing = {
+    /** Array of coordinates forming a ring (e.g., a polygon hole boundary) */
+    coordinates: Coordinate[];
+};
 /**
  * Data structure for a polyline overlay on the map.
  * Represents a line connecting multiple geographic points.
@@ -33,8 +42,8 @@ export type PolygonData = {
     id: string;
     /** Array of geographic coordinates that form the polygon boundary */
     coordinates: Coordinate[];
-    /** Optional array of holes — each hole is an array of coordinates cut out from the fill */
-    holes: Coordinate[][];
+    /** Array of holes — each hole is a CoordinateRing cut out from the fill */
+    holes: CoordinateRing[];
     /** Fill color as RGBA */
     fillColor: MarkerColor;
     /** Stroke color as RGBA */

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

@@ -1 +1 @@
-{"version":3,"file":"overlay.d.ts","sourceRoot":"","sources":["../../../../src/types/overlay.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AACxC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAE5C;;;GAGG;AACH,MAAM,MAAM,YAAY,GAAG;IACzB,yCAAyC;IACzC,EAAE,EAAE,MAAM,CAAC;IACX,kEAAkE;IAClE,WAAW,EAAE,UAAU,EAAE,CAAC;IAC1B,2BAA2B;IAC3B,WAAW,EAAE,WAAW,CAAC;IACzB,6BAA6B;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,gEAAgE;IAChE,QAAQ,EAAE,OAAO,CAAC;IAClB,iCAAiC;IACjC,MAAM,EAAE,OAAO,CAAC;IAChB,4CAA4C;IAC5C,MAAM,EAAE,MAAM,CAAC;IACf,kDAAkD;IAClD,QAAQ,EAAE,OAAO,CAAC;IAClB,wEAAwE;IACxE,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B,CAAC;AAEF;;;GAGG;AACH,MAAM,MAAM,WAAW,GAAG;IACxB,wCAAwC;IACxC,EAAE,EAAE,MAAM,CAAC;IACX,qEAAqE;IACrE,WAAW,EAAE,UAAU,EAAE,CAAC;IAC1B,2FAA2F;IAC3F,KAAK,EAAE,UAAU,EAAE,EAAE,CAAC;IACtB,yBAAyB;IACzB,SAAS,EAAE,WAAW,CAAC;IACvB,2BAA2B;IAC3B,WAAW,EAAE,WAAW,CAAC;IACzB,6BAA6B;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,4CAA4C;IAC5C,MAAM,EAAE,MAAM,CAAC;IACf,kDAAkD;IAClD,QAAQ,EAAE,OAAO,CAAC;IAClB,wEAAwE;IACxE,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B,CAAC;AAEF;;;GAGG;AACH,MAAM,MAAM,UAAU,GAAG;IACvB,uCAAuC;IACvC,EAAE,EAAE,MAAM,CAAC;IACX,sCAAsC;IACtC,MAAM,EAAE,UAAU,CAAC;IACnB,uBAAuB;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,yBAAyB;IACzB,SAAS,EAAE,WAAW,CAAC;IACvB,2BAA2B;IAC3B,WAAW,EAAE,WAAW,CAAC;IACzB,6BAA6B;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,4CAA4C;IAC5C,MAAM,EAAE,MAAM,CAAC;IACf,kDAAkD;IAClD,QAAQ,EAAE,OAAO,CAAC;IAClB,wEAAwE;IACxE,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B,CAAC"}
+{"version":3,"file":"overlay.d.ts","sourceRoot":"","sources":["../../../../src/types/overlay.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AACxC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAE5C;;;;GAIG;AACH,MAAM,MAAM,cAAc,GAAG;IAC3B,0EAA0E;IAC1E,WAAW,EAAE,UAAU,EAAE,CAAC;CAC3B,CAAC;AAEF;;;GAGG;AACH,MAAM,MAAM,YAAY,GAAG;IACzB,yCAAyC;IACzC,EAAE,EAAE,MAAM,CAAC;IACX,kEAAkE;IAClE,WAAW,EAAE,UAAU,EAAE,CAAC;IAC1B,2BAA2B;IAC3B,WAAW,EAAE,WAAW,CAAC;IACzB,6BAA6B;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,gEAAgE;IAChE,QAAQ,EAAE,OAAO,CAAC;IAClB,iCAAiC;IACjC,MAAM,EAAE,OAAO,CAAC;IAChB,4CAA4C;IAC5C,MAAM,EAAE,MAAM,CAAC;IACf,kDAAkD;IAClD,QAAQ,EAAE,OAAO,CAAC;IAClB,wEAAwE;IACxE,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B,CAAC;AAEF;;;GAGG;AACH,MAAM,MAAM,WAAW,GAAG;IACxB,wCAAwC;IACxC,EAAE,EAAE,MAAM,CAAC;IACX,qEAAqE;IACrE,WAAW,EAAE,UAAU,EAAE,CAAC;IAC1B,2EAA2E;IAC3E,KAAK,EAAE,cAAc,EAAE,CAAC;IACxB,yBAAyB;IACzB,SAAS,EAAE,WAAW,CAAC;IACvB,2BAA2B;IAC3B,WAAW,EAAE,WAAW,CAAC;IACzB,6BAA6B;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,4CAA4C;IAC5C,MAAM,EAAE,MAAM,CAAC;IACf,kDAAkD;IAClD,QAAQ,EAAE,OAAO,CAAC;IAClB,wEAAwE;IACxE,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B,CAAC;AAEF;;;GAGG;AACH,MAAM,MAAM,UAAU,GAAG;IACvB,uCAAuC;IACvC,EAAE,EAAE,MAAM,CAAC;IACX,sCAAsC;IACtC,MAAM,EAAE,UAAU,CAAC;IACnB,uBAAuB;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,yBAAyB;IACzB,SAAS,EAAE,WAAW,CAAC;IACvB,2BAA2B;IAC3B,WAAW,EAAE,WAAW,CAAC;IACzB,6BAA6B;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,4CAA4C;IAC5C,MAAM,EAAE,MAAM,CAAC;IACf,kDAAkD;IAClD,QAAQ,EAAE,OAAO,CAAC;IAClB,wEAAwE;IACxE,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B,CAAC"}

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

@@ -0,0 +1,77 @@
+///
+/// JCoordinateRing.hpp
+/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
+/// https://github.com/mrousavy/nitro
+/// Copyright © 2026 Marc Rousavy @ Margelo
+///
+
+#pragma once
+
+#include <fbjni/fbjni.h>
+#include "CoordinateRing.hpp"
+
+#include "Coordinate.hpp"
+#include "JCoordinate.hpp"
+#include <vector>
+
+namespace margelo::nitro::nitromap {
+
+  using namespace facebook;
+
+  /**
+   * The C++ JNI bridge between the C++ struct "CoordinateRing" and the the Kotlin data class "CoordinateRing".
+   */
+  struct JCoordinateRing final: public jni::JavaClass<JCoordinateRing> {
+  public:
+    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/nitromap/CoordinateRing;";
+
+  public:
+    /**
+     * Convert this Java/Kotlin-based struct to the C++ struct CoordinateRing by copying all values to C++.
+     */
+    [[maybe_unused]]
+    [[nodiscard]]
+    CoordinateRing toCpp() const {
+      static const auto clazz = javaClassStatic();
+      static const auto fieldCoordinates = clazz->getField<jni::JArrayClass<JCoordinate>>("coordinates");
+      jni::local_ref<jni::JArrayClass<JCoordinate>> coordinates = this->getFieldValue(fieldCoordinates);
+      return CoordinateRing(
+        [&]() {
+          size_t __size = coordinates->size();
+          std::vector<Coordinate> __vector;
+          __vector.reserve(__size);
+          for (size_t __i = 0; __i < __size; __i++) {
+            auto __element = coordinates->getElement(__i);
+            __vector.push_back(__element->toCpp());
+          }
+          return __vector;
+        }()
+      );
+    }
+
+  public:
+    /**
+     * Create a Java/Kotlin-based struct by copying all values from the given C++ struct to Java.
+     */
+    [[maybe_unused]]
+    static jni::local_ref<JCoordinateRing::javaobject> fromCpp(const CoordinateRing& value) {
+      using JSignature = JCoordinateRing(jni::alias_ref<jni::JArrayClass<JCoordinate>>);
+      static const auto clazz = javaClassStatic();
+      static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
+      return create(
+        clazz,
+        [&]() {
+          size_t __size = value.coordinates.size();
+          jni::local_ref<jni::JArrayClass<JCoordinate>> __array = jni::JArrayClass<JCoordinate>::newArray(__size);
+          for (size_t __i = 0; __i < __size; __i++) {
+            const auto& __element = value.coordinates[__i];
+            auto __elementJni = JCoordinate::fromCpp(__element);
+            __array->setElement(__i, *__elementJni);
+          }
+          return __array;
+        }()
+      );
+    }
+  };
+
+} // namespace margelo::nitro::nitromap

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

@@ -65,6 +65,8 @@ namespace margelo::nitro::nitromap { enum class MarkerAnimation; }
 namespace margelo::nitro::nitromap { struct PolylineData; }
 // Forward declaration of `PolygonData` to properly resolve imports.
 namespace margelo::nitro::nitromap { struct PolygonData; }
+// Forward declaration of `CoordinateRing` to properly resolve imports.
+namespace margelo::nitro::nitromap { struct CoordinateRing; }
 // Forward declaration of `CircleData` to properly resolve imports.
 namespace margelo::nitro::nitromap { struct CircleData; }
 
@@ -146,6 +148,8 @@ namespace margelo::nitro::nitromap { struct CircleData; }
 #include "JPolylineData.hpp"
 #include "PolygonData.hpp"
 #include "JPolygonData.hpp"
+#include "CoordinateRing.hpp"
+#include "JCoordinateRing.hpp"
 #include "CircleData.hpp"
 #include "JCircleData.hpp"
 

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

@@ -11,7 +11,9 @@
 #include "PolygonData.hpp"
 
 #include "Coordinate.hpp"
+#include "CoordinateRing.hpp"
 #include "JCoordinate.hpp"
+#include "JCoordinateRing.hpp"
 #include "JMarkerColor.hpp"
 #include "MarkerColor.hpp"
 #include <optional>
@@ -41,8 +43,8 @@ namespace margelo::nitro::nitromap {
       jni::local_ref<jni::JString> id = this->getFieldValue(fieldId);
       static const auto fieldCoordinates = clazz->getField<jni::JArrayClass<JCoordinate>>("coordinates");
       jni::local_ref<jni::JArrayClass<JCoordinate>> coordinates = this->getFieldValue(fieldCoordinates);
-      static const auto fieldHoles = clazz->getField<jni::JArrayClass<jni::JArrayClass<JCoordinate>>>("holes");
-      jni::local_ref<jni::JArrayClass<jni::JArrayClass<JCoordinate>>> holes = this->getFieldValue(fieldHoles);
+      static const auto fieldHoles = clazz->getField<jni::JArrayClass<JCoordinateRing>>("holes");
+      jni::local_ref<jni::JArrayClass<JCoordinateRing>> holes = this->getFieldValue(fieldHoles);
       static const auto fieldFillColor = clazz->getField<JMarkerColor>("fillColor");
       jni::local_ref<JMarkerColor> fillColor = this->getFieldValue(fieldFillColor);
       static const auto fieldStrokeColor = clazz->getField<JMarkerColor>("strokeColor");
@@ -69,22 +71,13 @@ namespace margelo::nitro::nitromap {
         }(),
         [&]() {
           size_t __size = holes->size();
-          std::vector<std::vector<Coordinate>> __vector;
+          std::vector<CoordinateRing> __vector;
           __vector.reserve(__size);
           for (size_t __i = 0; __i < __size; __i++) {
             auto __element = holes->getElement(__i);
-            __vector.push_back([&]() {
-          size_t __size = __element->size();
-          std::vector<Coordinate> __vector;
-          __vector.reserve(__size);
-          for (size_t __i = 0; __i < __size; __i++) {
-            auto __element = __element->getElement(__i);
             __vector.push_back(__element->toCpp());
           }
           return __vector;
-        }());
-          }
-          return __vector;
         }(),
         fillColor->toCpp(),
         strokeColor->toCpp(),
@@ -101,7 +94,7 @@ namespace margelo::nitro::nitromap {
      */
     [[maybe_unused]]
     static jni::local_ref<JPolygonData::javaobject> fromCpp(const PolygonData& value) {
-      using JSignature = JPolygonData(jni::alias_ref<jni::JString>, jni::alias_ref<jni::JArrayClass<JCoordinate>>, jni::alias_ref<jni::JArrayClass<jni::JArrayClass<JCoordinate>>>, jni::alias_ref<JMarkerColor>, jni::alias_ref<JMarkerColor>, double, double, jboolean, jni::alias_ref<jni::JString>);
+      using JSignature = JPolygonData(jni::alias_ref<jni::JString>, jni::alias_ref<jni::JArrayClass<JCoordinate>>, jni::alias_ref<jni::JArrayClass<JCoordinateRing>>, jni::alias_ref<JMarkerColor>, jni::alias_ref<JMarkerColor>, double, double, jboolean, jni::alias_ref<jni::JString>);
       static const auto clazz = javaClassStatic();
       static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
       return create(
@@ -119,19 +112,10 @@ namespace margelo::nitro::nitromap {
         }(),
         [&]() {
           size_t __size = value.holes.size();
-          jni::local_ref<jni::JArrayClass<jni::JArrayClass<JCoordinate>>> __array = jni::JArrayClass<jni::JArrayClass<JCoordinate>>::newArray(__size);
+          jni::local_ref<jni::JArrayClass<JCoordinateRing>> __array = jni::JArrayClass<JCoordinateRing>::newArray(__size);
           for (size_t __i = 0; __i < __size; __i++) {
             const auto& __element = value.holes[__i];
-            auto __elementJni = [&]() {
-              size_t __size = __element.size();
-              jni::local_ref<jni::JArrayClass<JCoordinate>> __array = jni::JArrayClass<JCoordinate>::newArray(__size);
-              for (size_t __i = 0; __i < __size; __i++) {
-                const auto& __element = __element[__i];
-                auto __elementJni = JCoordinate::fromCpp(__element);
-                __array->setElement(__i, *__elementJni);
-              }
-              return __array;
-            }();
+            auto __elementJni = JCoordinateRing::fromCpp(__element);
             __array->setElement(__i, *__elementJni);
           }
           return __array;

package/nitrogen/generated/android/kotlin/com/margelo/nitro/nitromap/CoordinateRing.kt

@@ -0,0 +1,38 @@
+///
+/// CoordinateRing.kt
+/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
+/// https://github.com/mrousavy/nitro
+/// Copyright © 2026 Marc Rousavy @ Margelo
+///
+
+package com.margelo.nitro.nitromap
+
+import androidx.annotation.Keep
+import com.facebook.proguard.annotations.DoNotStrip
+
+
+/**
+ * Represents the JavaScript object/struct "CoordinateRing".
+ */
+@DoNotStrip
+@Keep
+data class CoordinateRing(
+  @DoNotStrip
+  @Keep
+  val coordinates: Array<Coordinate>
+) {
+  /* primary constructor */
+
+  private companion object {
+    /**
+     * Constructor called from C++
+     */
+    @DoNotStrip
+    @Keep
+    @Suppress("unused")
+    @JvmStatic
+    private fun fromCpp(coordinates: Array<Coordinate>): CoordinateRing {
+      return CoordinateRing(coordinates)
+    }
+  }
+}

package/nitrogen/generated/android/kotlin/com/margelo/nitro/nitromap/PolygonData.kt

@@ -25,7 +25,7 @@ data class PolygonData(
   val coordinates: Array<Coordinate>,
   @DoNotStrip
   @Keep
-  val holes: Array<Array<Coordinate>>,
+  val holes: Array<CoordinateRing>,
   @DoNotStrip
   @Keep
   val fillColor: MarkerColor,
@@ -55,7 +55,7 @@ data class PolygonData(
     @Keep
     @Suppress("unused")
     @JvmStatic
-    private fun fromCpp(id: String, coordinates: Array<Coordinate>, holes: Array<Array<Coordinate>>, fillColor: MarkerColor, strokeColor: MarkerColor, strokeWidth: Double, zIndex: Double, tappable: Boolean, accessibilityLabel: String?): PolygonData {
+    private fun fromCpp(id: String, coordinates: Array<Coordinate>, holes: Array<CoordinateRing>, fillColor: MarkerColor, strokeColor: MarkerColor, strokeWidth: Double, zIndex: Double, tappable: Boolean, accessibilityLabel: String?): PolygonData {
       return PolygonData(id, coordinates, holes, fillColor, strokeColor, strokeWidth, zIndex, tappable, accessibilityLabel)
     }
   }

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

@@ -16,6 +16,8 @@ namespace margelo::nitro::nitromap { struct ClusterConfig; }
 namespace margelo::nitro::nitromap { struct ClusterPressEvent; }
 // Forward declaration of `ClusterStrategy` to properly resolve imports.
 namespace margelo::nitro::nitromap { enum class ClusterStrategy; }
+// Forward declaration of `CoordinateRing` to properly resolve imports.
+namespace margelo::nitro::nitromap { struct CoordinateRing; }
 // Forward declaration of `Coordinate` to properly resolve imports.
 namespace margelo::nitro::nitromap { struct Coordinate; }
 // Forward declaration of `EdgePadding` to properly resolve imports.
@@ -79,6 +81,7 @@ namespace NitroMap { class HybridNitroMapSpec_cxx; }
 #include "ClusterPressEvent.hpp"
 #include "ClusterStrategy.hpp"
 #include "Coordinate.hpp"
+#include "CoordinateRing.hpp"
 #include "EdgePadding.hpp"
 #include "HybridNitroMapConfigSpec.hpp"
 #include "HybridNitroMapSpec.hpp"
@@ -889,13 +892,13 @@ namespace margelo::nitro::nitromap::bridge::swift {
     return vector;
   }
   
-  // pragma MARK: std::vector<std::vector<Coordinate>>
+  // pragma MARK: std::vector<CoordinateRing>
   /**
-   * Specialized version of `std::vector<std::vector<Coordinate>>`.
+   * Specialized version of `std::vector<CoordinateRing>`.
    */
-  using std__vector_std__vector_Coordinate__ = std::vector<std::vector<Coordinate>>;
-  inline std::vector<std::vector<Coordinate>> create_std__vector_std__vector_Coordinate__(size_t size) noexcept {
-    std::vector<std::vector<Coordinate>> vector;
+  using std__vector_CoordinateRing_ = std::vector<CoordinateRing>;
+  inline std::vector<CoordinateRing> create_std__vector_CoordinateRing_(size_t size) noexcept {
+    std::vector<CoordinateRing> vector;
     vector.reserve(size);
     return vector;
   }

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

@@ -18,6 +18,8 @@ namespace margelo::nitro::nitromap { struct ClusterConfig; }
 namespace margelo::nitro::nitromap { struct ClusterPressEvent; }
 // Forward declaration of `ClusterStrategy` to properly resolve imports.
 namespace margelo::nitro::nitromap { enum class ClusterStrategy; }
+// Forward declaration of `CoordinateRing` to properly resolve imports.
+namespace margelo::nitro::nitromap { struct CoordinateRing; }
 // Forward declaration of `Coordinate` to properly resolve imports.
 namespace margelo::nitro::nitromap { struct Coordinate; }
 // Forward declaration of `EdgePadding` to properly resolve imports.
@@ -80,6 +82,7 @@ namespace margelo::nitro::nitromap { enum class UserTrackingMode; }
 #include "ClusterPressEvent.hpp"
 #include "ClusterStrategy.hpp"
 #include "Coordinate.hpp"
+#include "CoordinateRing.hpp"
 #include "EdgePadding.hpp"
 #include "HybridNitroMapConfigSpec.hpp"
 #include "HybridNitroMapSpec.hpp"

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

@@ -70,6 +70,8 @@ namespace margelo::nitro::nitromap { enum class MarkerAnimation; }
 namespace margelo::nitro::nitromap { struct PolylineData; }
 // Forward declaration of `PolygonData` to properly resolve imports.
 namespace margelo::nitro::nitromap { struct PolygonData; }
+// Forward declaration of `CoordinateRing` to properly resolve imports.
+namespace margelo::nitro::nitromap { struct CoordinateRing; }
 // Forward declaration of `CircleData` to properly resolve imports.
 namespace margelo::nitro::nitromap { struct CircleData; }
 
@@ -108,6 +110,7 @@ namespace margelo::nitro::nitromap { struct CircleData; }
 #include "MarkerAnimation.hpp"
 #include "PolylineData.hpp"
 #include "PolygonData.hpp"
+#include "CoordinateRing.hpp"
 #include "CircleData.hpp"
 
 #include "NitroMap-Swift-Cxx-Umbrella.hpp"

package/nitrogen/generated/ios/swift/CoordinateRing.swift

@@ -0,0 +1,48 @@
+///
+/// CoordinateRing.swift
+/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
+/// https://github.com/mrousavy/nitro
+/// Copyright © 2026 Marc Rousavy @ Margelo
+///
+
+import Foundation
+import NitroModules
+
+/**
+ * Represents an instance of `CoordinateRing`, backed by a C++ struct.
+ */
+public typealias CoordinateRing = margelo.nitro.nitromap.CoordinateRing
+
+public extension CoordinateRing {
+  private typealias bridge = margelo.nitro.nitromap.bridge.swift
+
+  /**
+   * Create a new instance of `CoordinateRing`.
+   */
+  init(coordinates: [Coordinate]) {
+    self.init({ () -> bridge.std__vector_Coordinate_ in
+      var __vector = bridge.create_std__vector_Coordinate_(coordinates.count)
+      for __item in coordinates {
+        __vector.push_back(__item)
+      }
+      return __vector
+    }())
+  }
+
+  var coordinates: [Coordinate] {
+    @inline(__always)
+    get {
+      return self.__coordinates.map({ __item in __item })
+    }
+    @inline(__always)
+    set {
+      self.__coordinates = { () -> bridge.std__vector_Coordinate_ in
+        var __vector = bridge.create_std__vector_Coordinate_(newValue.count)
+        for __item in newValue {
+          __vector.push_back(__item)
+        }
+        return __vector
+      }()
+    }
+  }
+}

package/nitrogen/generated/ios/swift/PolygonData.swift

@@ -19,23 +19,17 @@ public extension PolygonData {
   /**
    * Create a new instance of `PolygonData`.
    */
-  init(id: String, coordinates: [Coordinate], holes: [[Coordinate]], fillColor: MarkerColor, strokeColor: MarkerColor, strokeWidth: Double, zIndex: Double, tappable: Bool, accessibilityLabel: String?) {
+  init(id: String, coordinates: [Coordinate], holes: [CoordinateRing], fillColor: MarkerColor, strokeColor: MarkerColor, strokeWidth: Double, zIndex: Double, tappable: Bool, accessibilityLabel: String?) {
     self.init(std.string(id), { () -> bridge.std__vector_Coordinate_ in
       var __vector = bridge.create_std__vector_Coordinate_(coordinates.count)
       for __item in coordinates {
         __vector.push_back(__item)
       }
       return __vector
-    }(), { () -> bridge.std__vector_std__vector_Coordinate__ in
-      var __vector = bridge.create_std__vector_std__vector_Coordinate__(holes.count)
+    }(), { () -> bridge.std__vector_CoordinateRing_ in
+      var __vector = bridge.create_std__vector_CoordinateRing_(holes.count)
       for __item in holes {
-        __vector.push_back({ () -> bridge.std__vector_Coordinate_ in
-          var __vector = bridge.create_std__vector_Coordinate_(__item.count)
-          for __item in __item {
-            __vector.push_back(__item)
-          }
-          return __vector
-        }())
+        __vector.push_back(__item)
       }
       return __vector
     }(), fillColor, strokeColor, strokeWidth, zIndex, tappable, { () -> bridge.std__optional_std__string_ in
@@ -75,23 +69,17 @@ public extension PolygonData {
     }
   }
   
-  var holes: [[Coordinate]] {
+  var holes: [CoordinateRing] {
     @inline(__always)
     get {
-      return self.__holes.map({ __item in __item.map({ __item in __item }) })
+      return self.__holes.map({ __item in __item })
     }
     @inline(__always)
     set {
-      self.__holes = { () -> bridge.std__vector_std__vector_Coordinate__ in
-        var __vector = bridge.create_std__vector_std__vector_Coordinate__(newValue.count)
+      self.__holes = { () -> bridge.std__vector_CoordinateRing_ in
+        var __vector = bridge.create_std__vector_CoordinateRing_(newValue.count)
         for __item in newValue {
-          __vector.push_back({ () -> bridge.std__vector_Coordinate_ in
-            var __vector = bridge.create_std__vector_Coordinate_(__item.count)
-            for __item in __item {
-              __vector.push_back(__item)
-            }
-            return __vector
-          }())
+          __vector.push_back(__item)
         }
         return __vector
       }()

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

@@ -0,0 +1,77 @@
+///
+/// CoordinateRing.hpp
+/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
+/// https://github.com/mrousavy/nitro
+/// Copyright © 2026 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
+#if __has_include(<NitroModules/JSIHelpers.hpp>)
+#include <NitroModules/JSIHelpers.hpp>
+#else
+#error NitroModules cannot be found! Are you sure you installed NitroModules properly?
+#endif
+
+// Forward declaration of `Coordinate` to properly resolve imports.
+namespace margelo::nitro::nitromap { struct Coordinate; }
+
+#include "Coordinate.hpp"
+#include <vector>
+
+namespace margelo::nitro::nitromap {
+
+  /**
+   * A struct which can be represented as a JavaScript object (CoordinateRing).
+   */
+  struct CoordinateRing {
+  public:
+    std::vector<Coordinate> coordinates     SWIFT_PRIVATE;
+
+  public:
+    CoordinateRing() = default;
+    explicit CoordinateRing(std::vector<Coordinate> coordinates): coordinates(coordinates) {}
+  };
+
+} // namespace margelo::nitro::nitromap
+
+namespace margelo::nitro {
+
+  // C++ CoordinateRing <> JS CoordinateRing (object)
+  template <>
+  struct JSIConverter<margelo::nitro::nitromap::CoordinateRing> final {
+    static inline margelo::nitro::nitromap::CoordinateRing fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
+      jsi::Object obj = arg.asObject(runtime);
+      return margelo::nitro::nitromap::CoordinateRing(
+        JSIConverter<std::vector<margelo::nitro::nitromap::Coordinate>>::fromJSI(runtime, obj.getProperty(runtime, "coordinates"))
+      );
+    }
+    static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::nitro::nitromap::CoordinateRing& arg) {
+      jsi::Object obj(runtime);
+      obj.setProperty(runtime, "coordinates", JSIConverter<std::vector<margelo::nitro::nitromap::Coordinate>>::toJSI(runtime, arg.coordinates));
+      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 (!nitro::isPlainObject(runtime, obj)) {
+        return false;
+      }
+      if (!JSIConverter<std::vector<margelo::nitro::nitromap::Coordinate>>::canConvert(runtime, obj.getProperty(runtime, "coordinates"))) return false;
+      return true;
+    }
+  };
+
+} // namespace margelo::nitro

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

@@ -25,12 +25,15 @@
 
 // Forward declaration of `Coordinate` to properly resolve imports.
 namespace margelo::nitro::nitromap { struct Coordinate; }
+// Forward declaration of `CoordinateRing` to properly resolve imports.
+namespace margelo::nitro::nitromap { struct CoordinateRing; }
 // Forward declaration of `MarkerColor` to properly resolve imports.
 namespace margelo::nitro::nitromap { struct MarkerColor; }
 
 #include <string>
 #include "Coordinate.hpp"
 #include <vector>
+#include "CoordinateRing.hpp"
 #include "MarkerColor.hpp"
 #include <optional>
 
@@ -43,7 +46,7 @@ namespace margelo::nitro::nitromap {
   public:
     std::string id     SWIFT_PRIVATE;
     std::vector<Coordinate> coordinates     SWIFT_PRIVATE;
-    std::vector<std::vector<Coordinate>> holes     SWIFT_PRIVATE;
+    std::vector<CoordinateRing> holes     SWIFT_PRIVATE;
     MarkerColor fillColor     SWIFT_PRIVATE;
     MarkerColor strokeColor     SWIFT_PRIVATE;
     double strokeWidth     SWIFT_PRIVATE;
@@ -53,7 +56,7 @@ namespace margelo::nitro::nitromap {
 
   public:
     PolygonData() = default;
-    explicit PolygonData(std::string id, std::vector<Coordinate> coordinates, std::vector<std::vector<Coordinate>> holes, MarkerColor fillColor, MarkerColor strokeColor, double strokeWidth, double zIndex, bool tappable, std::optional<std::string> accessibilityLabel): id(id), coordinates(coordinates), holes(holes), fillColor(fillColor), strokeColor(strokeColor), strokeWidth(strokeWidth), zIndex(zIndex), tappable(tappable), accessibilityLabel(accessibilityLabel) {}
+    explicit PolygonData(std::string id, std::vector<Coordinate> coordinates, std::vector<CoordinateRing> holes, MarkerColor fillColor, MarkerColor strokeColor, double strokeWidth, double zIndex, bool tappable, std::optional<std::string> accessibilityLabel): id(id), coordinates(coordinates), holes(holes), fillColor(fillColor), strokeColor(strokeColor), strokeWidth(strokeWidth), zIndex(zIndex), tappable(tappable), accessibilityLabel(accessibilityLabel) {}
   };
 
 } // namespace margelo::nitro::nitromap
@@ -68,7 +71,7 @@ namespace margelo::nitro {
       return margelo::nitro::nitromap::PolygonData(
         JSIConverter<std::string>::fromJSI(runtime, obj.getProperty(runtime, "id")),
         JSIConverter<std::vector<margelo::nitro::nitromap::Coordinate>>::fromJSI(runtime, obj.getProperty(runtime, "coordinates")),
-        JSIConverter<std::vector<std::vector<margelo::nitro::nitromap::Coordinate>>>::fromJSI(runtime, obj.getProperty(runtime, "holes")),
+        JSIConverter<std::vector<margelo::nitro::nitromap::CoordinateRing>>::fromJSI(runtime, obj.getProperty(runtime, "holes")),
         JSIConverter<margelo::nitro::nitromap::MarkerColor>::fromJSI(runtime, obj.getProperty(runtime, "fillColor")),
         JSIConverter<margelo::nitro::nitromap::MarkerColor>::fromJSI(runtime, obj.getProperty(runtime, "strokeColor")),
         JSIConverter<double>::fromJSI(runtime, obj.getProperty(runtime, "strokeWidth")),
@@ -81,7 +84,7 @@ namespace margelo::nitro {
       jsi::Object obj(runtime);
       obj.setProperty(runtime, "id", JSIConverter<std::string>::toJSI(runtime, arg.id));
       obj.setProperty(runtime, "coordinates", JSIConverter<std::vector<margelo::nitro::nitromap::Coordinate>>::toJSI(runtime, arg.coordinates));
-      obj.setProperty(runtime, "holes", JSIConverter<std::vector<std::vector<margelo::nitro::nitromap::Coordinate>>>::toJSI(runtime, arg.holes));
+      obj.setProperty(runtime, "holes", JSIConverter<std::vector<margelo::nitro::nitromap::CoordinateRing>>::toJSI(runtime, arg.holes));
       obj.setProperty(runtime, "fillColor", JSIConverter<margelo::nitro::nitromap::MarkerColor>::toJSI(runtime, arg.fillColor));
       obj.setProperty(runtime, "strokeColor", JSIConverter<margelo::nitro::nitromap::MarkerColor>::toJSI(runtime, arg.strokeColor));
       obj.setProperty(runtime, "strokeWidth", JSIConverter<double>::toJSI(runtime, arg.strokeWidth));
@@ -100,7 +103,7 @@ namespace margelo::nitro {
       }
       if (!JSIConverter<std::string>::canConvert(runtime, obj.getProperty(runtime, "id"))) return false;
       if (!JSIConverter<std::vector<margelo::nitro::nitromap::Coordinate>>::canConvert(runtime, obj.getProperty(runtime, "coordinates"))) return false;
-      if (!JSIConverter<std::vector<std::vector<margelo::nitro::nitromap::Coordinate>>>::canConvert(runtime, obj.getProperty(runtime, "holes"))) return false;
+      if (!JSIConverter<std::vector<margelo::nitro::nitromap::CoordinateRing>>::canConvert(runtime, obj.getProperty(runtime, "holes"))) return false;
       if (!JSIConverter<margelo::nitro::nitromap::MarkerColor>::canConvert(runtime, obj.getProperty(runtime, "fillColor"))) return false;
       if (!JSIConverter<margelo::nitro::nitromap::MarkerColor>::canConvert(runtime, obj.getProperty(runtime, "strokeColor"))) return false;
       if (!JSIConverter<double>::canConvert(runtime, obj.getProperty(runtime, "strokeWidth"))) return false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maydon_tech/react-native-nitro-maps",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "A high-performance React Native map library powered by Nitro Modules with support for Apple Maps, Google Maps, and Yandex Maps. Features native clustering, custom markers, and seamless cross-platform integration.",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",

package/src/components/NitroPolygon.tsx

@@ -196,7 +196,7 @@ export const NitroPolygon = memo(function NitroPolygon({
     (): PolygonData => ({
       id: polygonId,
       coordinates,
-      holes,
+      holes: holes.map((ring) => ({ coordinates: ring })),
       fillColor: parseColor(fillColor) ?? defaultFillColor,
       strokeColor: parseColor(strokeColor) ?? defaultStrokeColor,
       strokeWidth,

package/src/index.tsx

@@ -51,7 +51,12 @@ export type {
   MarkerPressEvent,
 } from './types/marker';
 
-export type { PolylineData, PolygonData, CircleData } from './types/overlay';
+export type {
+  CoordinateRing,
+  PolylineData,
+  PolygonData,
+  CircleData,
+} from './types/overlay';
 
 export type {
   GoogleMapTheme,

package/src/types/overlay.ts

@@ -1,6 +1,16 @@
 import type { Coordinate } from './map';
 import type { MarkerColor } from './marker';
 
+/**
+ * Wrapper struct for an array of coordinates.
+ * Used to avoid nested arrays (Coordinate[][]) which trigger a Nitrogen codegen bug
+ * where variable names collide in the generated C++ JNI bridge code.
+ */
+export type CoordinateRing = {
+  /** Array of coordinates forming a ring (e.g., a polygon hole boundary) */
+  coordinates: Coordinate[];
+};
+
 /**
  * Data structure for a polyline overlay on the map.
  * Represents a line connecting multiple geographic points.
@@ -35,8 +45,8 @@ export type PolygonData = {
   id: string;
   /** Array of geographic coordinates that form the polygon boundary */
   coordinates: Coordinate[];
-  /** Optional array of holes — each hole is an array of coordinates cut out from the fill */
-  holes: Coordinate[][];
+  /** Array of holes — each hole is a CoordinateRing cut out from the fill */
+  holes: CoordinateRing[];
   /** Fill color as RGBA */
   fillColor: MarkerColor;
   /** Stroke color as RGBA */