bruce-cesium 7.0.7 → 7.0.9

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);
@@ -6298,6 +6307,7 @@
     // Attached to a cesium viewer to indicate a re-check should be done.
     // This is to override the cache that avoids re-checking when the camera hasn't moved.
     const SHOULD_RECHECK_KEY = Symbol("SHOULD_RECHECK_KEY");
+    const RECHECK_KICK_KEY = Symbol("RECHECK_KICK_KEY");
     /**
      * We will recheck if the camera has turned or moved enough.
      * @param viewer
@@ -6481,11 +6491,11 @@
                         }
                         const shouldCull = shouldCullEntity(viewer, part);
                         if (shouldCull) {
-                            part[VisualRegisterCuller.VISUAL_CULL_KEY] = true;
+                            part[exports.VisualRegisterCuller.VISUAL_CULL_KEY] = true;
                             toRemove.push(part);
                         }
                         else {
-                            delete part[VisualRegisterCuller.VISUAL_CULL_KEY];
+                            delete part[exports.VisualRegisterCuller.VISUAL_CULL_KEY];
                             if (rego.overrideShow != false &&
                                 !IsCEntityInScene(viewer, part) &&
                                 !state.hidden &&
@@ -6565,7 +6575,6 @@
             });
         });
     }
-    var VisualRegisterCuller;
     (function (VisualRegisterCuller) {
         VisualRegisterCuller.VISUAL_CULL_KEY = Symbol("VISUAL_CULL_KEY");
         /**
@@ -6588,6 +6597,7 @@
                 runCullChecker(register);
                 lastCullCheck = new Date();
             }, 1000);
+            register.Viewer[RECHECK_KICK_KEY] = () => { var _a; return (_a = checkQueue === null || checkQueue === void 0 ? void 0 : checkQueue.Call) === null || _a === void 0 ? void 0 : _a.call(checkQueue); };
             let moveStartRemoval = register.Viewer.camera.moveStart.addEventListener(() => {
                 var _a;
                 (_a = checkQueue.Call) === null || _a === void 0 ? void 0 : _a.call(checkQueue);
@@ -6630,6 +6640,9 @@
                 checkWaiting = false;
                 checkQueue === null || checkQueue === void 0 ? void 0 : checkQueue.Dispose();
                 checkQueue = null;
+                if (register.Viewer) {
+                    delete register.Viewer[RECHECK_KICK_KEY];
+                }
             };
         }
         VisualRegisterCuller.Monitor = Monitor;
@@ -6646,6 +6659,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 +6712,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,20 +6733,24 @@
                 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;
         }
         VisualRegisterCuller.IsCulled = IsCulled;
+        /**
+         * Asks for the next cull pass to actually re-measure, and brings that pass forward.
+         */
         function MarkShouldRecheck(viewer) {
+            var _a, _b;
+            if (!viewer || ((_a = viewer.isDestroyed) === null || _a === void 0 ? void 0 : _a.call(viewer))) {
+                return;
+            }
             viewer[SHOULD_RECHECK_KEY] = true;
+            (_b = viewer[RECHECK_KICK_KEY]) === null || _b === void 0 ? void 0 : _b.call(viewer);
         }
         VisualRegisterCuller.MarkShouldRecheck = MarkShouldRecheck;
-    })(VisualRegisterCuller || (VisualRegisterCuller = {}));
+    })(exports.VisualRegisterCuller || (exports.VisualRegisterCuller = {}));
 
     function isTilesetFeatureAlive(visual) {
         const cTileset = visual === null || visual === void 0 ? void 0 : visual.tileset;
@@ -6785,7 +6837,7 @@
         }
         // A sub-object can be culled while the siblings are not.
         // We only cull things that give us some benefit. For example clamped to ground graphics are expensive to keep rendered.
-        show = show ? !VisualRegisterCuller.IsCulled(viewer, rego, visual) : false;
+        show = show ? !exports.VisualRegisterCuller.IsCulled(viewer, rego, visual) : false;
         if (visual._parentEntity && !ignoreParent) {
             updateCEntityShow(viewer, visual._parentEntity, rego, show, false, depth + 1);
         }
@@ -7138,7 +7190,7 @@
                 this.tilesets = new Map();
                 this.viewer = params.viewer;
                 this.apiGetters = params.apiGetters;
-                this.cameraCullerDispose = VisualRegisterCuller.Monitor({
+                this.cameraCullerDispose = exports.VisualRegisterCuller.Monitor({
                     register: this
                 });
             }
@@ -8150,6 +8202,26 @@
                     exports.CesiumEntityStyler.UpdateColorSetting("highlight", color);
                 }
             }
