bruce-cesium 7.4.8 → 7.4.9

package/dist/bruce-cesium.es5.js

@@ -1,6 +1,6 @@
 import * as Cesium from 'cesium';
-import { Cartographic, Entity, ConstantPositionProperty, HeightReference, Color, DistanceDisplayCondition, ColorMaterialProperty, Math as Math$1, Cartesian3, JulianDate, Quaternion, Transforms, HeadingPitchRoll, Matrix4, ConstantProperty, CallbackProperty, Primitive, Cesium3DTileFeature, ColorBlendMode, ShadowMode, ClassificationType, Model, ShaderSource, Ellipsoid, Geometry, GeometryAttribute, ComponentDatatype, PrimitiveType, BoundingSphere, GeometryPipeline, Cartesian2, Cartesian4, sampleTerrain, Texture, PixelFormat, Sampler, TextureWrap, TextureMinificationFilter, TextureMagnificationFilter, VertexArray, BufferUsage, ShaderProgram, RenderState, BlendingState, DrawCommand, Pass, ImageMaterialProperty, PolygonHierarchy, PolylineGraphics, ArcType, CornerType, Rectangle, HorizontalOrigin, VerticalOrigin, SceneTransforms, FeatureDetection, SceneMode, NearFarScalar, Matrix3, KmlDataSource, GeoJsonDataSource, Cesium3DTileStyle, HeadingPitchRange, Ion, IonResource, Cesium3DTileColorBlendMode, Cesium3DTileset, EllipsoidTerrainProvider, IonImageryProvider, createWorldImagery, createWorldImageryAsync, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, CesiumTerrainProvider, OrthographicFrustum, EasingFunction, Intersect, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, EllipsoidGeodesic, sampleTerrainMostDetailed, defined, PolygonPipeline, CesiumInspector, ClockRange, DynamicEnvironmentMapManager, CustomDataSource, GeometryInstance, ScreenSpaceEventHandler, ScreenSpaceEventType, Fullscreen, CzmlDataSource } from 'cesium';
-import { Cartes, LRUCache, ProjectViewTile, ENVIRONMENT, Calculator, ClientFile, Entity as Entity$1, EntityLod, EntityTag, EntityType, ObjectUtils, Style, Bounds, ClientFileValueMap, Color as Color$1, Geometry as Geometry$1, Api, Carto, MenuItem, ProjectView, ProjectViewBookmark, Tileset, ZoomControl, BruceEvent, EntityCoords, DataLab, DelayQueue, AccountConcept, BruceApi, RecordChangeFeed, EntityRelation, EntitySource, ProgramKey, ProjectViewLegacyTile, Camera, Account, AccountLimits, Session, UrlUtils, ProjectViewBookmarkGroup, EntityAttachment, EntityAttachmentType, EntityAttribute, MathUtils, EntityRelationType, EntityHistoricData } from 'bruce-models';
+import { Cartographic, ColorMaterialProperty, Entity, Color, ConstantProperty, CallbackProperty, Primitive, Cesium3DTileFeature, ConstantPositionProperty, HeightReference, DistanceDisplayCondition, ColorBlendMode, HeadingPitchRoll, Math as Math$1, Transforms, ShadowMode, Cartesian3, ClassificationType, Model, JulianDate, Quaternion, Matrix4, ShaderSource, Ellipsoid, Geometry, GeometryAttribute, ComponentDatatype, PrimitiveType, BoundingSphere, GeometryPipeline, Cartesian2, Cartesian4, sampleTerrain, Texture, PixelFormat, Sampler, TextureWrap, TextureMinificationFilter, TextureMagnificationFilter, VertexArray, BufferUsage, ShaderProgram, RenderState, BlendingState, DrawCommand, Pass, HorizontalOrigin, VerticalOrigin, ArcType, CornerType, SceneTransforms, ImageMaterialProperty, PolygonHierarchy, PolylineGraphics, Rectangle, FeatureDetection, SceneMode, NearFarScalar, Matrix3, KmlDataSource, GeoJsonDataSource, Cesium3DTileStyle, Cesium3DTileColorBlendMode, HeadingPitchRange, Ion, IonResource, EllipsoidTerrainProvider, IonImageryProvider, createWorldImagery, createWorldImageryAsync, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, CesiumTerrainProvider, Intersect, Cesium3DTileset, OrthographicFrustum, EasingFunction, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, PolygonPipeline, CustomDataSource, EllipsoidGeodesic, sampleTerrainMostDetailed, defined, CesiumInspector, ClockRange, DynamicEnvironmentMapManager, GeometryInstance, ScreenSpaceEventHandler, ScreenSpaceEventType, Fullscreen, CzmlDataSource } from 'cesium';
+import { Cartes, LRUCache, ProjectViewTile, ENVIRONMENT, Calculator, ClientFile, Entity as Entity$1, EntityLod, EntityTag, EntityType, ObjectUtils, Style, Api, Carto, Geometry as Geometry$1, MenuItem, ProjectView, ProjectViewBookmark, Tileset, ZoomControl, Bounds, ClientFileValueMap, Color as Color$1, BruceEvent, EntityCoords, DataLab, DelayQueue, AccountConcept, BruceApi, EntityRelation, RecordChangeFeed, EntitySource, ProgramKey, ProjectViewLegacyTile, Camera, Account, AccountLimits, Session, UrlUtils, EntityAttachment, EntityAttachmentType, EntityAttribute, MathUtils, ProjectViewBookmarkGroup, EntityRelationType, EntityHistoricData } from 'bruce-models';
 
 /**
  * Ensures a number is returned from a given value.
@@ -1465,6 +1465,48 @@ var ViewUtils;
     ViewUtils.GetModelSpace = GetModelSpace;
 })(ViewUtils || (ViewUtils = {}));
 
+// End time of the frames already being requested for a viewer, so overlapping animations share one loop.
+const renderDriverEnds = new WeakMap();
+// A browser frame where there is one, so the requests keep pace with Cesium's own loop.
+function nextFrame(callback) {
+    if (typeof requestAnimationFrame === "function") {
+        requestAnimationFrame(callback);
+    }
+    else {
+        setTimeout(callback, 16);
+    }
+}
+/**
+ * Keeps frames coming until a time based animation has ended, then draws one more for its final value.
+ */
+function requestRendersFor(viewer, durationMs) {
+    var _a;
+    const scene = viewer === null || viewer === void 0 ? void 0 : viewer.scene;
+    if (typeof (scene === null || scene === void 0 ? void 0 : scene.requestRender) !== "function" || ((_a = viewer.isDestroyed) === null || _a === void 0 ? void 0 : _a.call(viewer))) {
+        return;
+    }
+    scene.requestRender();
+    const endAt = Date.now() + Math.max(durationMs || 0, 0);
+    if (renderDriverEnds.has(viewer)) {
+        renderDriverEnds.set(viewer, Math.max(renderDriverEnds.get(viewer), endAt));
+        return;
+    }
+    renderDriverEnds.set(viewer, endAt);
+    const tick = () => {
+        var _a;
+        if ((_a = viewer.isDestroyed) === null || _a === void 0 ? void 0 : _a.call(viewer)) {
+            renderDriverEnds.delete(viewer);
+            return;
+        }
+        scene.requestRender();
+        if (Date.now() >= renderDriverEnds.get(viewer)) {
+            renderDriverEnds.delete(viewer);
+            return;
+        }
+        nextFrame(tick);
+    };
+    nextFrame(tick);
+}
 function getColor(viewer, obj) {
     let value = null;
     if (obj === null || obj === void 0 ? void 0 : obj.getValue) {
@@ -1582,6 +1624,7 @@ var CesiumAnimatedProperty;
                 this.durationMs = 0;
             }
             this.startTime = new Date();
+            requestRendersFor(this.viewer, this.durationMs);
         }
         IsDone() {
             const now = new Date();
@@ -1633,12 +1676,14 @@ var CesiumAnimatedProperty;
             }
             if (!this.paused) {
                 this.startTime = new Date();
+                requestRendersFor(this.viewer, this.durationMs);
             }
         }
         Play() {
             if (this.paused) {
                 this.paused = false;
                 this.startTime = new Date();
+                requestRendersFor(this.viewer, this.durationMs);
             }
         }
         GetValue() {
@@ -1716,6 +1761,8 @@ var CesiumAnimatedProperty;
         setMark(startColor, mark);
         setMark(color, mark);
         let startTime = new Date();
+        // A feature's colour change does not ask for a frame, the final one included.
+        requestRendersFor(viewer, durationMs);
         let removal = viewer.scene.postUpdate.addEventListener(() => {
             if (!isFeatureAlive(viewer, feature)) {
                 removal === null || removal === void 0 ? void 0 : removal();
@@ -1787,6 +1834,7 @@ var CesiumAnimatedProperty;
                 this.startPos3d = Cartesian3.clone(this.targetPos3d);
             }
             this.startTime = new Date();
+            requestRendersFor(this.viewer, this.durationMs);
         }
         GetValue() {
             const now = new Date();
@@ -1818,6 +1866,7 @@ var CesiumAnimatedProperty;
                 this.startHeadingDeg = 0;
             }
             this.startTime = new Date();
+            requestRendersFor(this.viewer, this.durationMs);
         }
         IsDone() {
             const now = new Date();
@@ -34239,6 +34288,18 @@ var ViewRenderEngine;
         return typeof ((_b = bSettings.camera) === null || _b === void 0 ? void 0 : _b.zoom) !== "number";
     }
     ViewRenderEngine.IsBookmarkSupported = IsBookmarkSupported;
+    /**
+     * Drops the view's default bookmark when it is not a Cesium scene, so the view renders without it.
+     * A bookmark the caller asked for by ID is kept.
+     */
+    function KeepDefaultBookmark(view, requestedId, bookmark) {
+        // Legacy views store a different bookmark shape.
+        if (requestedId || !bookmark || (view === null || view === void 0 ? void 0 : view.DataVersion) == 1) {
+            return bookmark;
+        }
+        return IsBookmarkSupported(bookmark) ? bookmark : null;
+    }
+    ViewRenderEngine.KeepDefaultBookmark = KeepDefaultBookmark;
     async function Render(params) {
         var _a, _b;
         if (!params.manager && params.viewer) {
@@ -34276,6 +34337,7 @@ var ViewRenderEngine;
                 viewId: params.viewId,
                 bookmarkId: bookmarkId
             })).bookmark : null;
+            bookmark = KeepDefaultBookmark(view, params.bookmarkId, bookmark);
         }
         if (!assertIteration$1(params.viewer, iteration)) {
             return;
@@ -34336,6 +34398,7 @@ var ViewRenderEngine;
                 viewId: params.viewId,
                 bookmarkId: bookmarkId
             })).bookmark : null;
+            bookmark = KeepDefaultBookmark(view, params.bookmarkId, bookmark);
         }
         const viewer = params.manager.Viewer;
         const scene = viewer.scene;
@@ -50950,7 +51013,7 @@ var StyleUtils;
     StyleUtils.ApplyTypeStyle = ApplyTypeStyle;
 })(StyleUtils || (StyleUtils = {}));
 
-const VERSION = "7.4.8";
+const VERSION = "7.4.9";
 /**
  * Updates the environment instance used by bruce-cesium to one specified.
  * This can be used to ensure that the instance a parent is referencing is shared between bruce-cesium, bruce-models, and the parent app.