bruce-cesium 3.9.9 → 4.0.1

package/dist/bruce-cesium.es5.js

@@ -1,6 +1,6 @@
 import { BruceEvent, Cartes, Carto, Entity as Entity$1, Geometry, Tileset, MathUtils, LRUCache, ProjectViewTile, DelayQueue, ZoomControl, Style, EntityTag, Calculator, EntityLod, EntityType, ClientFile, ObjectUtils, Bounds, Api, EntityRelationType, ENVIRONMENT, EntityHistoricData, EntityCoords, EntitySource, MenuItem, EntityRelation, ProgramKey, AbstractApi, ProjectViewBookmark, EntityAttachment, EntityAttachmentType, EntityAttribute, ProjectView, ProjectViewLegacyTile, Camera } from 'bruce-models';
 import * as Cesium from 'cesium';
-import { Cartographic, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, JulianDate, Entity, Primitive, Cesium3DTileFeature, DistanceDisplayCondition, NearFarScalar, Model, ColorMaterialProperty, HorizontalOrigin, VerticalOrigin, ConstantProperty, ConstantPositionProperty, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, ColorBlendMode, HeadingPitchRoll, Transforms, SceneMode, GeoJsonDataSource, Cesium3DTileColorBlendMode, HeadingPitchRange, Ion, Cesium3DTileStyle, KmlDataSource, SceneTransforms, OrthographicFrustum, EasingFunction, EllipsoidTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, CesiumTerrainProvider, Cesium3DTileset, Matrix4, Matrix3, IonResource, CesiumInspector, defined, ClockRange, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, BoundingSphere, GeometryInstance, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, ScreenSpaceEventHandler, ScreenSpaceEventType, CzmlDataSource, Quaternion, Intersect } from 'cesium';
+import { Cartographic, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, JulianDate, DistanceDisplayCondition, NearFarScalar, Model, ColorMaterialProperty, Entity, HorizontalOrigin, VerticalOrigin, ConstantProperty, ConstantPositionProperty, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, ColorBlendMode, HeadingPitchRoll, Transforms, Primitive, Cesium3DTileFeature, SceneMode, GeoJsonDataSource, Cesium3DTileColorBlendMode, HeadingPitchRange, Ion, Cesium3DTileStyle, KmlDataSource, SceneTransforms, OrthographicFrustum, EasingFunction, EllipsoidGeodesic, EllipsoidTerrainProvider, sampleTerrainMostDetailed, defined, Cesium3DTileset, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, CesiumTerrainProvider, Matrix4, Matrix3, IonResource, PolygonPipeline, CesiumInspector, ClockRange, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, BoundingSphere, GeometryInstance, ScreenSpaceEventHandler, ScreenSpaceEventType, CzmlDataSource, Quaternion, Intersect } from 'cesium';
 
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation. All rights reserved.
@@ -2417,11 +2417,11 @@ var EntityUtils;
                             });
                         }); };
                         getEntityPositions = function (sample) { return __awaiter(_this, void 0, void 0, function () {
-                            var entityId, entity, tileset, tilesetId, disallowRendered, evaluateRendered, evaluateRecord, renderedPosses, e_1, recordPosses, e_2, tSettings, pos3d, eLocation, alt, alt, eTransform, heading, pitch, roll, matrix4, offset, m1, hpr, transform, transformedOffset, sphere;
+                            var entityId, entity, tileset, tilesetId, disallowRendered, evaluateRendered, evaluateRecord, renderedPosses, e_1, recordPosses, e_2, tilesetIds, tSettings, pos3d, eLocation, alt, alt, worldPosition, eTransform, heading, pitch, roll, matrix4, offset, m1, hpr, transform, transformedOffset, geometryRadius, sphere;
                             var _this = this;
-                            var _a, _b, _c, _d, _e;
-                            return __generator(this, function (_f) {
-                                switch (_f.label) {
+                            var _a, _b, _c, _d;
+                            return __generator(this, function (_e) {
+                                switch (_e.label) {
                                     case 0:
                                         entityId = sample.entityId, entity = sample.entity, tileset = sample.tileset, tilesetId = sample.tilesetId, disallowRendered = sample.disallowRendered;
                                         evaluateRendered = function () { return __awaiter(_this, void 0, void 0, function () {
@@ -2582,7 +2582,7 @@ var EntityUtils;
                                                         posses = [];
                                                         location = Entity$1.GetValue({
                                                             entity: entity,
-                                                            path: ["location"]
+                                                            path: ["Bruce", "location"]
                                                         });
                                                         if (location && typeof location == "object" && Carto.ValidateCarto(location)) {
                                                             latitude = EnsureNumber(location.latitude);
@@ -2595,7 +2595,7 @@ var EntityUtils;
                                                         }
                                                         geometry = Entity$1.GetValue({
                                                             entity: entity,
-                                                            path: ["geometry"]
+                                                            path: ["Bruce", "geometry"]
                                                         });
                                                         if (!(geometry && typeof geometry == "object")) return [3 /*break*/, 4];
                                                         pointStr = geometry.Point;
@@ -2659,18 +2659,18 @@ var EntityUtils;
                                         if (!(disallowRendered != true)) return [3 /*break*/, 2];
                                         return [4 /*yield*/, evaluateRendered()];
                                     case 1:
-                                        renderedPosses = _f.sent();
+                                        renderedPosses = _e.sent();
                                         if (renderedPosses === null || renderedPosses === void 0 ? void 0 : renderedPosses.length) {
                                             return [2 /*return*/, renderedPosses];
                                         }
-                                        _f.label = 2;
+                                        _e.label = 2;
                                     case 2:
                                         if (!!entity) return [3 /*break*/, 6];
                                         if (!(apiCalls < MAX_API_CALLS)) return [3 /*break*/, 6];
                                         apiCalls += 1;
-                                        _f.label = 3;
+                                        _e.label = 3;
                                     case 3:
-                                        _f.trys.push([3, 5, , 6]);
+                                        _e.trys.push([3, 5, , 6]);
                                         return [4 /*yield*/, Entity$1.Get({
                                                 api: api,
                                                 entityId: entityId,
@@ -2678,10 +2678,10 @@ var EntityUtils;
                                                 expandLocation: false
                                             })];
                                     case 4:
-                                        entity = (_f.sent()).entity;
+                                        entity = (_e.sent()).entity;
                                         return [3 /*break*/, 6];
                                     case 5:
-                                        e_1 = _f.sent();
+                                        e_1 = _e.sent();
                                         console.error(e_1);
                                         return [3 /*break*/, 6];
                                     case 6:
@@ -2690,14 +2690,14 @@ var EntityUtils;
                                         }
                                         return [4 /*yield*/, evaluateRecord()];
                                     case 7:
-                                        recordPosses = _f.sent();
+                                        recordPosses = _e.sent();
                                         if (recordPosses === null || recordPosses === void 0 ? void 0 : recordPosses.length) {
                                             return [2 /*return*/, recordPosses];
                                         }
                                         if (!(apiCalls < MAX_API_CALLS)) return [3 /*break*/, 11];
-                                        _f.label = 8;
+                                        _e.label = 8;
                                     case 8:
-                                        _f.trys.push([8, 10, , 11]);
+                                        _e.trys.push([8, 10, , 11]);
                                         apiCalls += 1;
                                         return [4 /*yield*/, Entity$1.Get({
                                                 api: api,
@@ -2706,15 +2706,19 @@ var EntityUtils;
                                                 expandLocation: true
                                             })];
                                     case 9:
-                                        entity = (_f.sent()).entity;
+                                        entity = (_e.sent()).entity;
                                         return [3 /*break*/, 11];
                                     case 10:
-                                        e_2 = _f.sent();
+                                        e_2 = _e.sent();
                                         console.warn(e_2);
                                         return [3 /*break*/, 11];
                                     case 11:
                                         if (!tilesetId) {
-                                            tilesetId = ((_a = entity.tilesetID) === null || _a === void 0 ? void 0 : _a.length) ? entity.tilesetID[0] : tilesetId;
+                                            tilesetIds = Entity$1.GetValue({
+                                                entity: entity,
+                                                path: ["Bruce", "tilesetID"]
+                                            });
+                                            tilesetId = (tilesetIds === null || tilesetIds === void 0 ? void 0 : tilesetIds.length) ? tilesetIds[0] : tilesetId;
                                         }
                                         if (!!tileset) return [3 /*break*/, 13];
                                         if (!(tilesetId && apiCalls < MAX_API_CALLS)) return [3 /*break*/, 13];
@@ -2724,16 +2728,16 @@ var EntityUtils;
                                                 tilesetId: tilesetId
                                             })];
                                     case 12:
-                                        tileset = (_f.sent()).tileset;
-                                        _f.label = 13;
+                                        tileset = (_e.sent()).tileset;
+                                        _e.label = 13;
                                     case 13:
                                         tSettings = tileset === null || tileset === void 0 ? void 0 : tileset.settings;
                                         pos3d = null;
                                         eLocation = Entity$1.GetValue({
                                             entity: entity,
-                                            path: ["location"]
+                                            path: ["Bruce", "location"]
                                         });
-                                        if (!((eLocation === null || eLocation === void 0 ? void 0 : eLocation.longitude) || ((_b = tSettings === null || tSettings === void 0 ? void 0 : tSettings.location) === null || _b === void 0 ? void 0 : _b.longitude))) return [3 /*break*/, 16];
+                                        if (!((eLocation === null || eLocation === void 0 ? void 0 : eLocation.longitude) || ((_a = tSettings === null || tSettings === void 0 ? void 0 : tSettings.location) === null || _a === void 0 ? void 0 : _a.longitude))) return [3 /*break*/, 16];
                                         if (eLocation === null || eLocation === void 0 ? void 0 : eLocation.longitude) {
                                             alt = +eLocation.altitude;
                                             if (isNaN(alt)) {
@@ -2748,10 +2752,14 @@ var EntityUtils;
                                             }
                                             pos3d = Cartesian3.fromDegrees(+tSettings.location.longitude, +tSettings.location.latitude, alt);
                                         }
-                                        if (!(entity === null || entity === void 0 ? void 0 : entity.worldPosition)) return [3 /*break*/, 16];
+                                        worldPosition = Entity$1.GetValue({
+                                            entity: entity,
+                                            path: ["Bruce", "transform", "worldPosition"]
+                                        });
+                                        if (!worldPosition) return [3 /*break*/, 16];
                                         eTransform = Entity$1.GetValue({
                                             entity: entity,
-                                            path: ["transform"]
+                                            path: ["Bruce", "transform"]
                                         });
                                         heading = 0;
                                         pitch = 0;
@@ -2759,19 +2767,19 @@ var EntityUtils;
                                         if (eTransform === null || eTransform === void 0 ? void 0 : eTransform.heading) {
                                             heading = eTransform.heading;
                                         }
-                                        else if ((_c = tSettings === null || tSettings === void 0 ? void 0 : tSettings.transform) === null || _c === void 0 ? void 0 : _c.heading) {
+                                        else if ((_b = tSettings === null || tSettings === void 0 ? void 0 : tSettings.transform) === null || _b === void 0 ? void 0 : _b.heading) {
                                             heading = tSettings.transform.heading;
                                         }
                                         if (eTransform === null || eTransform === void 0 ? void 0 : eTransform.pitch) {
                                             pitch = eTransform.pitch;
                                         }
-                                        else if ((_d = tSettings === null || tSettings === void 0 ? void 0 : tSettings.transform) === null || _d === void 0 ? void 0 : _d.pitch) {
+                                        else if ((_c = tSettings === null || tSettings === void 0 ? void 0 : tSettings.transform) === null || _c === void 0 ? void 0 : _c.pitch) {
                                             pitch = tSettings.transform.pitch;
                                         }
                                         if (eTransform === null || eTransform === void 0 ? void 0 : eTransform.roll) {
                                             roll = eTransform.roll;
                                         }
-                                        else if ((_e = tSettings === null || tSettings === void 0 ? void 0 : tSettings.transform) === null || _e === void 0 ? void 0 : _e.roll) {
+                                        else if ((_d = tSettings === null || tSettings === void 0 ? void 0 : tSettings.transform) === null || _d === void 0 ? void 0 : _d.roll) {
                                             roll = tSettings.transform.roll;
                                         }
                                         heading = +heading;
@@ -2786,7 +2794,7 @@ var EntityUtils;
                                         if (isNaN(roll)) {
                                             roll = 0;
                                         }
-                                        matrix4 = entity.worldPosition;
+                                        matrix4 = worldPosition;
                                         offset = new Cartesian3(+matrix4[0][3], +matrix4[1][3], +matrix4[2][3]);
                                         if (entity.worldPivot) //the position from worldMatrix + center of geometry offset
                                          {
@@ -2800,18 +2808,22 @@ var EntityUtils;
                                         if (!(pos3d === null || pos3d === void 0 ? void 0 : pos3d.x)) return [3 /*break*/, 15];
                                         return [4 /*yield*/, processPosHeight(pos3d, HeightReference.NONE)];
                                     case 14:
-                                        pos3d = _f.sent();
-                                        _f.label = 15;
+                                        pos3d = _e.sent();
+                                        _e.label = 15;
                                     case 15:
-                                        if ((entity === null || entity === void 0 ? void 0 : entity.geometryRadius) && (pos3d === null || pos3d === void 0 ? void 0 : pos3d.x)) {
+                                        geometryRadius = Entity$1.GetValue({
+                                            entity: entity,
+                                            path: ["Bruce", "geometryRadius"]
+                                        });
+                                        if (geometryRadius && (pos3d === null || pos3d === void 0 ? void 0 : pos3d.x)) {
                                             sphere = BoundingSphere.fromPoints([pos3d]);
                                             // For now making sure it's less than x amount because we had a bug which made it huge.
-                                            if (entity.geometryRadius && entity.geometryRadius < 500 && entity.geometryRadius > 1) {
-                                                sphere.radius = entity.geometryRadius;
+                                            if (geometryRadius && geometryRadius < 500 && geometryRadius > 1) {
+                                                sphere.radius = geometryRadius;
                                                 spheres.push(sphere);
                                             }
                                         }
-                                        _f.label = 16;
+                                        _e.label = 16;
                                     case 16:
                                         if (pos3d) {
                                             return [2 /*return*/, [pos3d]];
@@ -2974,7 +2986,7 @@ var EntityUtils;
         function evaluateRecord() {
             var location = Entity$1.GetValue({
                 entity: entity,
-                path: ["location"]
+                path: ["Bruce", "location"]
             });
             if (location && typeof location == "object" && Carto.ValidateCarto(location)) {
                 var latitude = EnsureNumber(location.latitude);
@@ -2986,7 +2998,7 @@ var EntityUtils;
             }
             var geometry = Entity$1.GetValue({
                 entity: entity,
-                path: ["geometry"]
+                path: ["Bruce", "geometry"]
             });
             if (geometry && typeof geometry == "object") {
                 var pointStr = geometry.Point;
@@ -3034,7 +3046,7 @@ var EntityUtils;
             }
             var boundaries = Entity$1.GetValue({
                 entity: entity,
-                path: ["boundaries"]
+                path: ["Bruce", "boundaries"]
             });
             if (boundaries && typeof boundaries == "object") {
                 var point = {
@@ -3071,54 +3083,54 @@ var EntityUtils;
      * @returns
      */
     function GetPosAsync(params) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function () {
-            var viewer, entityId, entity, tileset, tilesetId, visualRegister, returnHeightRef, recordHeightRef, api, lat, lon, location_1, e_3, e_4, pos3d, tSettings, eLocation, alt, alt, heading, pitch, roll, eTransform, matrix4, offset, m1, hpr, transform, transformedOffset;
-            return __generator(this, function (_f) {
-                switch (_f.label) {
+            var viewer, entityId, entity, tileset, tilesetId, visualRegister, returnHeightRef, recordHeightRef, api, lat, lon, location_1, e_3, e_4, tilesetIds, pos3d, tSettings, eLocation, alt, alt, worldPosition, heading, pitch, roll, eTransform, matrix4, offset, m1, hpr, transform, transformedOffset;
+            return __generator(this, function (_e) {
+                switch (_e.label) {
                     case 0:
                         viewer = params.viewer, entityId = params.entityId, entity = params.entity, tileset = params.tileset, tilesetId = params.tilesetId, visualRegister = params.visualRegister, returnHeightRef = params.returnHeightRef, recordHeightRef = params.recordHeightRef, api = params.api;
                         if (!!entity) return [3 /*break*/, 9];
                         lat = 0;
                         lon = 0;
-                        _f.label = 1;
+                        _e.label = 1;
                     case 1:
-                        _f.trys.push([1, 3, , 4]);
+                        _e.trys.push([1, 3, , 4]);
                         return [4 /*yield*/, Entity$1.Get({
                                 api: api,
                                 entityId: entityId,
                                 expandLocation: false
                             })];
                     case 2:
-                        entity = (_f.sent()).entity;
+                        entity = (_e.sent()).entity;
                         if (entity) {
                             location_1 = Entity$1.GetValue({
                                 entity: entity,
-                                path: ["location"]
+                                path: ["Bruce", "location"]
                             });
                             lat = +(location_1 === null || location_1 === void 0 ? void 0 : location_1.latitude);
                             lon = +(location_1 === null || location_1 === void 0 ? void 0 : location_1.longitude);
                         }
                         return [3 /*break*/, 4];
                     case 3:
-                        e_3 = _f.sent();
+                        e_3 = _e.sent();
                         console.error(e_3);
                         return [3 /*break*/, 4];
                     case 4:
                         if (!(entity && (isNaN(lat) || isNaN(lon) || (lat == 0 && lon == 0)))) return [3 /*break*/, 9];
-                        _f.label = 5;
+                        _e.label = 5;
                     case 5:
-                        _f.trys.push([5, 7, , 9]);
+                        _e.trys.push([5, 7, , 9]);
                         return [4 /*yield*/, Entity$1.Get({
                                 api: api,
                                 entityId: entityId,
                                 expandLocation: true
                             })];
                     case 6:
-                        entity = (_f.sent()).entity;
+                        entity = (_e.sent()).entity;
                         return [3 /*break*/, 9];
                     case 7:
-                        e_4 = _f.sent();
+                        e_4 = _e.sent();
                         console.warn(e_4);
                         return [4 /*yield*/, Entity$1.Get({
                                 api: api,
@@ -3126,14 +3138,18 @@ var EntityUtils;
                                 expandLocation: false
                             })];
                     case 8:
-                        entity = (_f.sent()).entity;
+                        entity = (_e.sent()).entity;
                         return [3 /*break*/, 9];
                     case 9:
                         if (!entity) {
                             return [2 /*return*/, null];
                         }
                         if (!tilesetId) {
-                            tilesetId = ((_a = entity.tilesetID) === null || _a === void 0 ? void 0 : _a.length) ? entity.tilesetID[0] : tilesetId;
+                            tilesetIds = Entity$1.GetValue({
+                                entity: entity,
+                                path: ["Bruce", "tilesetID"]
+                            });
+                            tilesetId = (tilesetIds === null || tilesetIds === void 0 ? void 0 : tilesetIds.length) ? tilesetIds[0] : tilesetId;
                         }
                         pos3d = tilesetId ? null : GetPos({
                             viewer: viewer,
@@ -3152,15 +3168,15 @@ var EntityUtils;
                                 tilesetId: tilesetId
                             })];
                     case 10:
-                        tileset = (_f.sent()).tileset;
-                        _f.label = 11;
+                        tileset = (_e.sent()).tileset;
+                        _e.label = 11;
                     case 11:
                         tSettings = tileset === null || tileset === void 0 ? void 0 : tileset.settings;
                         eLocation = Entity$1.GetValue({
                             entity: entity,
-                            path: ["location"]
+                            path: ["Bruce", "location"]
                         });
-                        if ((eLocation === null || eLocation === void 0 ? void 0 : eLocation.longitude) || ((_b = tSettings === null || tSettings === void 0 ? void 0 : tSettings.location) === null || _b === void 0 ? void 0 : _b.longitude)) {
+                        if ((eLocation === null || eLocation === void 0 ? void 0 : eLocation.longitude) || ((_a = tSettings === null || tSettings === void 0 ? void 0 : tSettings.location) === null || _a === void 0 ? void 0 : _a.longitude)) {
                             if (eLocation === null || eLocation === void 0 ? void 0 : eLocation.longitude) {
                                 alt = +eLocation.altitude;
                                 if (isNaN(alt)) {
@@ -3175,31 +3191,34 @@ var EntityUtils;
                                 }
                                 pos3d = Cartesian3.fromDegrees(+tSettings.location.longitude, +tSettings.location.latitude, alt);
                             }
-                            // World position = we got lat/lon/alt from the tileset, now we need to apply relative movement.
-                            if (entity === null || entity === void 0 ? void 0 : entity.worldPosition) {
+                            worldPosition = Entity$1.GetValue({
+                                entity: entity,
+                                path: ["Bruce", "transform", "worldPosition"]
+                            });
+                            if (worldPosition) {
                                 heading = 0;
                                 pitch = 0;
                                 roll = 0;
                                 eTransform = Entity$1.GetValue({
                                     entity: entity,
-                                    path: ["transform"]
+                                    path: ["Bruce", "transform"]
                                 });
                                 if (eTransform === null || eTransform === void 0 ? void 0 : eTransform.heading) {
                                     heading = eTransform.heading;
                                 }
-                                else if ((_c = tSettings === null || tSettings === void 0 ? void 0 : tSettings.transform) === null || _c === void 0 ? void 0 : _c.heading) {
+                                else if ((_b = tSettings === null || tSettings === void 0 ? void 0 : tSettings.transform) === null || _b === void 0 ? void 0 : _b.heading) {
                                     heading = tSettings.transform.heading;
                                 }
                                 if (eTransform === null || eTransform === void 0 ? void 0 : eTransform.pitch) {
                                     pitch = eTransform.pitch;
                                 }
-                                else if ((_d = tSettings === null || tSettings === void 0 ? void 0 : tSettings.transform) === null || _d === void 0 ? void 0 : _d.pitch) {
+                                else if ((_c = tSettings === null || tSettings === void 0 ? void 0 : tSettings.transform) === null || _c === void 0 ? void 0 : _c.pitch) {
                                     pitch = tSettings.transform.pitch;
                                 }
                                 if (eTransform === null || eTransform === void 0 ? void 0 : eTransform.roll) {
                                     roll = eTransform.roll;
                                 }
-                                else if ((_e = tSettings === null || tSettings === void 0 ? void 0 : tSettings.transform) === null || _e === void 0 ? void 0 : _e.roll) {
+                                else if ((_d = tSettings === null || tSettings === void 0 ? void 0 : tSettings.transform) === null || _d === void 0 ? void 0 : _d.roll) {
                                     roll = tSettings.transform.roll;
                                 }
                                 heading = +heading;
@@ -3214,7 +3233,7 @@ var EntityUtils;
                                 if (isNaN(roll)) {
                                     roll = 0;
                                 }
-                                matrix4 = entity.worldPosition;
+                                matrix4 = worldPosition;
                                 offset = new Cartesian3(+matrix4[0][3], +matrix4[1][3], +matrix4[2][3]);
                                 if (entity.worldPivot) //the position from worldMatrix + center of geometry offset
                                  {
@@ -3485,15 +3504,15 @@ function createCacheKey(point, entity) {
         };
         var location_1 = Entity$1.GetValue({
             entity: entity,
-            path: ["location"]
+            path: ["Bruce", "location"]
         });
         var geometry = Entity$1.GetValue({
             entity: entity,
-            path: ["geometry"]
+            path: ["Bruce", "geometry"]
         });
         var boundaries = Entity$1.GetValue({
             entity: entity,
-            path: ["boundaries"]
+            path: ["Bruce", "boundaries"]
         });
         var entityData = __assign(__assign(__assign({}, location_1), geometry), boundaries);
         return JSON.stringify(pointData) + '|' + JSON.stringify(entityData);
@@ -3522,7 +3541,7 @@ function calculateDistance(point, entity) {
     var entityPos3d = null;
     var location = Entity$1.GetValue({
         entity: entity,
-        path: ["location"]
+        path: ["Bruce", "location"]
     });
     if (location && location.latitude) {
         var latitude = EnsureNumber(location.latitude);
@@ -3539,7 +3558,7 @@ function calculateDistance(point, entity) {
     // Check geometry if it's available.
     var geometry = Entity$1.GetValue({
         entity: entity,
-        path: ["geometry"]
+        path: ["Bruce", "geometry"]
     });
     if (geometry) {
         var passedGeometry = false;
@@ -3587,7 +3606,7 @@ function calculateDistance(point, entity) {
     if (minDistance === Infinity) {
         var boundaries = Entity$1.GetValue({
             entity: entity,
-            path: ["boundaries"]
+            path: ["Bruce", "boundaries"]
         });
         if (boundaries && typeof boundaries == "object") {
             var point_1 = {
@@ -4630,7 +4649,7 @@ function getPolygonStyleExtrusion(pStyle, entity, tags, heightRef) {
         */
         var height = Entity$1.GetValue({
             entity: entity,
-            path: ["location", "altitude"]
+            path: ["Bruce", "location", "altitude"]
         });
         return heightRef != HeightReference.CLAMP_TO_GROUND ? extrusion + height : extrusion;
     }
@@ -4653,7 +4672,7 @@ function getPolygonExtrusion(entity, tags, ring, posses, heightRef, pStyle) {
             // This let's us have a consistent extrusion height, and be adjustable easier by user.
             var alt_1 = Entity$1.GetValue({
                 entity: entity,
-                path: ["location", "altitude"]
+                path: ["Bruce", "location", "altitude"]
             });
             if (!alt_1) {
                 alt_1 = 0;
@@ -4710,7 +4729,7 @@ function getCylinderStyleExtrusion(style, entity, tags, heightRef) {
         */
         var height = EnsureNumber(Entity$1.GetValue({
             entity: entity,
-            path: ["location", "altitude"]
+            path: ["Bruce", "location", "altitude"]
         }), 0);
         return heightRef != HeightReference.CLAMP_TO_GROUND ? extrusion + height : extrusion;
     }
@@ -4934,7 +4953,7 @@ function getSizeOfPolygonEntity(entity) {
     var hasCalculatedBounds = false;
     var bounds = Entity$1.GetValue({
         entity: entity,
-        path: ["boundaries"]
+        path: ["Bruce", "boundaries"]
     });
     var calculateBounds = function () {
         hasCalculatedBounds = true;
@@ -5302,7 +5321,7 @@ var EntityRenderEngine;
                             entity = params.entities[i];
                             geometry = Entity$1.GetValue({
                                 entity: entity,
-                                path: ["geometry"]
+                                path: ["Bruce", "geometry"]
                             });
                             if (((_a = geometry === null || geometry === void 0 ? void 0 : geometry.MultiGeometry) === null || _a === void 0 ? void 0 : _a.length) == 1) {
                                 // Not migrated to internal, set in both places.
@@ -5373,7 +5392,7 @@ var EntityRenderEngine;
                                     else if (displayType == ZoomControl.EDisplayType.Geometry) {
                                         geometry = Entity$1.GetValue({
                                             entity: entity,
-                                            path: ["geometry"]
+                                            path: ["Bruce", "geometry"]
                                         });
                                         if ((_f = geometry === null || geometry === void 0 ? void 0 : geometry.MultiGeometry) === null || _f === void 0 ? void 0 : _f.length) {
                                             multiGeometry.push(entity);
@@ -5416,7 +5435,7 @@ var EntityRenderEngine;
                                         entity = multiGeometry[i];
                                         geometry = Entity$1.GetValue({
                                             entity: entity,
-                                            path: ["geometry"]
+                                            path: ["Bruce", "geometry"]
                                         });
                                         if (!((_g = geometry === null || geometry === void 0 ? void 0 : geometry.MultiGeometry) === null || _g === void 0 ? void 0 : _g.length)) {
                                             polygons.push(entity);
@@ -6144,7 +6163,7 @@ var EntityRenderEngine;
             var entity = params.entity;
             var lineString = Entity$1.GetValue({
                 entity: entity,
-                path: ["geometry", "LineString"]
+                path: ["Bruce", "geometry", "LineString"]
             });
             var points = lineString && typeof lineString == "string" ? Geometry.ParsePoints(lineString) : [];
             if (!points || points.length < 2) {
@@ -6408,7 +6427,7 @@ var EntityRenderEngine;
             var entity = params.entity;
             var pRings = Entity$1.GetValue({
                 entity: entity,
-                path: ["geometry", "Polygon"]
+                path: ["Bruce", "geometry", "Polygon"]
             });
             if (pRings == null || !Array.isArray(pRings) || pRings.length <= 0) {
                 return null;
@@ -6786,7 +6805,7 @@ var EntityRenderEngine;
             }
             var transform = Entity$1.GetValue({
                 entity: entity,
-                path: ["transform"]
+                path: ["Bruce", "transform"]
             });
             var heading = EnsureNumber(transform === null || transform === void 0 ? void 0 : transform.heading);
             heading = (heading + 90) % 360;
@@ -13289,16 +13308,29 @@ var TilesetRenderEngine;
                         _a.sent();
                         loadUrl = params.tileset.loadUrl;
                         // CDN enabled and tileset url template is available.
-                        if (params.viaCdn && api.TilesetCdnUrl) {
-                            loadUrl = api.TilesetCdnUrl.replace("<TILESETID>", params.tileset.id).replace("<FILEPATH>", "files/tileset.json");
-                            // First url param reserved for accountId. This is set within the API instance.
-                            loadUrl += "&generation=" + params.tileset.generateVersion;
+                        if (params.viaCdn && api.GetCdnBaseUrl()) {
+                            /*
+                                loadUrl = api.TilesetCdnUrl.replace("<TILESETID>", params.tileset.id).replace("<FILEPATH>", "files/tileset.json");
+                                // First url param reserved for accountId. This is set within the API instance.
+                                loadUrl += "&generation=" + params.tileset.generateVersion;
+                            */
+                            loadUrl = Tileset.GetFileUrl({
+                                file: "tileset.json",
+                                tilesetId: params.tileset.id,
+                                viaCdn: true,
+                                legacy: false,
+                                cacheToken: params.tileset.generateVersion,
+                                api: api
+                            });
                         }
                         if (!(params.tileset.type == Tileset.EType.Cad)) return [3 /*break*/, 3];
-                        return [4 /*yield*/, createTileset(loadUrl ? loadUrl : Tileset.GetPublicFileUrl({
+                        return [4 /*yield*/, createTileset(loadUrl ? loadUrl : Tileset.GetFileUrl({
                                 api: api,
                                 tilesetId: params.tileset.id,
-                                file: "tileset.json"
+                                file: "tileset.json",
+                                cacheToken: params.tileset.generateVersion,
+                                legacy: false,
+                                viaCdn: false
                             }) + "?generation=" + params.tileset.generateVersion, null)];
                     case 2:
                         cTileset_1 = _a.sent();
@@ -13334,10 +13366,13 @@ var TilesetRenderEngine;
                         return [2 /*return*/, cTileset_1];
                     case 3:
                         if (!(params.tileset.type === Tileset.EType.EntitiesSet)) return [3 /*break*/, 5];
-                        return [4 /*yield*/, createTileset(loadUrl ? loadUrl : Tileset.GetPublicFileUrl({
+                        return [4 /*yield*/, createTileset(loadUrl ? loadUrl : Tileset.GetFileUrl({
                                 api: api,
                                 tilesetId: params.tileset.id,
-                                file: "tileset.json"
+                                file: "tileset.json",
+                                cacheToken: params.tileset.generateVersion,
+                                legacy: false,
+                                viaCdn: false
                             }) + "?generation=" + params.tileset.generateVersion, null)];
                     case 4:
                         cTileset = _a.sent();
@@ -13345,10 +13380,13 @@ var TilesetRenderEngine;
                         return [2 /*return*/, cTileset];
                     case 5:
                         if (!(params.tileset.type == Tileset.EType.PointCloud)) return [3 /*break*/, 7];
-                        return [4 /*yield*/, createTileset(loadUrl ? loadUrl : Tileset.GetPublicFileUrl({
+                        return [4 /*yield*/, createTileset(loadUrl ? loadUrl : Tileset.GetFileUrl({
                                 api: api,
                                 tilesetId: params.tileset.id,
-                                file: "tileset.json"
+                                file: "tileset.json",
+                                cacheToken: params.tileset.generateVersion,
+                                legacy: false,
+                                viaCdn: false
                             }) + "?generation=" + params.tileset.generateVersion, null)];
                     case 6:
                         cTileset_2 = _a.sent();
@@ -13391,7 +13429,7 @@ var TilesetRenderEngine;
     TilesetRenderEngine.Render = Render;
     function RenderLegacy(params) {
         return __awaiter(this, void 0, void 0, function () {
-            var apiGetter, viewer, tileset, ionId, loadUrl, viaCdn, accountId, settings, visual, etc, api, rootFile, api, rootFile, cTileset;
+            var apiGetter, viewer, tileset, ionId, loadUrl, viaCdn, accountId, settings, visual, etc, api, api, cTileset;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -13415,23 +13453,55 @@ var TilesetRenderEngine;
                         }
                         _a.label = 3;
                     case 3:
-                        if (!loadUrl && tileset) {
-                            api = apiGetter.getApi(accountId);
-                            rootFile = tileset.RootFileName ? tileset.RootFileName : "tileset.json";
-                            loadUrl = api.GetBaseUrl() + "ui.tileset/".concat(tileset.ID, "/file/").concat(rootFile);
-                        }
-                        if (viaCdn && (tileset === null || tileset === void 0 ? void 0 : tileset.ID)) {
-                            api = apiGetter.getApi(accountId);
-                            if (api.LegacyTilesetCdnUrl) {
-                                rootFile = tileset.RootFileName ? tileset.RootFileName : "tileset.json";
-                                loadUrl = api.LegacyTilesetCdnUrl
-                                    .replace("<TILESETID>", tileset.ID)
-                                    .replace("<FILEPATH>", rootFile)
-                                    .replace("<ACCOUNT>", accountId);
-                            }
-                        }
-                        return [4 /*yield*/, createTileset(loadUrl, null)];
+                        if (!(!loadUrl && tileset)) return [3 /*break*/, 5];
+                        api = apiGetter.getApi(accountId);
+                        return [4 /*yield*/, api.Loading
+                            /*
+                            const rootFile = tileset.RootFileName ? tileset.RootFileName : "tileset.json";
+                            loadUrl = api.GetBaseUrl() + `ui.tileset/${tileset.ID}/file/${rootFile}`;
+                            */
+                        ];
                     case 4:
+                        _a.sent();
+                        /*
+                        const rootFile = tileset.RootFileName ? tileset.RootFileName : "tileset.json";
+                        loadUrl = api.GetBaseUrl() + `ui.tileset/${tileset.ID}/file/${rootFile}`;
+                        */
+                        loadUrl = Tileset.GetFileUrl({
+                            file: "tileset.json",
+                            tilesetId: (tileset === null || tileset === void 0 ? void 0 : tileset.ID) ? tileset.ID : params.tileset.id,
+                            viaCdn: false,
+                            legacy: true,
+                            cacheToken: tileset.GenerateVersion,
+                            api: api
+                        });
+                        _a.label = 5;
+                    case 5:
+                        if (!(viaCdn && (tileset === null || tileset === void 0 ? void 0 : tileset.ID))) return [3 /*break*/, 7];
+                        api = apiGetter.getApi(accountId);
+                        return [4 /*yield*/, api.Loading];
+                    case 6:
+                        _a.sent();
+                        if (api.GetCdnBaseUrl()) {
+                            /*
+                             const rootFile = tileset.RootFileName ? tileset.RootFileName : "tileset.json";
+                             loadUrl = api.LegacyTilesetCdnUrl
+                                 .replace("<TILESETID>", tileset.ID)
+                                 .replace("<FILEPATH>", rootFile)
+                                 .replace("<ACCOUNT>", accountId);
+                             */
+                            loadUrl = Tileset.GetFileUrl({
+                                file: "tileset.json",
+                                tilesetId: (tileset === null || tileset === void 0 ? void 0 : tileset.ID) ? tileset.ID : params.tileset.id,
+                                viaCdn: true,
+                                legacy: true,
+                                cacheToken: params.tileset.generateVersion,
+                                api: api
+                            });
+                        }
+                        _a.label = 7;
+                    case 7: return [4 /*yield*/, createTileset(loadUrl, null)];
+                    case 8:
                         cTileset = _a.sent();
                         viewer.scene.primitives.add(cTileset);
                         OnTilesetReady(cTileset).then(function () {
@@ -24506,7 +24576,7 @@ var ViewRenderEngine;
     ViewRenderEngine.Render = Render;
 })(ViewRenderEngine || (ViewRenderEngine = {}));
 
-var VERSION = "3.9.9";
+var VERSION = "4.0.1";
 
 export { VERSION, CesiumViewMonitor, ViewerUtils, MenuItemManager, EntityRenderEngine, MenuItemCreator, VisualsRegister, RenderManager, EntitiesIdsRenderManager, EntitiesLoadedRenderManager, EntitiesRenderManager, EntityRenderManager, TilesetCadRenderManager, TilesetArbRenderManager, TilesetEntitiesRenderManager, TilesetOsmRenderManager, TilesetPointcloudRenderManager, TilesetGooglePhotosRenderManager, DataSourceStaticKmlManager, RelationsRenderManager, SharedGetters, CesiumParabola, EntityLabel, ViewRenderEngine, TileRenderEngine, TilesetRenderEngine, CESIUM_INSPECTOR_KEY, CESIUM_TIMELINE_KEY, ViewUtils, DrawingUtils, MeasureUtils, EntityUtils, CesiumEntityStyler, CesiumAnimatedProperty, CesiumAnimatedInOut, Draw3dPolygon, Draw3dPolyline };
 //# sourceMappingURL=bruce-cesium.es5.js.map