bruce-cesium 7.0.7 → 7.0.9

package/dist/bruce-cesium.es5.js

@@ -1,6 +1,6 @@
 import * as Cesium from 'cesium';
-import { Cartographic, ColorMaterialProperty, Entity, Color, ConstantProperty, CallbackProperty, Primitive, Cesium3DTileFeature, DistanceDisplayCondition, Math as Math$1, Cartesian3, JulianDate, Quaternion, Transforms, HeadingPitchRoll, Matrix4, HeightReference, ColorBlendMode, ShadowMode, ClassificationType, Model, HorizontalOrigin, VerticalOrigin, ConstantPositionProperty, ArcType, CornerType, 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, BoundingSphere, GeometryInstance, CesiumInspector, ClockRange, CustomDataSource, ScreenSpaceEventHandler, ScreenSpaceEventType, Fullscreen, Intersect, CzmlDataSource } from 'cesium';
-import { Cartes, Entity as Entity$1, ENVIRONMENT, Calculator, ClientFile, EntityLod, EntityTag, EntityType, LRUCache, ObjectUtils, Style, Api, Carto, Geometry, Bounds, Color as Color$1, MenuItem, ProjectView, ProjectViewBookmark, Tileset, ZoomControl, BruceEvent, EntityCoords, DataLab, DelayQueue, EntityHistoricData, AccountConcept, RecordChangeFeed, BruceApi, EntityRelation, ProgramKey, EntitySource, Camera, ProjectViewTile, ProjectViewLegacyTile, Session, EntityAttachment, EntityAttachmentType, EntityAttribute, MathUtils, EntityRelationType } from 'bruce-models';
+import { Cartographic, ColorMaterialProperty, Entity, Color, ConstantProperty, CallbackProperty, Primitive, Cesium3DTileFeature, Math as Math$1, Cartesian3, JulianDate, Quaternion, Transforms, HeadingPitchRoll, Matrix4, DistanceDisplayCondition, HeightReference, ColorBlendMode, ShadowMode, ClassificationType, Model, HorizontalOrigin, VerticalOrigin, ConstantPositionProperty, ImageMaterialProperty, PolygonHierarchy, PolylineGraphics, ArcType, CornerType, Cartesian2, SceneTransforms, NearFarScalar, Matrix3, Rectangle, KmlDataSource, GeoJsonDataSource, SceneMode, Cesium3DTileStyle, HeadingPitchRange, Cesium3DTileColorBlendMode, Ion, IonResource, EllipsoidTerrainProvider, IonImageryProvider, createWorldImagery, createWorldImageryAsync, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, CesiumTerrainProvider, Cesium3DTileset, OrthographicFrustum, EasingFunction, BoundingSphere, Intersect, CustomDataSource, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, EllipsoidGeodesic, sampleTerrainMostDetailed, defined, GeometryInstance, PolygonPipeline, CesiumInspector, ClockRange, ScreenSpaceEventHandler, ScreenSpaceEventType, Fullscreen, CzmlDataSource } from 'cesium';
+import { Cartes, Entity as Entity$1, ENVIRONMENT, Calculator, ClientFile, EntityLod, EntityTag, EntityType, LRUCache, ObjectUtils, Style, Api, Bounds, Color as Color$1, Geometry, Carto, MenuItem, ProjectView, ProjectViewBookmark, Tileset, ZoomControl, BruceEvent, EntityCoords, DataLab, DelayQueue, EntityHistoricData, AccountConcept, RecordChangeFeed, BruceApi, EntityRelation, ProgramKey, EntitySource, ProjectViewLegacyTile, ProjectViewTile, Camera, EntityAttachment, EntityAttachmentType, EntityAttribute, MathUtils, Session, 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);
@@ -6314,6 +6323,7 @@ const LAST_RECHECK_KEY = Symbol("LAST_RECHECK_KEY");
 // 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
@@ -6604,6 +6614,7 @@ var VisualRegisterCuller;
             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);
@@ -6646,6 +6657,9 @@ var VisualRegisterCuller;
             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;
@@ -6662,6 +6676,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 +6729,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,17 +6750,21 @@ 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;
     }
     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 = {}));
@@ -8170,6 +8223,26 @@ var VisualsRegister;
                 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.
          */
@@ -8190,12 +8263,15 @@ var VisualsRegister;
                     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 = EntityUtils.GatherEntity({
                             entity: rego.visual
@@ -8205,7 +8281,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);
@@ -8213,7 +8290,6 @@ var VisualsRegister;
                         }
                     }
                     else {
-                        // The geometry almost certainly moved, so what was measured before is worthless.
                         VisualRegisterCuller.InvalidateBounds(rego.visual);
                         VisualRegisterCuller.MarkShouldRecheck(this.viewer);
                     }
@@ -8689,6 +8765,9 @@ var VisualsRegister;
             // 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,
@@ -39654,6 +39733,7 @@ var EntityRenderEngine;
             }
             VisualRegisterCuller.InvalidateBounds(cEntity);
         });
