bruce-cesium 6.8.4 → 6.8.6

package/dist/bruce-cesium.es5.js

@@ -1,6 +1,6 @@
 import * as Cesium from 'cesium';
-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, 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, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, EllipsoidGeodesic, sampleTerrainMostDetailed, defined, BoundingSphere, GeometryInstance, PolygonPipeline, CesiumInspector, ClockRange, ScreenSpaceEventHandler, ScreenSpaceEventType, Intersect, CzmlDataSource, Fullscreen } from 'cesium';
-import { Cartes, Entity as Entity$1, ENVIRONMENT, Calculator, ClientFile, EntityLod, EntityTag, EntityType, LRUCache, ObjectUtils, Style, Api, Bounds, 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';
+import { Cartographic, ColorMaterialProperty, Entity, Color, ConstantProperty, CallbackProperty, Primitive, Cesium3DTileFeature, DistanceDisplayCondition, Math as Math$1, Cartesian3, JulianDate, Quaternion, Transforms, HeadingPitchRoll, Matrix4, HeightReference, HorizontalOrigin, VerticalOrigin, ClassificationType, ConstantPositionProperty, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, Cartesian2, ColorBlendMode, Model, Rectangle, SceneTransforms, KmlDataSource, NearFarScalar, Matrix3, GeoJsonDataSource, Cesium3DTileStyle, HeadingPitchRange, SceneMode, Ion, IonResource, Cesium3DTileColorBlendMode, OrthographicFrustum, EasingFunction, EllipsoidGeodesic, EllipsoidTerrainProvider, sampleTerrainMostDetailed, defined, Cesium3DTileset, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, PolygonPipeline, CesiumInspector, ClockRange, IonImageryProvider, createWorldImagery, createWorldImageryAsync, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, CesiumTerrainProvider, ScreenSpaceEventHandler, ScreenSpaceEventType, BoundingSphere, GeometryInstance, Intersect, CzmlDataSource, Fullscreen } from 'cesium';
+import { Cartes, Entity as Entity$1, ENVIRONMENT, Api, Calculator, ClientFile, EntityTag, EntityType, LRUCache, ObjectUtils, Style, MenuItem, ProjectView, ProjectViewBookmark, Tileset, ZoomControl, Carto, Geometry, Bounds, EntityLod, BruceEvent, EntityCoords, DataLab, DelayQueue, BruceApi, EntityHistoricData, EntityRelation, AccountConcept, RecordChangeFeed, ProgramKey, EntitySource, Camera, ProjectViewTile, ProjectViewLegacyTile, EntityAttachment, EntityAttachmentType, EntityAttribute, MathUtils, Session, EntityRelationType } from 'bruce-models';
 
 /**
  * Ensures a number is returned from a given value.
@@ -10700,7 +10700,7 @@ var EntitiesRenderManager;
             if ((_a = payload.renderQueue) === null || _a === void 0 ? void 0 : _a.length) {
                 this.distributeForRender(payload.renderQueue);
             }
-            this.doEntityCheck(Object.keys(this.renderedEntities));
+            this.ReRender({ entityIds: Object.keys(this.renderedEntities), force: true });
             this.viewer.scene.requestRender();
         }
     }
@@ -17140,7 +17140,7 @@ var DataLabRenderManager;
             if ((_a = payload.renderQueue) === null || _a === void 0 ? void 0 : _a.length) {
                 this.distributeForRender(payload.renderQueue);
             }
-            this.doEntityCheck(Object.keys(this.renderedEntities));
+            this.ReRender({ entityIds: Object.keys(this.renderedEntities), force: true });
             this.viewer.scene.requestRender();
         }
     }
@@ -18368,7 +18368,9 @@ var TilesetEntitiesRenderManager;
                 return null;
             }
             const accountId = ((_b = item.tileset) === null || _b === void 0 ? void 0 : _b.ClientAccountID) || "";
-            return `${accountId}:${tilesetId}`;
+            // Styled <-> unstyled has no cheap revert path, force a reload instead.
+            const applyStyles = Boolean(item.ApplyStyles);
+            return `${accountId}:${tilesetId}:${applyStyles}`;
         }
         // Returns null (fall back to a normal Dispose()) if the tileset hasn't finished loading yet.
         PrepareHandoff() {
@@ -22158,7 +22160,7 @@ var MenuItemManager;
          * @returns
          */
         RenderItem(params) {
-            var _a, _b, _c, _d, _e, _f, _g, _h;
+            var _a, _b, _c, _d, _e, _f, _g;
             if (this.viewer.isDestroyed()) {
                 return null;
             }
@@ -22186,17 +22188,13 @@ var MenuItemManager;
             let create = true;
             // Item already exists so we'll check if we should re-create it.
             if (rItem) {
-                // This means we're updating a tag menu item.
-                // Tag menu items have alternative states based on bookmark settings.
-                // Eg: different tags that were enabled.
+                // This means we're updating an entities menu item re-using the same id.
+                // Eg: a bookmark swap that keeps the same item but changes tags, style, or zoom settings.
                 if (rItem.type == MenuItem.EType.Entities && params.item.Type == MenuItem.EType.Entities) {
-                    const eItem = rItem.item;
-                    if ((_a = eItem === null || eItem === void 0 ? void 0 : eItem.BruceEntity) === null || _a === void 0 ? void 0 : _a.ExpandLayers) {
-                        rItem.renderManager.Init({
-                            item: params.item,
-                        });
-                        rItem.item = params.item;
-                    }
+                    rItem.renderManager.Init({
+                        item: params.item,
+                    });
+                    rItem.item = params.item;
                     create = false;
                 }
                 // This means we're updating a entities tileset menu item.
@@ -22270,7 +22268,7 @@ var MenuItemManager;
                     const oRenderManager = rItem.renderManager;
                     const oItem = params.item;
                     if (oRenderManager && oItem) {
-                        if (+oRenderManager.SourceId == +((_b = oItem.BruceEntity) === null || _b === void 0 ? void 0 : _b.SourceId) && oRenderManager.EntityTypeId == ((_c = oItem.BruceEntity) === null || _c === void 0 ? void 0 : _c["EntityType.ID"])) {
+                        if (+oRenderManager.SourceId == +((_a = oItem.BruceEntity) === null || _a === void 0 ? void 0 : _a.SourceId) && oRenderManager.EntityTypeId == ((_b = oItem.BruceEntity) === null || _b === void 0 ? void 0 : _b["EntityType.ID"])) {
                             oRenderManager.Init({
                                 item: oItem
                             });
@@ -22285,7 +22283,7 @@ var MenuItemManager;
                     const eIdsItem = params.item;
                     if (eIdsRenderManager && eIdsItem) {
                         const eEntityIds = eIdsRenderManager.EntityIds;
-                        const mEntityIds = (_d = eIdsItem.BruceEntity) === null || _d === void 0 ? void 0 : _d.EntityIds;
+                        const mEntityIds = (_c = eIdsItem.BruceEntity) === null || _c === void 0 ? void 0 : _c.EntityIds;
                         const eEntityIdsStr = eEntityIds ? eEntityIds.join(",") : "";
                         const mEntityIdsStr = mEntityIds ? mEntityIds.join(",") : "";
                         if (eEntityIdsStr == mEntityIdsStr) {
@@ -22302,7 +22300,7 @@ var MenuItemManager;
                 }
                 if (create) {
                     try {
-                        (_e = rItem.renderManager) === null || _e === void 0 ? void 0 : _e.Dispose();
+                        (_d = rItem.renderManager) === null || _d === void 0 ? void 0 : _d.Dispose();
                     }
                     catch (e) {
                         console.error(e);
@@ -22313,7 +22311,7 @@ var MenuItemManager;
             if (create) {
                 if (!rItem) {
                     rItem = {
-                        id: (_f = params.item.id) !== null && _f !== void 0 ? _f : ObjectUtils.UId(),
+                        id: (_e = params.item.id) !== null && _e !== void 0 ? _e : ObjectUtils.UId(),
                         childIds: [],
                         item: params.item,
                         renderManager: null,
@@ -22521,8 +22519,8 @@ var MenuItemManager;
                     rItem.childIds.push(childId);
                 }
             }
-            if (rItem.renderManager && !((_g = rItem.renderManager) === null || _g === void 0 ? void 0 : _g.Disposed)) {
-                (_h = this.onUpdate) === null || _h === void 0 ? void 0 : _h.Trigger({ isEnabling: true, itemId: rItem.id });
+            if (rItem.renderManager && !((_f = rItem.renderManager) === null || _f === void 0 ? void 0 : _f.Disposed)) {
+                (_g = this.onUpdate) === null || _g === void 0 ? void 0 : _g.Trigger({ isEnabling: true, itemId: rItem.id });
             }
             return rItem.id;
         }
@@ -37568,7 +37566,7 @@ var StyleUtils;
     StyleUtils.ApplyTypeStyle = ApplyTypeStyle;
 })(StyleUtils || (StyleUtils = {}));
 
-const VERSION = "6.8.4";
+const VERSION = "6.8.6";
 /**
  * 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.