bruce-cesium 6.8.5 → 6.8.7

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, HeightReference, ColorBlendMode, HeadingPitchRoll, Math as Math$1, Transforms, ShadowMode, Cartesian3, ClassificationType, Model, JulianDate, Quaternion, Matrix4, PolygonHierarchy, ConstantPositionProperty, PolylineGraphics, ArcType, CornerType, HorizontalOrigin, VerticalOrigin, 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, CesiumInspector, ClockRange, BoundingSphere, GeometryInstance, ScreenSpaceEventHandler, ScreenSpaceEventType, Intersect, CzmlDataSource, Fullscreen } from 'cesium';
-import { Cartes, Entity as Entity$1, ENVIRONMENT, Calculator, ClientFile, EntityLod, EntityTag, EntityType, LRUCache, ObjectUtils, Style, Bounds, Geometry, Carto, MenuItem, ProjectView, ProjectViewBookmark, Tileset, ZoomControl, BruceEvent, EntityCoords, Api, DelayQueue, EntityHistoricData, DataLab, BruceApi, EntityRelation, AccountConcept, RecordChangeFeed, 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, HorizontalOrigin, VerticalOrigin, ConstantPositionProperty, ArcType, CornerType, JulianDate, Quaternion, Matrix4, PolygonHierarchy, PolylineGraphics, Cartesian2, SceneTransforms, Rectangle, NearFarScalar, Matrix3, KmlDataSource, GeoJsonDataSource, SceneMode, Cesium3DTileStyle, HeadingPitchRange, Ion, IonResource, Cesium3DTileColorBlendMode, EllipsoidTerrainProvider, IonImageryProvider, createWorldImagery, createWorldImageryAsync, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, CesiumTerrainProvider, OrthographicFrustum, EasingFunction, Cesium3DTileset, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, EllipsoidGeodesic, sampleTerrainMostDetailed, defined, PolygonPipeline, CesiumInspector, ClockRange, BoundingSphere, GeometryInstance, ScreenSpaceEventHandler, ScreenSpaceEventType, Intersect, CzmlDataSource, Fullscreen } from 'cesium';
+import { Cartes, Entity as Entity$1, ENVIRONMENT, Calculator, ClientFile, EntityLod, EntityTag, EntityType, LRUCache, ObjectUtils, Style, Api, Carto, Geometry, MenuItem, ProjectView, ProjectViewBookmark, Tileset, ZoomControl, Bounds, BruceEvent, EntityCoords, DataLab, DelayQueue, EntityHistoricData, BruceApi, EntityRelation, ProgramKey, EntitySource, ProjectViewLegacyTile, ProjectViewTile, AccountConcept, RecordChangeFeed, Camera, Session, EntityAttachment, EntityAttachmentType, EntityAttribute, MathUtils, EntityRelationType } from 'bruce-models';
 
 /**
  * Ensures a number is returned from a given value.
@@ -14290,7 +14290,7 @@ var TilesetCadRenderManager;
             // We calculate it here instead of relying on the render engine as we need to extract the model-tree from it.
             let loadUrl = null;
             (async () => {
-                var _a, _b, _c, _d;
+                var _a, _b, _c, _d, _e;
                 if (!this.initQueue) {
                     await delay(INIT_BATCH_DELAY_MS);
                     if (this.disposed) {
@@ -14375,7 +14375,8 @@ var TilesetCadRenderManager;
                 // TODO: this is a problem as we need to know what nodes are collapsed...
                 // In >v1 the model-tree sits in its own file.
                 if (((_c = tileset.settings) === null || _c === void 0 ? void 0 : _c["tilesetVersion"]) > 1) {
-                    const modelTreeUrl = Tileset.GetFileUrl({
+                    // Newer APIs precalculate this URL.
+                    const modelTreeUrl = (_d = tileset.urlModelTree) !== null && _d !== void 0 ? _d : Tileset.GetFileUrl({
                         api: api,
                         file: "model_tree.json",
                         tilesetId: tileset.id,
@@ -14420,7 +14421,7 @@ var TilesetCadRenderManager;
                 const rootId = settings.rootEntityId;
                 this.rootId = rootId;
                 // If historic, we'll see if the root Entity has a historic position to use.
-                if (((_d = this.item.BruceEntity) === null || _d === void 0 ? void 0 : _d.historic) && rootId) {
+                if (((_e = this.item.BruceEntity) === null || _e === void 0 ? void 0 : _e.historic) && rootId) {
                     try {
                         const { entity: root } = await Entity$1.Get({
                             entityId: rootId,
@@ -22160,7 +22161,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;
             }
@@ -22188,17 +22189,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.
@@ -22272,7 +22269,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
                             });
@@ -22287,7 +22284,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) {
@@ -22304,7 +22301,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);
@@ -22315,7 +22312,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,
@@ -22523,8 +22520,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;
         }
@@ -35074,7 +35071,7 @@ var EntityRenderEngineModel3d;
      * @returns
      */
     async function RenderGroup(params) {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g;
         const api = params.apiGetter.getApi();
         await api.Loading;
         const cEntities = new Map();
@@ -35184,7 +35181,7 @@ var EntityRenderEngineModel3d;
                 style: mStyle,
                 tags: tags,
                 viewer: params.viewer,
-                lodUrl: ClientFile.GetUrl({
+                lodUrl: (_g = lod.url) !== null && _g !== void 0 ? _g : ClientFile.GetUrl({
                     api,
                     fileId: lod.clientFileId,
                     viaCdn: true
@@ -37570,7 +37567,7 @@ var StyleUtils;
     StyleUtils.ApplyTypeStyle = ApplyTypeStyle;
 })(StyleUtils || (StyleUtils = {}));
 
-const VERSION = "6.8.5";
+const VERSION = "6.8.7";
 /**
  * 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.