+        VisualRegisterCuller.MarkShouldRecheck(params.viewer);
         return {
             entities: cEntities,
             updated
@@ -40422,7 +40502,7 @@ var StyleUtils;
     StyleUtils.ApplyTypeStyle = ApplyTypeStyle;
 })(StyleUtils || (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.
@@ -40439,5 +40519,5 @@ const getENVIRONMENT = () => {
     return ENVIRONMENT;
 };
 
-export { VERSION, setENVIRONMENT, getENVIRONMENT, CesiumAnimatedInOut, CesiumAnimatedProperty, isStyleChanged, isOutlineChanged$1 as isOutlineChanged, StyleEffective, EntityRenderEngine, EntityRenderEngineModel3d, EntityRenderEnginePoint, EntityRenderEnginePolygon, EntityRenderEnginePolyline, MenuItemCreator, MenuItemManager, CesiumParabola, EntityLabel, LiveCursor, SharedGetters, DataSourceStaticKmlManager, DataLabRenderManager, EntitiesIdsRenderManager, EntitiesLoadedRenderManager, EntitiesRenderManager, EntityRenderManager, AssemblyRenderManager, GoogleSearchRenderManager, RelationsRenderManager, RenderManager, TilesetArbRenderManager, TilesetCadRenderManager, TilesetEntitiesRenderManager, TilesetGooglePhotosRenderManager, TilesetOsmRenderManager, TilesetPointcloudRenderManager, TileRenderEngine, createTileset, TilesetRenderEngine, ViewRenderEngine, VisualsRegister, XGridsRenderEngine, CesiumEntityStyler, DrawingUtils, EntityUtils, MeasureUtils, StyleUtils, CESIUM_INSPECTOR_KEY, CESIUM_TIMELINE_KEY, CESIUM_TIMELINE_LIVE_KEY, CESIUM_TIMELINE_LIVE_PADDING_KEY, CESIUM_TIMELINE_INTERVAL_KEY, CESIUM_MODEL_SPACE_KEY, DEFAULT_LIVE_PADDING_SECONDS, ViewUtils, CesiumViewMonitor, ViewGroundArea, ViewerEventTracker, ViewerUtils, Draw3dPolygon, Draw3dPolyline, MeasureCreator, Walkthrough, WidgetControlViewBar, WidgetControlViewBarSearch, WidgetLeftPanelTab, WidgetLeftPanelTabBookmarks, Widget, VIEWER_BOOKMARKS_WIDGET_KEY, WidgetBookmarks, WidgetBranding, WidgetCursorBar, WidgetEmbeddedInfoView, WidgetInfoView, VIEWER_LEFT_PANEL_WIDGET_KEY, VIEWER_LEFT_PANEL_CSS_VAR_LEFT, WidgetLeftPanel, WidgetNavCompass$$1 as WidgetNavCompass, VIEWER_VIEW_BAR_WIDGET_KEY, WidgetViewBar };
+export { VERSION, setENVIRONMENT, getENVIRONMENT, CesiumAnimatedInOut, CesiumAnimatedProperty, isStyleChanged, isOutlineChanged$1 as isOutlineChanged, StyleEffective, EntityRenderEngine, EntityRenderEngineModel3d, EntityRenderEnginePoint, EntityRenderEnginePolygon, EntityRenderEnginePolyline, MenuItemCreator, MenuItemManager, CesiumParabola, EntityLabel, LiveCursor, SharedGetters, DataSourceStaticKmlManager, DataLabRenderManager, EntitiesIdsRenderManager, EntitiesLoadedRenderManager, EntitiesRenderManager, EntityRenderManager, AssemblyRenderManager, GoogleSearchRenderManager, RelationsRenderManager, RenderManager, TilesetArbRenderManager, TilesetCadRenderManager, TilesetEntitiesRenderManager, TilesetGooglePhotosRenderManager, TilesetOsmRenderManager, TilesetPointcloudRenderManager, TileRenderEngine, createTileset, TilesetRenderEngine, ViewRenderEngine, VisualRegisterCuller, VisualsRegister, XGridsRenderEngine, CesiumEntityStyler, DrawingUtils, EntityUtils, MeasureUtils, StyleUtils, CESIUM_INSPECTOR_KEY, CESIUM_TIMELINE_KEY, CESIUM_TIMELINE_LIVE_KEY, CESIUM_TIMELINE_LIVE_PADDING_KEY, CESIUM_TIMELINE_INTERVAL_KEY, CESIUM_MODEL_SPACE_KEY, DEFAULT_LIVE_PADDING_SECONDS, ViewUtils, CesiumViewMonitor, ViewGroundArea, ViewerEventTracker, ViewerUtils, Draw3dPolygon, Draw3dPolyline, MeasureCreator, Walkthrough, WidgetControlViewBar, WidgetControlViewBarSearch, WidgetLeftPanelTab, WidgetLeftPanelTabBookmarks, Widget, VIEWER_BOOKMARKS_WIDGET_KEY, WidgetBookmarks, WidgetBranding, WidgetCursorBar, WidgetEmbeddedInfoView, WidgetInfoView, VIEWER_LEFT_PANEL_WIDGET_KEY, VIEWER_LEFT_PANEL_CSS_VAR_LEFT, WidgetLeftPanel, WidgetNavCompass$$1 as WidgetNavCompass, VIEWER_VIEW_BAR_WIDGET_KEY, WidgetViewBar };
 //# sourceMappingURL=bruce-cesium.es5.js.map