@maydon_tech/react-native-nitro-maps 0.1.4 → 0.2.1

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

@@ -71,10 +71,16 @@ namespace margelo::nitro::nitromap {
       jni::local_ref<JPoint> anchor = this->getFieldValue(fieldAnchor);
       static const auto fieldConfig = clazz->getField<JMarkerConfig>("config");
       jni::local_ref<JMarkerConfig> config = this->getFieldValue(fieldConfig);
+      static const auto fieldAccessibilityLabel = clazz->getField<jni::JString>("accessibilityLabel");
+      jni::local_ref<jni::JString> accessibilityLabel = this->getFieldValue(fieldAccessibilityLabel);
       static const auto fieldClusteringEnabled = clazz->getField<jboolean>("clusteringEnabled");
       jboolean clusteringEnabled = this->getFieldValue(fieldClusteringEnabled);
       static const auto fieldAnimation = clazz->getField<JMarkerAnimation>("animation");
       jni::local_ref<JMarkerAnimation> animation = this->getFieldValue(fieldAnimation);
+      static const auto fieldAnimationDuration = clazz->getField<double>("animationDuration");
+      double animationDuration = this->getFieldValue(fieldAnimationDuration);
+      static const auto fieldAnimateOnReappear = clazz->getField<jboolean>("animateOnReappear");
+      jboolean animateOnReappear = this->getFieldValue(fieldAnimateOnReappear);
       return MarkerData(
         id->toStdString(),
         coordinate->toCpp(),
@@ -86,8 +92,11 @@ namespace margelo::nitro::nitromap {
         zIndex,
         anchor->toCpp(),
         config->toCpp(),
+        accessibilityLabel != nullptr ? std::make_optional(accessibilityLabel->toStdString()) : std::nullopt,
         static_cast<bool>(clusteringEnabled),
-        animation->toCpp()
+        animation->toCpp(),
+        animationDuration,
+        static_cast<bool>(animateOnReappear)
       );
     }
 
@@ -97,7 +106,7 @@ namespace margelo::nitro::nitromap {
      */
     [[maybe_unused]]
     static jni::local_ref<JMarkerData::javaobject> fromCpp(const MarkerData& value) {
-      using JSignature = JMarkerData(jni::alias_ref<jni::JString>, jni::alias_ref<JCoordinate>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jboolean, double, double, double, jni::alias_ref<JPoint>, jni::alias_ref<JMarkerConfig>, jboolean, jni::alias_ref<JMarkerAnimation>);
+      using JSignature = JMarkerData(jni::alias_ref<jni::JString>, jni::alias_ref<JCoordinate>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jboolean, double, double, double, jni::alias_ref<JPoint>, jni::alias_ref<JMarkerConfig>, jni::alias_ref<jni::JString>, jboolean, jni::alias_ref<JMarkerAnimation>, double, jboolean);
       static const auto clazz = javaClassStatic();
       static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
       return create(
@@ -112,8 +121,11 @@ namespace margelo::nitro::nitromap {
         value.zIndex,
         JPoint::fromCpp(value.anchor),
         JMarkerConfig::fromCpp(value.config),
+        value.accessibilityLabel.has_value() ? jni::make_jstring(value.accessibilityLabel.value()) : nullptr,
         value.clusteringEnabled,
-        JMarkerAnimation::fromCpp(value.animation)
+        JMarkerAnimation::fromCpp(value.animation),
+        value.animationDuration,
+        value.animateOnReappear
       );
     }
   };

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

@@ -0,0 +1,133 @@
+///
+/// JPolygonData.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 "PolygonData.hpp"
+
+#include "Coordinate.hpp"
+#include "CoordinateRing.hpp"
+#include "JCoordinate.hpp"
+#include "JCoordinateRing.hpp"
+#include "JMarkerColor.hpp"
+#include "MarkerColor.hpp"
+#include <optional>
+#include <string>
+#include <vector>
+
+namespace margelo::nitro::nitromap {
+
+  using namespace facebook;
+
+  /**
+   * The C++ JNI bridge between the C++ struct "PolygonData" and the the Kotlin data class "PolygonData".
+   */
+  struct JPolygonData final: public jni::JavaClass<JPolygonData> {
+  public:
+    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/nitromap/PolygonData;";
+
+  public:
+    /**
+     * Convert this Java/Kotlin-based struct to the C++ struct PolygonData by copying all values to C++.
+     */
+    [[maybe_unused]]
+    [[nodiscard]]
+    PolygonData toCpp() const {
+      static const auto clazz = javaClassStatic();
+      static const auto fieldId = clazz->getField<jni::JString>("id");
+      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<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");
+      jni::local_ref<JMarkerColor> strokeColor = this->getFieldValue(fieldStrokeColor);
+      static const auto fieldStrokeWidth = clazz->getField<double>("strokeWidth");
+      double strokeWidth = this->getFieldValue(fieldStrokeWidth);
+      static const auto fieldZIndex = clazz->getField<double>("zIndex");
+      double zIndex = this->getFieldValue(fieldZIndex);
+      static const auto fieldTappable = clazz->getField<jboolean>("tappable");
+      jboolean tappable = this->getFieldValue(fieldTappable);
+      static const auto fieldAccessibilityLabel = clazz->getField<jni::JString>("accessibilityLabel");
+      jni::local_ref<jni::JString> accessibilityLabel = this->getFieldValue(fieldAccessibilityLabel);
+      return PolygonData(
+        id->toStdString(),
+        [&]() {
+          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;
+        }(),
+        [&]() {
+          size_t __size = holes->size();
+          std::vector<CoordinateRing> __vector;
+          __vector.reserve(__size);
+          for (size_t __i = 0; __i < __size; __i++) {
+            auto __element = holes->getElement(__i);
+            __vector.push_back(__element->toCpp());
+          }
+          return __vector;
+        }(),
+        fillColor->toCpp(),
+        strokeColor->toCpp(),
+        strokeWidth,
+        zIndex,
+        static_cast<bool>(tappable),
+        accessibilityLabel != nullptr ? std::make_optional(accessibilityLabel->toStdString()) : std::nullopt
+      );
+    }
+
+  public:
+    /**
+     * Create a Java/Kotlin-based struct by copying all values from the given C++ struct to Java.
+     */
+    [[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<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(
+        clazz,
+        jni::make_jstring(value.id),
+        [&]() {
+          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;
+        }(),
+        [&]() {
+          size_t __size = value.holes.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 = JCoordinateRing::fromCpp(__element);
+            __array->setElement(__i, *__elementJni);
+          }
+          return __array;
+        }(),
+        JMarkerColor::fromCpp(value.fillColor),
+        JMarkerColor::fromCpp(value.strokeColor),
+        value.strokeWidth,
+        value.zIndex,
+        value.tappable,
+        value.accessibilityLabel.has_value() ? jni::make_jstring(value.accessibilityLabel.value()) : nullptr
+      );
+    }
+  };
+
+} // namespace margelo::nitro::nitromap

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

@@ -0,0 +1,113 @@
+///
+/// JPolylineData.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 "PolylineData.hpp"
+
+#include "Coordinate.hpp"
+#include "JCoordinate.hpp"
+#include "JMarkerColor.hpp"
+#include "MarkerColor.hpp"
+#include <optional>
+#include <string>
+#include <vector>
+
+namespace margelo::nitro::nitromap {
+
+  using namespace facebook;
+
+  /**
+   * The C++ JNI bridge between the C++ struct "PolylineData" and the the Kotlin data class "PolylineData".
+   */
+  struct JPolylineData final: public jni::JavaClass<JPolylineData> {
+  public:
+    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/nitromap/PolylineData;";
+
+  public:
+    /**
+     * Convert this Java/Kotlin-based struct to the C++ struct PolylineData by copying all values to C++.
+     */
+    [[maybe_unused]]
+    [[nodiscard]]
+    PolylineData toCpp() const {
+      static const auto clazz = javaClassStatic();
+      static const auto fieldId = clazz->getField<jni::JString>("id");
+      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 fieldStrokeColor = clazz->getField<JMarkerColor>("strokeColor");
+      jni::local_ref<JMarkerColor> strokeColor = this->getFieldValue(fieldStrokeColor);
+      static const auto fieldStrokeWidth = clazz->getField<double>("strokeWidth");
+      double strokeWidth = this->getFieldValue(fieldStrokeWidth);
+      static const auto fieldGeodesic = clazz->getField<jboolean>("geodesic");
+      jboolean geodesic = this->getFieldValue(fieldGeodesic);
+      static const auto fieldDashed = clazz->getField<jboolean>("dashed");
+      jboolean dashed = this->getFieldValue(fieldDashed);
+      static const auto fieldZIndex = clazz->getField<double>("zIndex");
+      double zIndex = this->getFieldValue(fieldZIndex);
+      static const auto fieldTappable = clazz->getField<jboolean>("tappable");
+      jboolean tappable = this->getFieldValue(fieldTappable);
+      static const auto fieldAccessibilityLabel = clazz->getField<jni::JString>("accessibilityLabel");
+      jni::local_ref<jni::JString> accessibilityLabel = this->getFieldValue(fieldAccessibilityLabel);
+      return PolylineData(
+        id->toStdString(),
+        [&]() {
+          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;
+        }(),
+        strokeColor->toCpp(),
+        strokeWidth,
+        static_cast<bool>(geodesic),
+        static_cast<bool>(dashed),
+        zIndex,
+        static_cast<bool>(tappable),
+        accessibilityLabel != nullptr ? std::make_optional(accessibilityLabel->toStdString()) : std::nullopt
+      );
+    }
+
+  public:
+    /**
+     * Create a Java/Kotlin-based struct by copying all values from the given C++ struct to Java.
+     */
+    [[maybe_unused]]
+    static jni::local_ref<JPolylineData::javaobject> fromCpp(const PolylineData& value) {
+      using JSignature = JPolylineData(jni::alias_ref<jni::JString>, jni::alias_ref<jni::JArrayClass<JCoordinate>>, jni::alias_ref<JMarkerColor>, double, jboolean, jboolean, double, jboolean, jni::alias_ref<jni::JString>);
+      static const auto clazz = javaClassStatic();
+      static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
+      return create(
+        clazz,
+        jni::make_jstring(value.id),
+        [&]() {
+          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;
+        }(),
+        JMarkerColor::fromCpp(value.strokeColor),
+        value.strokeWidth,
+        value.geodesic,
+        value.dashed,
+        value.zIndex,
+        value.tappable,
+        value.accessibilityLabel.has_value() ? jni::make_jstring(value.accessibilityLabel.value()) : nullptr
+      );
+    }
+  };
+
+} // namespace margelo::nitro::nitromap

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

@@ -0,0 +1,70 @@
+///
+/// JUserLocationChangeEvent.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 "UserLocationChangeEvent.hpp"
+
+#include "Coordinate.hpp"
+#include "JCoordinate.hpp"
+
+namespace margelo::nitro::nitromap {
+
+  using namespace facebook;
+
+  /**
+   * The C++ JNI bridge between the C++ struct "UserLocationChangeEvent" and the the Kotlin data class "UserLocationChangeEvent".
+   */
+  struct JUserLocationChangeEvent final: public jni::JavaClass<JUserLocationChangeEvent> {
+  public:
+    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/nitromap/UserLocationChangeEvent;";
+
+  public:
+    /**
+     * Convert this Java/Kotlin-based struct to the C++ struct UserLocationChangeEvent by copying all values to C++.
+     */
+    [[maybe_unused]]
+    [[nodiscard]]
+    UserLocationChangeEvent toCpp() const {
+      static const auto clazz = javaClassStatic();
+      static const auto fieldCoordinate = clazz->getField<JCoordinate>("coordinate");
+      jni::local_ref<JCoordinate> coordinate = this->getFieldValue(fieldCoordinate);
+      static const auto fieldAccuracy = clazz->getField<double>("accuracy");
+      double accuracy = this->getFieldValue(fieldAccuracy);
+      static const auto fieldHeading = clazz->getField<double>("heading");
+      double heading = this->getFieldValue(fieldHeading);
+      static const auto fieldSpeed = clazz->getField<double>("speed");
+      double speed = this->getFieldValue(fieldSpeed);
+      return UserLocationChangeEvent(
+        coordinate->toCpp(),
+        accuracy,
+        heading,
+        speed
+      );
+    }
+
+  public:
+    /**
+     * Create a Java/Kotlin-based struct by copying all values from the given C++ struct to Java.
+     */
+    [[maybe_unused]]
+    static jni::local_ref<JUserLocationChangeEvent::javaobject> fromCpp(const UserLocationChangeEvent& value) {
+      using JSignature = JUserLocationChangeEvent(jni::alias_ref<JCoordinate>, double, double, double);
+      static const auto clazz = javaClassStatic();
+      static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
+      return create(
+        clazz,
+        JCoordinate::fromCpp(value.coordinate),
+        value.accuracy,
+        value.heading,
+        value.speed
+      );
+    }
+  };
+
+} // namespace margelo::nitro::nitromap

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

@@ -0,0 +1,62 @@
+///
+/// JUserTrackingMode.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 "UserTrackingMode.hpp"
+
+namespace margelo::nitro::nitromap {
+
+  using namespace facebook;
+
+  /**
+   * The C++ JNI bridge between the C++ enum "UserTrackingMode" and the the Kotlin enum "UserTrackingMode".
+   */
+  struct JUserTrackingMode final: public jni::JavaClass<JUserTrackingMode> {
+  public:
+    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/nitromap/UserTrackingMode;";
+
+  public:
+    /**
+     * Convert this Java/Kotlin-based enum to the C++ enum UserTrackingMode.
+     */
+    [[maybe_unused]]
+    [[nodiscard]]
+    UserTrackingMode toCpp() const {
+      static const auto clazz = javaClassStatic();
+      static const auto fieldOrdinal = clazz->getField<int>("value");
+      int ordinal = this->getFieldValue(fieldOrdinal);
+      return static_cast<UserTrackingMode>(ordinal);
+    }
+
+  public:
+    /**
+     * Create a Java/Kotlin-based enum with the given C++ enum's value.
+     */
+    [[maybe_unused]]
+    static jni::alias_ref<JUserTrackingMode> fromCpp(UserTrackingMode value) {
+      static const auto clazz = javaClassStatic();
+      static const auto fieldNONE = clazz->getStaticField<JUserTrackingMode>("NONE");
+      static const auto fieldFOLLOW = clazz->getStaticField<JUserTrackingMode>("FOLLOW");
+      static const auto fieldFOLLOWWITHHEADING = clazz->getStaticField<JUserTrackingMode>("FOLLOWWITHHEADING");
+      
+      switch (value) {
+        case UserTrackingMode::NONE:
+          return clazz->getStaticFieldValue(fieldNONE);
+        case UserTrackingMode::FOLLOW:
+          return clazz->getStaticFieldValue(fieldFOLLOW);
+        case UserTrackingMode::FOLLOWWITHHEADING:
+          return clazz->getStaticFieldValue(fieldFOLLOWWITHHEADING);
+        default:
+          std::string stringValue = std::to_string(static_cast<int>(value));
+          throw std::invalid_argument("Invalid enum value (" + stringValue + "!");
+      }
+    }
+  };
+
+} // namespace margelo::nitro::nitromap

package/nitrogen/generated/android/c++/views/JHybridNitroMapStateUpdater.cpp

@@ -44,6 +44,10 @@ void JHybridNitroMapStateUpdater::updateViewProps(jni::alias_ref<jni::JClass> /*
     view->setInitialRegion(props.initialRegion.value);
     // TODO: Set isDirty = false
   }
+  if (props.region.isDirty) {
+    view->setRegion(props.region.value);
+    // TODO: Set isDirty = false
+  }
   if (props.showsUserLocation.isDirty) {
     view->setShowsUserLocation(props.showsUserLocation.value);
     // TODO: Set isDirty = false
@@ -72,18 +76,54 @@ void JHybridNitroMapStateUpdater::updateViewProps(jni::alias_ref<jni::JClass> /*
     view->setCustomMapStyle(props.customMapStyle.value);
     // TODO: Set isDirty = false
   }
-  if (props.showsMyLocationButton.isDirty) {
-    view->setShowsMyLocationButton(props.showsMyLocationButton.value);
-    // TODO: Set isDirty = false
-  }
   if (props.clusterConfig.isDirty) {
     view->setClusterConfig(props.clusterConfig.value);
     // TODO: Set isDirty = false
   }
+  if (props.mapPadding.isDirty) {
+    view->setMapPadding(props.mapPadding.value);
+    // TODO: Set isDirty = false
+  }
+  if (props.showsTraffic.isDirty) {
+    view->setShowsTraffic(props.showsTraffic.value);
+    // TODO: Set isDirty = false
+  }
+  if (props.showsBuildings.isDirty) {
+    view->setShowsBuildings(props.showsBuildings.value);
+    // TODO: Set isDirty = false
+  }
+  if (props.showsCompass.isDirty) {
+    view->setShowsCompass(props.showsCompass.value);
+    // TODO: Set isDirty = false
+  }
+  if (props.minZoom.isDirty) {
+    view->setMinZoom(props.minZoom.value);
+    // TODO: Set isDirty = false
+  }
+  if (props.maxZoom.isDirty) {
+    view->setMaxZoom(props.maxZoom.value);
+    // TODO: Set isDirty = false
+  }
   if (props.darkMode.isDirty) {
     view->setDarkMode(props.darkMode.value);
     // TODO: Set isDirty = false
   }
+  if (props.userTrackingMode.isDirty) {
+    view->setUserTrackingMode(props.userTrackingMode.value);
+    // TODO: Set isDirty = false
+  }
+  if (props.userLocationImage.isDirty) {
+    view->setUserLocationImage(props.userLocationImage.value);
+    // TODO: Set isDirty = false
+  }
+  if (props.userLocationSize.isDirty) {
+    view->setUserLocationSize(props.userLocationSize.value);
+    // TODO: Set isDirty = false
+  }
+  if (props.userLocationAnchor.isDirty) {
+    view->setUserLocationAnchor(props.userLocationAnchor.value);
+    // TODO: Set isDirty = false
+  }
   if (props.onPress.isDirty) {
     view->setOnPress(props.onPress.value);
     // TODO: Set isDirty = false
@@ -124,10 +164,38 @@ void JHybridNitroMapStateUpdater::updateViewProps(jni::alias_ref<jni::JClass> /*
     view->setOnClusterPress(props.onClusterPress.value);
     // TODO: Set isDirty = false
   }
+  if (props.onPolylinePress.isDirty) {
+    view->setOnPolylinePress(props.onPolylinePress.value);
+    // TODO: Set isDirty = false
+  }
+  if (props.onPolygonPress.isDirty) {
+    view->setOnPolygonPress(props.onPolygonPress.value);
+    // TODO: Set isDirty = false
+  }
+  if (props.onCirclePress.isDirty) {
+    view->setOnCirclePress(props.onCirclePress.value);
+    // TODO: Set isDirty = false
+  }
   if (props.onError.isDirty) {
     view->setOnError(props.onError.value);
     // TODO: Set isDirty = false
   }
+  if (props.onUserLocationChange.isDirty) {
+    view->setOnUserLocationChange(props.onUserLocationChange.value);
+    // TODO: Set isDirty = false
+  }
+  if (props.onUserTrackingModeChange.isDirty) {
+    view->setOnUserTrackingModeChange(props.onUserTrackingModeChange.value);
+    // TODO: Set isDirty = false
+  }
+  if (props.onUserLocationError.isDirty) {
+    view->setOnUserLocationError(props.onUserLocationError.value);
+    // TODO: Set isDirty = false
+  }
+  if (props.onMapIdle.isDirty) {
+    view->setOnMapIdle(props.onMapIdle.value);
+    // TODO: Set isDirty = false
+  }
 
   // Update hybridRef if it changed
   if (props.hybridRef.isDirty) {

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

@@ -0,0 +1,62 @@
+///
+/// CircleData.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 "CircleData".
+ */
+@DoNotStrip
+@Keep
+data class CircleData(
+  @DoNotStrip
+  @Keep
+  val id: String,
+  @DoNotStrip
+  @Keep
+  val center: Coordinate,
+  @DoNotStrip
+  @Keep
+  val radius: Double,
+  @DoNotStrip
+  @Keep
+  val fillColor: MarkerColor,
+  @DoNotStrip
+  @Keep
+  val strokeColor: MarkerColor,
+  @DoNotStrip
+  @Keep
+  val strokeWidth: Double,
+  @DoNotStrip
+  @Keep
+  val zIndex: Double,
+  @DoNotStrip
+  @Keep
+  val tappable: Boolean,
+  @DoNotStrip
+  @Keep
+  val accessibilityLabel: String?
+) {
+  /* primary constructor */
+
+  private companion object {
+    /**
+     * Constructor called from C++
+     */
+    @DoNotStrip
+    @Keep
+    @Suppress("unused")
+    @JvmStatic
+    private fun fromCpp(id: String, center: Coordinate, radius: Double, fillColor: MarkerColor, strokeColor: MarkerColor, strokeWidth: Double, zIndex: Double, tappable: Boolean, accessibilityLabel: String?): CircleData {
+      return CircleData(id, center, radius, fillColor, strokeColor, strokeWidth, zIndex, tappable, accessibilityLabel)
+    }
+  }
+}

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

@@ -49,10 +49,10 @@ data class ClusterConfig(
   val animatesClusters: Boolean?,
   @DoNotStrip
   @Keep
-  val animationDuration: Double?,
+  val animateOnReappear: Boolean?,
   @DoNotStrip
   @Keep
-  val animationStyle: ClusterAnimationStyle?,
+  val animationDuration: Double?,
   @DoNotStrip
   @Keep
   val realtimeClustering: Boolean?,
@@ -73,8 +73,8 @@ data class ClusterConfig(
     @Keep
     @Suppress("unused")
     @JvmStatic
-    private fun fromCpp(enabled: Boolean, strategy: ClusterStrategy?, radius: Double?, minimumClusterSize: Double?, maxZoom: Double?, backgroundColor: Variant_String_MarkerColor?, textColor: Variant_String_MarkerColor?, borderWidth: Double?, borderColor: Variant_String_MarkerColor?, animatesClusters: Boolean?, animationDuration: Double?, animationStyle: ClusterAnimationStyle?, realtimeClustering: Boolean?, renderBuffer: Double?, throttleInterval: Double?): ClusterConfig {
-      return ClusterConfig(enabled, strategy, radius, minimumClusterSize, maxZoom, backgroundColor, textColor, borderWidth, borderColor, animatesClusters, animationDuration, animationStyle, realtimeClustering, renderBuffer, throttleInterval)
+    private fun fromCpp(enabled: Boolean, strategy: ClusterStrategy?, radius: Double?, minimumClusterSize: Double?, maxZoom: Double?, backgroundColor: Variant_String_MarkerColor?, textColor: Variant_String_MarkerColor?, borderWidth: Double?, borderColor: Variant_String_MarkerColor?, animatesClusters: Boolean?, animateOnReappear: Boolean?, animationDuration: Double?, realtimeClustering: Boolean?, renderBuffer: Double?, throttleInterval: Double?): ClusterConfig {
+      return ClusterConfig(enabled, strategy, radius, minimumClusterSize, maxZoom, backgroundColor, textColor, borderWidth, borderColor, animatesClusters, animateOnReappear, animationDuration, realtimeClustering, renderBuffer, throttleInterval)
     }
   }
 }

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)
+    }
+  }
+}