react-native-cesium 1.2.18 → 1.2.20

package/lib/typescript/src/specs/cesium-view.nitro.d.ts

@@ -6,6 +6,11 @@ import type { HybridView, HybridViewProps, HybridViewMethods } from 'react-nativ
 export interface CameraState {
     latitude: number;
     longitude: number;
+    /**
+     * Metres. Mean sea level unless `altitudeDatum` is `"ellipsoid"`, in which
+     * case this is WGS84 ellipsoidal height. `getActualCamera`,
+     * `getDemandCamera`, and `onActualCamera` report altitude in that same unit.
+     */
     altitude: number;
     heading: number;
     pitch: number;
@@ -51,6 +56,16 @@ export interface CesiumViewProps extends HybridViewProps {
     /** 1 = off; 2 or 4 = MSAA when supported. */
     msaaSampleCount: number;
     ionImageryAssetId: number;
+    /**
+     * Vertical datum of public altitude numbers, in both directions.
+     * `"msl"` (default) is metres above mean sea level.
+     * `"ellipsoid"` is WGS84 ellipsoidal height (Android `Location.getAltitude`).
+     * Ellipsoidal heights are converted to mean sea level with EGM96 before the
+     * camera integrator, and converted back on read. Switching this prop does
+     * not move the camera: later reads use the new unit, and the next
+     * `setAltitude`, `setPosition`, or `teleport` is interpreted in that unit.
+     */
+    altitudeDatum?: string;
     /** RAM budget for live tileset, in mebibytes. Default 256. */
     maximumCachedMiB?: number;
     /** Pre-load ancestor tiles around the visible set (smoother panning, more loads). Default true. */
@@ -84,12 +99,13 @@ export interface CesiumViewProps extends HybridViewProps {
      */
     taskProcessorThreads?: number;
     /**
-     * Minimum clearance above the loaded terrain surface, in metres (added on top of the
-     * terrain MSL height at the camera position). Default 0 (no constraint).
-     * Set to e.g. 2 to prevent the camera from going underground.
-     * The clamp runs only after terrain tiles have been sampled; until then the demand
-     * altitude is used as-is. The demand altitude is not modified — only the rendered
-     * (actual) camera may be raised to meet this minimum.
+     * Clearance above the rendered terrain surface, in metres, added on top of the
+     * terrain height at the camera position. The floor is always on. 0 means the
+     * camera may sit on the surface and may not go below it.
+     * Until a terrain tile has been sampled, the camera is held at or above the
+     * WGS84 ellipsoid. The demand altitude is not modified — only the rendered
+     * (actual) camera is held to this minimum, and it follows the surface down
+     * when the demand is at or below the floor.
      */
     minAltitudeAboveTerrain?: number;
     /** Maximum yaw rate (degrees per second). 0 = uncapped. */
@@ -131,9 +147,17 @@ export interface CesiumViewMethods extends HybridViewMethods {
      * for GPS or scripted position updates. Latitude is clamped to ±90 by the
      * integrator; longitude is continuous (no wrap normalisation) so the
      * shortest-arc residual maths stays correct across the antimeridian.
+     * When `altitudeDatum` is `"ellipsoid"`, a horizontal move keeps the
+     * demanded ellipsoidal height and recomputes mean sea level at the new
+     * point. Mean-sea-level mode leaves altitude unchanged.
      */
     setPosition(latitude: number, longitude: number): void;
-    /** New altitude demand (metres above mean sea level). */
+    /**
+     * New altitude demand, in metres. Interpreted as mean sea level unless
+     * `altitudeDatum` is `"ellipsoid"`, in which case it is WGS84 height and
+     * converted to MSL before the integrator. A later read reports the same
+     * sample back in this unit.
+     */
     setAltitude(altitudeMeters: number): void;
     /** New heading demand (degrees, 0 = north, increasing clockwise). */
     setHeading(headingDeg: number): void;
@@ -162,13 +186,14 @@ export interface CesiumViewMethods extends HybridViewMethods {
      * Most recent camera that was rendered (post-integration). This is what
      * the user is currently looking at and is what a HUD overlay should
      * mirror. Differs from `getDemandCamera()` while a glide is in progress
-     * or when the terrain-floor clamp has raised the altitude.
+     * or when the terrain-floor clamp has raised the altitude. Altitude is in
+     * the unit selected by `altitudeDatum`.
      */
     getActualCamera(): Promise<CameraState>;
     /**
      * What the consumer last asked for (per-DoF demand). Useful for
      * diagnostics or for showing the requested camera alongside the rendered
-     * one.
+     * one. Altitude is in the unit selected by `altitudeDatum`.
      */
     getDemandCamera(): Promise<CameraState>;
     /** Current view-correction quaternion (smoothed toward the latest demand). */

package/lib/typescript/src/specs/cesium-view.nitro.d.ts.map

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

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

@@ -17,7 +17,7 @@ namespace margelo::nitro::reactnativecesium {
   using namespace facebook;
 
   /**
-   * The C++ JNI bridge between the C++ struct "CameraState" and the the Kotlin data class "CameraState".
+   * The C++ JNI bridge between the C++ struct "CameraState" and the Kotlin data class "CameraState".
    */
   struct JCameraState final: public jni::JavaClass<JCameraState> {
   public:

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

@@ -17,7 +17,7 @@ namespace margelo::nitro::reactnativecesium {
   using namespace facebook;
 
   /**
-   * The C++ JNI bridge between the C++ struct "CesiumMetrics" and the the Kotlin data class "CesiumMetrics".
+   * The C++ JNI bridge between the C++ struct "CesiumMetrics" and the Kotlin data class "CesiumMetrics".
    */
   struct JCesiumMetrics final: public jni::JavaClass<JCesiumMetrics> {
   public:

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

@@ -140,6 +140,15 @@ namespace margelo::nitro::reactnativecesium {
     static const auto method = _javaPart->javaClassStatic()->getMethod<void(double /* ionImageryAssetId */)>("setIonImageryAssetId");
     method(_javaPart, ionImageryAssetId);
   }
+  std::optional<std::string> JHybridCesiumViewSpec::getAltitudeDatum() {
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<jni::JString>()>("getAltitudeDatum");
+    auto __result = method(_javaPart);
+    return __result != nullptr ? std::make_optional(__result->toStdString()) : std::nullopt;
+  }
+  void JHybridCesiumViewSpec::setAltitudeDatum(const std::optional<std::string>& altitudeDatum) {
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<jni::JString> /* altitudeDatum */)>("setAltitudeDatum");
+    method(_javaPart, altitudeDatum.has_value() ? jni::make_jstring(altitudeDatum.value()) : nullptr);
+  }
   std::optional<double> JHybridCesiumViewSpec::getMaximumCachedMiB() {
     static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<jni::JDouble>()>("getMaximumCachedMiB");
     auto __result = method(_javaPart);

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

@@ -68,6 +68,8 @@ namespace margelo::nitro::reactnativecesium {
     void setMsaaSampleCount(double msaaSampleCount) override;
     double getIonImageryAssetId() override;
     void setIonImageryAssetId(double ionImageryAssetId) override;
+    std::optional<std::string> getAltitudeDatum() override;
+    void setAltitudeDatum(const std::optional<std::string>& altitudeDatum) override;
     std::optional<double> getMaximumCachedMiB() override;
     void setMaximumCachedMiB(std::optional<double> maximumCachedMiB) override;
     std::optional<bool> getPreloadAncestors() override;

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

@@ -17,7 +17,7 @@ namespace margelo::nitro::reactnativecesium {
   using namespace facebook;
 
   /**
-   * The C++ JNI bridge between the C++ struct "Quaternion" and the the Kotlin data class "Quaternion".
+   * The C++ JNI bridge between the C++ struct "Quaternion" and the Kotlin data class "Quaternion".
    */
   struct JQuaternion final: public jni::JavaClass<JQuaternion> {
   public:

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

@@ -15,153 +15,204 @@ namespace margelo::nitro::reactnativecesium::views {
 using namespace facebook;
 using ConcreteStateData = react::ConcreteState<HybridCesiumViewState>;
 
-void JHybridCesiumViewStateUpdater::updateViewProps(jni::alias_ref<jni::JClass> /* class */,
-                                           jni::alias_ref<JHybridCesiumViewSpec::JavaPart> javaView,
-                                           jni::alias_ref<JStateWrapper::javaobject> stateWrapperInterface) {
-  std::shared_ptr<JHybridCesiumViewSpec> hybridView = javaView->getJHybridCesiumViewSpec();
-
+std::shared_ptr<const HybridCesiumViewProps> JHybridCesiumViewStateUpdater::getPropsFromStateWrapper(
+    jni::alias_ref<JStateWrapper::javaobject> stateWrapper) {
+  if (stateWrapper.get() == nullptr) {
+    return nullptr;
+  }
   // Get concrete StateWrapperImpl from passed StateWrapper interface object
-  jobject rawStateWrapper = stateWrapperInterface.get();
-  if (!stateWrapperInterface->isInstanceOf(react::StateWrapperImpl::javaClassStatic())) [[unlikely]] {
-      throw std::runtime_error("StateWrapper is not a StateWrapperImpl");
+  jobject rawStateWrapper = stateWrapper.get();
+  if (!stateWrapper->isInstanceOf(react::StateWrapperImpl::javaClassStatic())) [[unlikely]] {
+    throw std::runtime_error("StateWrapper is not a StateWrapperImpl");
+  }
+  auto stateWrapperImpl = jni::alias_ref<react::StateWrapperImpl::javaobject>{
+    static_cast<react::StateWrapperImpl::javaobject>(rawStateWrapper)
+  };
+  std::shared_ptr<const react::State> state = stateWrapperImpl->cthis()->getState();
+  if (state == nullptr) {
+    return nullptr;
   }
-  auto stateWrapper = jni::alias_ref<react::StateWrapperImpl::javaobject>{
-            static_cast<react::StateWrapperImpl::javaobject>(rawStateWrapper)};
-  std::shared_ptr<const react::State> state = stateWrapper->cthis()->getState();
   auto concreteState = std::static_pointer_cast<const ConcreteStateData>(state);
   const HybridCesiumViewState& data = concreteState->getData();
-  const std::shared_ptr<HybridCesiumViewProps>& props = data.getProps();
+  const std::shared_ptr<const HybridCesiumViewProps>& props = data.getProps();
   if (props == nullptr) [[unlikely]] {
-    // Props aren't set yet!
     throw std::runtime_error("HybridCesiumViewState's data doesn't contain any props!");
   }
+  return props;
+}
 
-  // Update all props if they are dirty
-  if (props->ionAccessToken.isDirty) {
-    hybridView->setIonAccessToken(props->ionAccessToken.value);
-    props->ionAccessToken.isDirty = false;
-  }
-  if (props->ionAssetId.isDirty) {
-    hybridView->setIonAssetId(props->ionAssetId.value);
-    props->ionAssetId.isDirty = false;
-  }
-  if (props->initialCamera.isDirty) {
-    hybridView->setInitialCamera(props->initialCamera.value);
-    props->initialCamera.isDirty = false;
-  }
-  if (props->pauseRendering.isDirty) {
-    hybridView->setPauseRendering(props->pauseRendering.value);
-    props->pauseRendering.isDirty = false;
-  }
-  if (props->maximumScreenSpaceError.isDirty) {
-    hybridView->setMaximumScreenSpaceError(props->maximumScreenSpaceError.value);
-    props->maximumScreenSpaceError.isDirty = false;
-  }
-  if (props->maximumSimultaneousTileLoads.isDirty) {
-    hybridView->setMaximumSimultaneousTileLoads(props->maximumSimultaneousTileLoads.value);
-    props->maximumSimultaneousTileLoads.isDirty = false;
-  }
-  if (props->loadingDescendantLimit.isDirty) {
-    hybridView->setLoadingDescendantLimit(props->loadingDescendantLimit.value);
-    props->loadingDescendantLimit.isDirty = false;
-  }
-  if (props->msaaSampleCount.isDirty) {
-    hybridView->setMsaaSampleCount(props->msaaSampleCount.value);
-    props->msaaSampleCount.isDirty = false;
-  }
-  if (props->ionImageryAssetId.isDirty) {
-    hybridView->setIonImageryAssetId(props->ionImageryAssetId.value);
-    props->ionImageryAssetId.isDirty = false;
-  }
-  if (props->maximumCachedMiB.isDirty) {
-    hybridView->setMaximumCachedMiB(props->maximumCachedMiB.value);
-    props->maximumCachedMiB.isDirty = false;
-  }
-  if (props->preloadAncestors.isDirty) {
-    hybridView->setPreloadAncestors(props->preloadAncestors.value);
-    props->preloadAncestors.isDirty = false;
-  }
-  if (props->preloadSiblings.isDirty) {
-    hybridView->setPreloadSiblings(props->preloadSiblings.value);
-    props->preloadSiblings.isDirty = false;
-  }
-  if (props->forbidHoles.isDirty) {
-    hybridView->setForbidHoles(props->forbidHoles.value);
-    props->forbidHoles.isDirty = false;
-  }
-  if (props->enableWaterMask.isDirty) {
-    hybridView->setEnableWaterMask(props->enableWaterMask.value);
-    props->enableWaterMask.isDirty = false;
-  }
-  if (props->enableFogCulling.isDirty) {
-    hybridView->setEnableFogCulling(props->enableFogCulling.value);
-    props->enableFogCulling.isDirty = false;
-  }
-  if (props->enforceCulledScreenSpaceError.isDirty) {
-    hybridView->setEnforceCulledScreenSpaceError(props->enforceCulledScreenSpaceError.value);
-    props->enforceCulledScreenSpaceError.isDirty = false;
-  }
-  if (props->culledScreenSpaceError.isDirty) {
-    hybridView->setCulledScreenSpaceError(props->culledScreenSpaceError.value);
-    props->culledScreenSpaceError.isDirty = false;
-  }
-  if (props->enableLodTransitionPeriod.isDirty) {
-    hybridView->setEnableLodTransitionPeriod(props->enableLodTransitionPeriod.value);
-    props->enableLodTransitionPeriod.isDirty = false;
-  }
-  if (props->lodTransitionLength.isDirty) {
-    hybridView->setLodTransitionLength(props->lodTransitionLength.value);
-    props->lodTransitionLength.isDirty = false;
-  }
-  if (props->sqliteCacheMaxRows.isDirty) {
-    hybridView->setSqliteCacheMaxRows(props->sqliteCacheMaxRows.value);
-    props->sqliteCacheMaxRows.isDirty = false;
-  }
-  if (props->taskProcessorThreads.isDirty) {
-    hybridView->setTaskProcessorThreads(props->taskProcessorThreads.value);
-    props->taskProcessorThreads.isDirty = false;
-  }
-  if (props->minAltitudeAboveTerrain.isDirty) {
-    hybridView->setMinAltitudeAboveTerrain(props->minAltitudeAboveTerrain.value);
-    props->minAltitudeAboveTerrain.isDirty = false;
-  }
-  if (props->maxYawRateDegSec.isDirty) {
-    hybridView->setMaxYawRateDegSec(props->maxYawRateDegSec.value);
-    props->maxYawRateDegSec.isDirty = false;
-  }
-  if (props->maxPitchRateDegSec.isDirty) {
-    hybridView->setMaxPitchRateDegSec(props->maxPitchRateDegSec.value);
-    props->maxPitchRateDegSec.isDirty = false;
-  }
-  if (props->maxRollRateDegSec.isDirty) {
-    hybridView->setMaxRollRateDegSec(props->maxRollRateDegSec.value);
-    props->maxRollRateDegSec.isDirty = false;
-  }
-  if (props->maxClimbRateMps.isDirty) {
-    hybridView->setMaxClimbRateMps(props->maxClimbRateMps.value);
-    props->maxClimbRateMps.isDirty = false;
-  }
-  if (props->maxGroundSpeedMps.isDirty) {
-    hybridView->setMaxGroundSpeedMps(props->maxGroundSpeedMps.value);
-    props->maxGroundSpeedMps.isDirty = false;
-  }
-  if (props->onMetrics.isDirty) {
-    hybridView->setOnMetrics(props->onMetrics.value);
-    props->onMetrics.isDirty = false;
+void JHybridCesiumViewStateUpdater::updateViewProps(jni::alias_ref<jni::JClass> /* class */,
+                                           jni::alias_ref<JHybridCesiumViewSpec::JavaPart> javaView,
+                                           jni::alias_ref<JStateWrapper::javaobject> newState,
+                                           jni::alias_ref<JStateWrapper::javaobject> oldState) {
+  std::shared_ptr<JHybridCesiumViewSpec> hybridView = javaView->getJHybridCesiumViewSpec();
+  std::shared_ptr<const HybridCesiumViewProps> newProps = getPropsFromStateWrapper(newState);
+  std::shared_ptr<const HybridCesiumViewProps> oldProps = getPropsFromStateWrapper(oldState);
+  if (newProps == nullptr) [[unlikely]] {
+    throw std::runtime_error("Current StateWrapper doesn't contain any props!");
   }
-  if (props->onActualCamera.isDirty) {
-    hybridView->setOnActualCamera(props->onActualCamera.value);
-    props->onActualCamera.isDirty = false;
+
+  // Update only props that differ from the previous State snapshot.
+  if (oldProps == nullptr
+        ? newProps->ionAccessToken.isProvided()
+        : !newProps->ionAccessToken.hasSameValue(oldProps->ionAccessToken)) {
+    hybridView->setIonAccessToken(newProps->ionAccessToken.get());
+  }
+  if (oldProps == nullptr
+        ? newProps->ionAssetId.isProvided()
+        : !newProps->ionAssetId.hasSameValue(oldProps->ionAssetId)) {
+    hybridView->setIonAssetId(newProps->ionAssetId.get());
+  }
+  if (oldProps == nullptr
+        ? newProps->initialCamera.isProvided()
+        : !newProps->initialCamera.hasSameValue(oldProps->initialCamera)) {
+    hybridView->setInitialCamera(newProps->initialCamera.get());
+  }
+  if (oldProps == nullptr
+        ? newProps->pauseRendering.isProvided()
+        : !newProps->pauseRendering.hasSameValue(oldProps->pauseRendering)) {
+    hybridView->setPauseRendering(newProps->pauseRendering.get());
+  }
+  if (oldProps == nullptr
+        ? newProps->maximumScreenSpaceError.isProvided()
+        : !newProps->maximumScreenSpaceError.hasSameValue(oldProps->maximumScreenSpaceError)) {
+    hybridView->setMaximumScreenSpaceError(newProps->maximumScreenSpaceError.get());
+  }
+  if (oldProps == nullptr
+        ? newProps->maximumSimultaneousTileLoads.isProvided()
+        : !newProps->maximumSimultaneousTileLoads.hasSameValue(oldProps->maximumSimultaneousTileLoads)) {
+    hybridView->setMaximumSimultaneousTileLoads(newProps->maximumSimultaneousTileLoads.get());
+  }
+  if (oldProps == nullptr
+        ? newProps->loadingDescendantLimit.isProvided()
+        : !newProps->loadingDescendantLimit.hasSameValue(oldProps->loadingDescendantLimit)) {
+    hybridView->setLoadingDescendantLimit(newProps->loadingDescendantLimit.get());
+  }
+  if (oldProps == nullptr
+        ? newProps->msaaSampleCount.isProvided()
+        : !newProps->msaaSampleCount.hasSameValue(oldProps->msaaSampleCount)) {
+    hybridView->setMsaaSampleCount(newProps->msaaSampleCount.get());
+  }
+  if (oldProps == nullptr
+        ? newProps->ionImageryAssetId.isProvided()
+        : !newProps->ionImageryAssetId.hasSameValue(oldProps->ionImageryAssetId)) {
+    hybridView->setIonImageryAssetId(newProps->ionImageryAssetId.get());
+  }
+  if (oldProps == nullptr
+        ? newProps->altitudeDatum.isProvided()
+        : !newProps->altitudeDatum.hasSameValue(oldProps->altitudeDatum)) {
+    hybridView->setAltitudeDatum(newProps->altitudeDatum.get());
+  }
+  if (oldProps == nullptr
+        ? newProps->maximumCachedMiB.isProvided()
+        : !newProps->maximumCachedMiB.hasSameValue(oldProps->maximumCachedMiB)) {
+    hybridView->setMaximumCachedMiB(newProps->maximumCachedMiB.get());
+  }
+  if (oldProps == nullptr
+        ? newProps->preloadAncestors.isProvided()
+        : !newProps->preloadAncestors.hasSameValue(oldProps->preloadAncestors)) {
+    hybridView->setPreloadAncestors(newProps->preloadAncestors.get());
+  }
+  if (oldProps == nullptr
+        ? newProps->preloadSiblings.isProvided()
+        : !newProps->preloadSiblings.hasSameValue(oldProps->preloadSiblings)) {
+    hybridView->setPreloadSiblings(newProps->preloadSiblings.get());
+  }
+  if (oldProps == nullptr
+        ? newProps->forbidHoles.isProvided()
+        : !newProps->forbidHoles.hasSameValue(oldProps->forbidHoles)) {
+    hybridView->setForbidHoles(newProps->forbidHoles.get());
+  }
+  if (oldProps == nullptr
+        ? newProps->enableWaterMask.isProvided()
+        : !newProps->enableWaterMask.hasSameValue(oldProps->enableWaterMask)) {
+    hybridView->setEnableWaterMask(newProps->enableWaterMask.get());
+  }
+  if (oldProps == nullptr
+        ? newProps->enableFogCulling.isProvided()
+        : !newProps->enableFogCulling.hasSameValue(oldProps->enableFogCulling)) {
+    hybridView->setEnableFogCulling(newProps->enableFogCulling.get());
+  }
+  if (oldProps == nullptr
+        ? newProps->enforceCulledScreenSpaceError.isProvided()
+        : !newProps->enforceCulledScreenSpaceError.hasSameValue(oldProps->enforceCulledScreenSpaceError)) {
+    hybridView->setEnforceCulledScreenSpaceError(newProps->enforceCulledScreenSpaceError.get());
+  }
+  if (oldProps == nullptr
+        ? newProps->culledScreenSpaceError.isProvided()
+        : !newProps->culledScreenSpaceError.hasSameValue(oldProps->culledScreenSpaceError)) {
+    hybridView->setCulledScreenSpaceError(newProps->culledScreenSpaceError.get());
+  }
+  if (oldProps == nullptr
+        ? newProps->enableLodTransitionPeriod.isProvided()
+        : !newProps->enableLodTransitionPeriod.hasSameValue(oldProps->enableLodTransitionPeriod)) {
+    hybridView->setEnableLodTransitionPeriod(newProps->enableLodTransitionPeriod.get());
+  }
+  if (oldProps == nullptr
+        ? newProps->lodTransitionLength.isProvided()
+        : !newProps->lodTransitionLength.hasSameValue(oldProps->lodTransitionLength)) {
+    hybridView->setLodTransitionLength(newProps->lodTransitionLength.get());
+  }
+  if (oldProps == nullptr
+        ? newProps->sqliteCacheMaxRows.isProvided()
+        : !newProps->sqliteCacheMaxRows.hasSameValue(oldProps->sqliteCacheMaxRows)) {
+    hybridView->setSqliteCacheMaxRows(newProps->sqliteCacheMaxRows.get());
+  }
+  if (oldProps == nullptr
+        ? newProps->taskProcessorThreads.isProvided()
+        : !newProps->taskProcessorThreads.hasSameValue(oldProps->taskProcessorThreads)) {
+    hybridView->setTaskProcessorThreads(newProps->taskProcessorThreads.get());
+  }
+  if (oldProps == nullptr
+        ? newProps->minAltitudeAboveTerrain.isProvided()
+        : !newProps->minAltitudeAboveTerrain.hasSameValue(oldProps->minAltitudeAboveTerrain)) {
+    hybridView->setMinAltitudeAboveTerrain(newProps->minAltitudeAboveTerrain.get());
+  }
+  if (oldProps == nullptr
+        ? newProps->maxYawRateDegSec.isProvided()
+        : !newProps->maxYawRateDegSec.hasSameValue(oldProps->maxYawRateDegSec)) {
+    hybridView->setMaxYawRateDegSec(newProps->maxYawRateDegSec.get());
+  }
+  if (oldProps == nullptr
+        ? newProps->maxPitchRateDegSec.isProvided()
+        : !newProps->maxPitchRateDegSec.hasSameValue(oldProps->maxPitchRateDegSec)) {
+    hybridView->setMaxPitchRateDegSec(newProps->maxPitchRateDegSec.get());
+  }
+  if (oldProps == nullptr
+        ? newProps->maxRollRateDegSec.isProvided()
+        : !newProps->maxRollRateDegSec.hasSameValue(oldProps->maxRollRateDegSec)) {
+    hybridView->setMaxRollRateDegSec(newProps->maxRollRateDegSec.get());
+  }
+  if (oldProps == nullptr
+        ? newProps->maxClimbRateMps.isProvided()
+        : !newProps->maxClimbRateMps.hasSameValue(oldProps->maxClimbRateMps)) {
+    hybridView->setMaxClimbRateMps(newProps->maxClimbRateMps.get());
+  }
+  if (oldProps == nullptr
+        ? newProps->maxGroundSpeedMps.isProvided()
+        : !newProps->maxGroundSpeedMps.hasSameValue(oldProps->maxGroundSpeedMps)) {
+    hybridView->setMaxGroundSpeedMps(newProps->maxGroundSpeedMps.get());
+  }
+  if (oldProps == nullptr
+        ? newProps->onMetrics.isProvided()
+        : !newProps->onMetrics.hasSameValue(oldProps->onMetrics)) {
+    hybridView->setOnMetrics(newProps->onMetrics.get());
+  }
+  if (oldProps == nullptr
+        ? newProps->onActualCamera.isProvided()
+        : !newProps->onActualCamera.hasSameValue(oldProps->onActualCamera)) {
+    hybridView->setOnActualCamera(newProps->onActualCamera.get());
   }
 
   // Update hybridRef if it changed
-  if (props->hybridRef.isDirty) {
+  if (oldProps == nullptr
+        ? newProps->hybridRef.isProvided()
+        : !newProps->hybridRef.hasSameValue(oldProps->hybridRef)) {
     // hybridRef changed - call it with new this
-    const auto& maybeFunc = props->hybridRef.value;
+    const auto& maybeFunc = newProps->hybridRef.get();
     if (maybeFunc.has_value()) {
       maybeFunc.value()(hybridView);
     }
-    props->hybridRef.isDirty = false;
   }
 }
 

package/nitrogen/generated/android/c++/views/JHybridCesiumViewStateUpdater.hpp

@@ -31,7 +31,12 @@ public:
 public:
   static void updateViewProps(jni::alias_ref<jni::JClass> /* class */,
                               jni::alias_ref<JHybridCesiumViewSpec::JavaPart> view,
-                              jni::alias_ref<JStateWrapper::javaobject> stateWrapperInterface);
+                              jni::alias_ref<JStateWrapper::javaobject> newState,
+                              jni::alias_ref<JStateWrapper::javaobject> oldState);
+
+private:
+  static std::shared_ptr<const HybridCesiumViewProps> getPropsFromStateWrapper(
+      jni::alias_ref<JStateWrapper::javaobject> stateWrapper);
 
 public:
   static void registerNatives() {

package/nitrogen/generated/android/kotlin/com/margelo/nitro/reactnativecesium/CameraState.kt

@@ -55,7 +55,7 @@ data class CameraState(
   }
 
   override fun hashCode(): Int {
-    return arrayOf(
+    return arrayOf<Any?>(
       latitude,
       longitude,
       altitude,

package/nitrogen/generated/android/kotlin/com/margelo/nitro/reactnativecesium/CesiumMetrics.kt

@@ -59,7 +59,7 @@ data class CesiumMetrics(
   }
 
   override fun hashCode(): Int {
-    return arrayOf(
+    return arrayOf<Any?>(
       fps,
       tilesRendered,
       tilesLoading,

package/nitrogen/generated/android/kotlin/com/margelo/nitro/reactnativecesium/Func_void_CameraState.kt

@@ -10,7 +10,6 @@ package com.margelo.nitro.reactnativecesium
 import androidx.annotation.Keep
 import com.facebook.jni.HybridData
 import com.facebook.proguard.annotations.DoNotStrip
-import dalvik.annotation.optimization.FastNative
 
 
 /**
@@ -59,7 +58,6 @@ class Func_void_CameraState_cxx: Func_void_CameraState {
   override fun invoke(camera: CameraState): Unit
     = invoke_cxx(camera)
 
-  @FastNative
   private external fun invoke_cxx(camera: CameraState): Unit
 }
 

package/nitrogen/generated/android/kotlin/com/margelo/nitro/reactnativecesium/Func_void_CesiumMetrics.kt

@@ -10,7 +10,6 @@ package com.margelo.nitro.reactnativecesium
 import androidx.annotation.Keep
 import com.facebook.jni.HybridData
 import com.facebook.proguard.annotations.DoNotStrip
-import dalvik.annotation.optimization.FastNative
 
 
 /**
@@ -59,7 +58,6 @@ class Func_void_CesiumMetrics_cxx: Func_void_CesiumMetrics {
   override fun invoke(metrics: CesiumMetrics): Unit
     = invoke_cxx(metrics)
 
-  @FastNative
   private external fun invoke_cxx(metrics: CesiumMetrics): Unit
 }
 

package/nitrogen/generated/android/kotlin/com/margelo/nitro/reactnativecesium/HybridCesiumViewSpec.kt

@@ -10,6 +10,7 @@ package com.margelo.nitro.reactnativecesium
 import androidx.annotation.Keep
 import com.facebook.jni.HybridData
 import com.facebook.proguard.annotations.DoNotStrip
+import dalvik.annotation.optimization.FastNative
 import com.margelo.nitro.core.Promise
 import com.margelo.nitro.core.HybridObject
 import com.margelo.nitro.views.HybridView
@@ -81,6 +82,12 @@ abstract class HybridCesiumViewSpec: HybridView() {
   @set:Keep
   abstract var ionImageryAssetId: Double
   
+  @get:DoNotStrip
+  @get:Keep
+  @set:DoNotStrip
+  @set:Keep
+  abstract var altitudeDatum: String?
+  
   @get:DoNotStrip
   @get:Keep
   @set:DoNotStrip
@@ -268,6 +275,7 @@ abstract class HybridCesiumViewSpec: HybridView() {
   @Keep
   protected open class CxxPart(javaPart: HybridCesiumViewSpec): HybridObject.CxxPart(javaPart) {
     // C++ JHybridCesiumViewSpec::CxxPart::initHybrid(...)
+    @FastNative
     external override fun initHybrid(): HybridData
   }
   override fun createCxxPart(): CxxPart {

package/nitrogen/generated/android/kotlin/com/margelo/nitro/reactnativecesium/Quaternion.kt

@@ -43,7 +43,7 @@ data class Quaternion(
   }
 
   override fun hashCode(): Int {
-    return arrayOf(
+    return arrayOf<Any?>(
       w,
       x,
       y,