bruce-cesium 7.0.6 → 7.0.8

package/dist/bruce-cesium.es5.js

@@ -1,6 +1,6 @@
 import * as Cesium from 'cesium';
-import { Cartographic, Entity, DistanceDisplayCondition, ColorMaterialProperty, Color, Math as Math$1, Cartesian3, JulianDate, Quaternion, Transforms, HeadingPitchRoll, Matrix4, ConstantProperty, CallbackProperty, Primitive, Cesium3DTileFeature, HeightReference, ColorBlendMode, ShadowMode, ClassificationType, Model, ArcType, CornerType, ConstantPositionProperty, HorizontalOrigin, VerticalOrigin, ImageMaterialProperty, PolygonHierarchy, PolylineGraphics, Cartesian2, SceneTransforms, NearFarScalar, Matrix3, Rectangle, KmlDataSource, GeoJsonDataSource, SceneMode, Cesium3DTileStyle, HeadingPitchRange, Cesium3DTileColorBlendMode, Ion, IonResource, Cesium3DTileset, OrthographicFrustum, EasingFunction, EllipsoidTerrainProvider, IonImageryProvider, createWorldImagery, createWorldImageryAsync, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, CesiumTerrainProvider, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, EllipsoidGeodesic, sampleTerrainMostDetailed, defined, PolygonPipeline, CustomDataSource, CesiumInspector, ClockRange, BoundingSphere, GeometryInstance, ScreenSpaceEventHandler, ScreenSpaceEventType, Fullscreen, Intersect, CzmlDataSource } from 'cesium';
-import { Cartes, Entity as Entity$1, ENVIRONMENT, Calculator, ClientFile, EntityLod, EntityTag, EntityType, LRUCache, ObjectUtils, Style, Carto, Geometry, MenuItem, ProjectView, ProjectViewBookmark, Tileset, ZoomControl, Api, Bounds, Color as Color$1, BruceEvent, EntityCoords, DataLab, DelayQueue, EntityHistoricData, BruceApi, AccountConcept, RecordChangeFeed, EntityRelation, ProgramKey, EntitySource, Camera, ProjectViewTile, ProjectViewLegacyTile, Session, EntityAttachment, EntityAttachmentType, EntityAttribute, MathUtils, EntityRelationType } from 'bruce-models';
+import { Cartographic, ColorMaterialProperty, Entity, Color, ConstantProperty, CallbackProperty, Primitive, Cesium3DTileFeature, DistanceDisplayCondition, HeightReference, ColorBlendMode, HeadingPitchRoll, Math as Math$1, Transforms, ShadowMode, Cartesian3, ClassificationType, Model, ArcType, CornerType, ConstantPositionProperty, HorizontalOrigin, VerticalOrigin, ImageMaterialProperty, PolygonHierarchy, PolylineGraphics, Cartesian2, SceneTransforms, NearFarScalar, JulianDate, Quaternion, Matrix3, KmlDataSource, Matrix4, Rectangle, SceneMode, GeoJsonDataSource, Cesium3DTileStyle, Cesium3DTileColorBlendMode, HeadingPitchRange, Ion, IonResource, Cesium3DTileset, OrthographicFrustum, EasingFunction, EllipsoidTerrainProvider, IonImageryProvider, createWorldImagery, createWorldImageryAsync, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, CesiumTerrainProvider, EllipsoidGeodesic, sampleTerrainMostDetailed, defined, PolygonPipeline, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, CesiumInspector, ClockRange, ScreenSpaceEventHandler, ScreenSpaceEventType, BoundingSphere, CustomDataSource, GeometryInstance, Fullscreen, Intersect, CzmlDataSource } from 'cesium';
+import { Cartes, Entity as Entity$1, ENVIRONMENT, Calculator, ClientFile, EntityLod, EntityTag, EntityType, LRUCache, ObjectUtils, Style, Carto, Geometry, Api, MenuItem, ProjectView, ProjectViewBookmark, Tileset, ZoomControl, Bounds, Color as Color$1, BruceEvent, EntityCoords, DelayQueue, EntityHistoricData, DataLab, EntityRelation, AccountConcept, RecordChangeFeed, BruceApi, ProgramKey, EntitySource, Camera, ProjectViewTile, ProjectViewLegacyTile, Session, EntityAttachment, EntityAttachmentType, EntityAttribute, MathUtils, EntityRelationType } from 'bruce-models';
 
 /**
  * Ensures a number is returned from a given value.
@@ -6026,7 +6026,7 @@ const getTerrainOffset = (viewer, pos3d) => {
     }
     if (height == null || isNaN(height)) {
         // Terrain tile not loaded yet. Don't record it, so a later pass can sample it properly.
-        return coarseCell ? coarseCell.offset : 0;
+        return coarseCell ? coarseCell.offset : NaN;
     }
     // Always fold into the coarse cell as well, so its spread keeps being learned even while the finer grid is
     // answering lookups for this region.
@@ -6049,6 +6049,9 @@ const adjustPos3d = (viewer, heightRef, pos3d) => {
         return pos3d;
     }
     const offset = getTerrainOffset(viewer, pos3d);
+    if (typeof offset == "number" && isNaN(offset)) {
+        return null;
+    }
     if (!offset) {
         return pos3d;
     }
@@ -6298,7 +6301,13 @@ function shouldCullEntity(viewer, cEntity) {
         adjustedSphere.radius += TERRAIN_SKIP_RADIUS_PAD;
     }
     else {
-        adjustedSphere.center = adjustPos3d(viewer, boundingSphere.heightRef, adjustedSphere.center);
+        const grounded = adjustPos3d(viewer, boundingSphere.heightRef, adjustedSphere.center);
+        if (!grounded) {
+            // Where this sits depends on ground we have not loaded yet. Guessing means guessing wrong sometimes,
+            // and a wrong cull hides something that is on screen with nothing to bring it back.
+            return false;
+        }
+        adjustedSphere.center = grounded;
     }
     const cullingVolume = camera.frustum.computeCullingVolume(camera.position, camera.direction, camera.up);
     const visibility = cullingVolume.computeVisibility(adjustedSphere);
@@ -6376,7 +6385,7 @@ function isCullingIgnored(viewer, rego) {
         rego.editing == true ||
         // Part of a collection we did not create, eg. a geojson data source, which may have its own rules for
         // what is in the scene. Our own per-menu-item data sources are fair game.
-        (rego.collection && !IsCCollectionOwned(rego.collection)) ||
+        VisualsRegister.IsForeignCollection(rego) ||
         // We won't cull historic records as they may be interpolating their locations.
         Boolean(rego.outline && rego.outline.some(x => !!x.DateTime))) {
         return true;
@@ -6662,6 +6671,28 @@ var VisualRegisterCuller;
         return isCullingIgnored(viewer, rego);
     }
     VisualRegisterCuller.IsCullingIgnored = IsCullingIgnored;
+    /**
+     * Drops any scene add/remove the culler has queued for these graphics.
+     * Emits whether a removal was among them.
+     * @param visuals an entity or an array of them.
+     * @returns whether a queued removal was cancelled, ie. whether this graphic was on its way out.
+     */
+    function CancelQueuedSceneChange(visuals) {
+        const list = Array.isArray(visuals) ? visuals : [visuals];
+        let hadRemoval = false;
+        for (let i = 0; i < list.length; i++) {
+            const visual = list[i];
+            if (!(visual instanceof Entity)) {
+                continue;
+            }
+            if (entityRemoveAddState.get(visual.id) === false) {
+                hadRemoval = true;
+            }
+            entityRemoveAddState.delete(visual.id);
+        }
+        return hadRemoval;
+    }
+    VisualRegisterCuller.CancelQueuedSceneChange = CancelQueuedSceneChange;
     /**
      * Discards what the culler knows about an entity's extent, so its next check measures the geometry again.
      * The last cull decision is deliberately kept, see the loop below.
@@ -6693,6 +6724,19 @@ var VisualRegisterCuller;
         invalidateBounds(ids);
     }
     VisualRegisterCuller.InvalidateBounds = InvalidateBounds;
+    /**
+     * Measures a graphic against the current view and says whether it is out of frame.
+     */
+    function ShouldCull(viewer, visual) {
+        if (!(visual instanceof Entity)) {
+            return false;
+        }
+        return shouldCullEntity(viewer, visual);
+    }
+    VisualRegisterCuller.ShouldCull = ShouldCull;
+    /**
+     * Whether the last cull pass decided this graphic was out of frame.
+     */
     function IsCulled(viewer, rego, visual) {
         if (isCullingIgnored(viewer, rego)) {
             return false;
@@ -6701,11 +6745,7 @@ var VisualRegisterCuller;
             return false;
         }
         if (visual instanceof Entity) {
-            let status = visual[VisualRegisterCuller.VISUAL_CULL_KEY];
-            if (status == null) {
-                status = visual[VisualRegisterCuller.VISUAL_CULL_KEY] = shouldCullEntity(viewer, visual);
-            }
-            return status;
+            return visual[VisualRegisterCuller.VISUAL_CULL_KEY] == true;
         }
         return false;
     }
