bruce-cesium 7.0.6 → 7.0.8

package/dist/bruce-cesium.umd.js

@@ -6010,7 +6010,7 @@
         }
         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.
@@ -6033,6 +6033,9 @@
             return pos3d;
         }
         const offset = getTerrainOffset(viewer, pos3d);
+        if (typeof offset == "number" && isNaN(offset)) {
+            return null;
+        }
         if (!offset) {
             return pos3d;
         }
@@ -6282,7 +6285,13 @@
             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);
@@ -6360,7 +6369,7 @@
             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)) ||
+            exports.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;
@@ -6646,6 +6655,28 @@
             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 Cesium.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.
@@ -6677,6 +6708,19 @@
             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 Cesium.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;
@@ -6685,11 +6729,7 @@
                 return false;
             }
             if (visual instanceof Cesium.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;
         }
@@ -7047,6 +7087,13 @@
         return Object.keys(state).length === idKeys;
     }
     (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";
@@ -8178,7 +8225,8 @@
                                 if (!(part instanceof Cesium.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);
@@ -40293,7 +40341,7 @@
         StyleUtils.ApplyTypeStyle = ApplyTypeStyle;
     })(exports.StyleUtils || (exports.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.