+            /**
+             * Whether any rego for this entity is currently held as being edited.
+             */
+            IsEditing(params) {
+                const { entityId, menuItemId } = params;
+                const regos = this.rego[entityId];
+                if (!(regos === null || regos === void 0 ? void 0 : regos.length)) {
+                    return false;
+                }
+                for (let i = 0; i < regos.length; i++) {
+                    const rego = regos[i];
+                    if (menuItemId && rego.menuItemId !== menuItemId) {
+                        continue;
+                    }
+                    if (rego.editing) {
+                        return true;
+                    }
+                }
+                return false;
+            }
             /**
              * Marks visuals as being actively edited, which exempts them from culling until it is turned back off.
              */
@@ -8170,12 +8242,15 @@
                         if (menuItemId && rego.menuItemId !== menuItemId) {
                             continue;
                         }
-                        if (Boolean(rego.editing) == Boolean(editing)) {
+                        const wasEditing = Boolean(rego.editing);
+                        if (wasEditing == Boolean(editing) && editing) {
                             continue;
                         }
                         // Null rather than false, so the rego does not carry a key for every visual ever edited.
                         rego.editing = editing ? true : null;
-                        changed = true;
+                        if (wasEditing != Boolean(editing)) {
+                            changed = true;
+                        }
                         if (editing) {
                             const parts = exports.EntityUtils.GatherEntity({
                                 entity: rego.visual
@@ -8185,17 +8260,17 @@
                                 if (!(part instanceof Cesium.Entity)) {
                                     continue;
                                 }
-                                const wasCulled = part[VisualRegisterCuller.VISUAL_CULL_KEY];
-                                delete part[VisualRegisterCuller.VISUAL_CULL_KEY];
+                                const removalPending = exports.VisualRegisterCuller.CancelQueuedSceneChange(part);
+                                const wasCulled = part[exports.VisualRegisterCuller.VISUAL_CULL_KEY] == true || removalPending;
+                                delete part[exports.VisualRegisterCuller.VISUAL_CULL_KEY];
                                 if (wasCulled && !IsCEntityInScene(this.viewer, part)) {
                                     AddCEntityToScene(this.viewer, part, rego.collection);
                                 }
                             }
                         }
                         else {
-                            // The geometry almost certainly moved, so what was measured before is worthless.
-                            VisualRegisterCuller.InvalidateBounds(rego.visual);
-                            VisualRegisterCuller.MarkShouldRecheck(this.viewer);
+                            exports.VisualRegisterCuller.InvalidateBounds(rego.visual);
+                            exports.VisualRegisterCuller.MarkShouldRecheck(this.viewer);
                         }
                     }
                 }
@@ -8669,6 +8744,9 @@
                 // Tilesets will often add -> remove -> add because of how tiles load in and out of the scene.
                 // To avoid flickering, we'll just replace rather than remove -> add.
                 if (!rego.tilesetId && params.removePrior != false) {
+                    if (!rego.editing && this.IsEditing({ entityId: rego.entityId, menuItemId: rego.menuItemId })) {
+                        rego.editing = true;
+                    }
                     this.RemoveRegos({
                         entityId: rego.entityId,
                         menuItemId: rego.menuItemId,
@@ -36928,7 +37006,7 @@
                     model._radius = radius;
                     model._radiusLoaded = true;
                     if (params.viewer && params.viewer.scene && !params.viewer.isDestroyed()) {
-                        VisualRegisterCuller.MarkShouldRecheck(params.viewer);
+                        exports.VisualRegisterCuller.MarkShouldRecheck(params.viewer);
                     }
                 }
                 // Rough estimate on when the model is ready in the scene.
@@ -39533,8 +39611,9 @@
                 if (bandCheck) {
                     cEntity._bandCheck = bandCheck;
                 }
-                VisualRegisterCuller.InvalidateBounds(cEntity);
+                exports.VisualRegisterCuller.InvalidateBounds(cEntity);
             });
+            exports.VisualRegisterCuller.MarkShouldRecheck(params.viewer);
             return {
                 entities: cEntities,
                 updated
@@ -40300,7 +40379,7 @@
         StyleUtils.ApplyTypeStyle = ApplyTypeStyle;
     })(exports.StyleUtils || (exports.StyleUtils = {}));
 
-    const VERSION = "7.0.7";
+    const VERSION = "7.0.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.