@@ -7067,6 +7107,13 @@ function isBlankState(state) {
  */
 var VisualsRegister;
 (function (VisualsRegister) {
+    /**
+     * Whether a visual lives in a collection somebody else owns, eg. a geojson or KML data source that manages its own scene membership.
+     */
+    function IsForeignCollection(rego) {
+        return Boolean(rego === null || rego === void 0 ? void 0 : rego.collection) && !IsCCollectionOwned(rego.collection);
+    }
+    VisualsRegister.IsForeignCollection = IsForeignCollection;
     let EVisualUpdateType;
     (function (EVisualUpdateType) {
         EVisualUpdateType["Add"] = "ADD";
@@ -8198,7 +8245,8 @@ var VisualsRegister;
                             if (!(part instanceof Entity)) {
                                 continue;
                             }
-                            const wasCulled = part[VisualRegisterCuller.VISUAL_CULL_KEY];
+                            const removalPending = VisualRegisterCuller.CancelQueuedSceneChange(part);
+                            const wasCulled = part[VisualRegisterCuller.VISUAL_CULL_KEY] == true || removalPending;
                             delete part[VisualRegisterCuller.VISUAL_CULL_KEY];
                             if (wasCulled && !IsCEntityInScene(this.viewer, part)) {
                                 AddCEntityToScene(this.viewer, part, rego.collection);
@@ -40415,7 +40463,7 @@ var StyleUtils;
     StyleUtils.ApplyTypeStyle = ApplyTypeStyle;
 })(StyleUtils || (StyleUtils = {}));
 
-const VERSION = "7.0.6";
+const VERSION = "7.0.8";
 /**
  * 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.