bruce-cesium 4.7.9 → 4.8.1

package/dist/bruce-cesium.es5.js

@@ -1,6 +1,6 @@
-import { BruceEvent, Cartes, Entity as Entity$1, Carto, Geometry, MathUtils, LRUCache, Api, Calculator, ClientFile, EntityTag, EntityType, ObjectUtils, Style, ProjectViewTile, DelayQueue, EntityLod, Bounds, ZoomControl, EntityRelationType, ENVIRONMENT, EntityHistoricData, Tileset, EntityCoords, DataLab, EntitySource, MenuItem, EntityRelation, ProgramKey, ProjectView, ProjectViewBookmark, Camera, ProjectViewLegacyTile, EntityAttribute, EntityAttachment, EntityAttachmentType, AbstractApi, Session } from 'bruce-models';
+import { BruceEvent, Cartes, Entity as Entity$1, Carto, Geometry, MathUtils, LRUCache, Api, Calculator, ClientFile, EntityTag, EntityType, ObjectUtils, Style, ProjectViewTile, DelayQueue, EntityLod, Bounds, ZoomControl, EntityRelationType, ENVIRONMENT, EntityHistoricData, Tileset, EntityCoords, DataLab, EntitySource, MenuItem, EntityRelation, ProgramKey, ProjectView, ProjectViewBookmark, Camera, ProjectViewLegacyTile, AbstractApi, Session, EntityAttribute, EntityAttachment, EntityAttachmentType } from 'bruce-models';
 import * as Cesium from 'cesium';
-import { Cartographic, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, JulianDate, Entity, DistanceDisplayCondition, HorizontalOrigin, VerticalOrigin, ConstantProperty, ClassificationType, ConstantPositionProperty, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, ColorMaterialProperty, ColorBlendMode, HeadingPitchRoll, Transforms, Model, Primitive, Cesium3DTileFeature, SceneMode, GeoJsonDataSource, Cesium3DTileColorBlendMode, HeadingPitchRange, Cesium3DTileStyle, Ion, KmlDataSource, SceneTransforms, OrthographicFrustum, EasingFunction, NearFarScalar, EllipsoidTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, IonImageryProvider, CesiumTerrainProvider, Cesium3DTileset, Matrix4, Matrix3, IonResource, CesiumInspector, defined, ClockRange, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, BoundingSphere, GeometryInstance, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, Quaternion, ScreenSpaceEventHandler, ScreenSpaceEventType, CzmlDataSource, Intersect, Fullscreen } from 'cesium';
+import { Cartographic, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, JulianDate, Entity, DistanceDisplayCondition, ClassificationType, ArcType, CornerType, ShadowMode, ConstantProperty, ConstantPositionProperty, PolygonHierarchy, PolylineGraphics, ColorMaterialProperty, HorizontalOrigin, VerticalOrigin, ColorBlendMode, HeadingPitchRoll, Transforms, Model, SceneMode, GeoJsonDataSource, Primitive, Cesium3DTileFeature, Cesium3DTileColorBlendMode, HeadingPitchRange, Cesium3DTileStyle, Ion, KmlDataSource, OrthographicFrustum, EasingFunction, NearFarScalar, SceneTransforms, EllipsoidTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, IonImageryProvider, CesiumTerrainProvider, CesiumInspector, defined, ClockRange, EllipsoidGeodesic, sampleTerrainMostDetailed, Cesium3DTileset, PolygonPipeline, Matrix4, Matrix3, IonResource, BoundingSphere, GeometryInstance, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, ScreenSpaceEventHandler, ScreenSpaceEventType, Quaternion, CzmlDataSource, Intersect, Fullscreen } from 'cesium';
 
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation. All rights reserved.
@@ -2549,7 +2549,7 @@ var EntityUtils;
      */
     function GetLocation(params) {
         return __awaiter(this, void 0, void 0, function () {
-            var api, viewer, samples, visualRegister, minimumAlt, paddingAlt, MAX_DISTANCE_BETWEEN_SAMPLES, MAX_TERRAIN_SAMPLES, terrainSamples, MAX_API_CALLS, apiCalls, MAX_VALID_SAMPLES, validSamples, data, spheres, processPosHeight, ensureHeightRefs, getEntityPositions, allPosses, i, sample, samplePosses, valid, j, samplePos, k, allPos, distance, rect, factor, marginX, marginY, carto, i, pos, radius, sphere, allPointSphere, rectSphere, combinedSphere;
+            var api, viewer, samples, visualRegister, minimumAlt, paddingAlt, MAX_DISTANCE_BETWEEN_SAMPLES, MAX_TERRAIN_SAMPLES, terrainSamples, MAX_VALID_SAMPLES, validSamples, data, spheres, processPosHeight, ensureHeightRefs, getRenderedEntityPositions, getRecordEntityPositions, allPosses, recordSamples, i, sample, samplePosses, added, valid, j, samplePos, k, allPos, distance, toSearchIds, entities, entitiesMap, i, i, sample, e_1, i, sample, samplePosses, valid, j, samplePos, k, allPos, distance, rect, factor, marginX, marginY, carto, i, pos, radius, sphere, allPointSphere, rectSphere, combinedSphere;
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -2564,8 +2564,6 @@ var EntityUtils;
                         MAX_DISTANCE_BETWEEN_SAMPLES = 5000;
                         MAX_TERRAIN_SAMPLES = 25;
                         terrainSamples = 0;
-                        MAX_API_CALLS = 10;
-                        apiCalls = 0;
                         MAX_VALID_SAMPLES = 20;
                         validSamples = 0;
                         data = {
@@ -2656,16 +2654,15 @@ var EntityUtils;
                                 }
                             });
                         }); };
-                        getEntityPositions = function (sample) { return __awaiter(_this, void 0, void 0, function () {
-                            var entityId, entity, disallowRendered, evaluateRendered, evaluateRecord, renderedPosses, e_1, recordPosses, e_2, pos3d, eLocation, geometryRadius, sphere;
+                        getRenderedEntityPositions = function (sample) { return __awaiter(_this, void 0, void 0, function () {
+                            var entityId, entity, disallowRendered, evaluateRendered, renderedPosses;
                             var _this = this;
-                            var _a, _b;
-                            return __generator(this, function (_c) {
-                                switch (_c.label) {
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
                                     case 0:
                                         entityId = sample.entityId, entity = sample.entity, disallowRendered = sample.disallowRendered;
                                         evaluateRendered = function () { return __awaiter(_this, void 0, void 0, function () {
-                                            var rego, posses, parts, i, part, visualHeightRef, hierarchy, hPosses, hPossesSample, step, i_1, pPosses, pPossesSample, step, i_2, pPosses, pPossesSample, step, i_3, pos3d_1, toAdjust, modelExt, sphere, semiMajorAxis, semiMinorAxis, height, radius, sphere, data_1, pos3d_2, toAdjust, sphere;
+                                            var rego, posses, parts, i, part, visualHeightRef, hierarchy, hPosses, hPossesSample, step, i_1, pPosses, pPossesSample, step, i_2, pPosses, pPossesSample, step, i_3, pos3d, toAdjust, modelExt, sphere, semiMajorAxis, semiMinorAxis, height, radius, sphere, data_1, pos3d, toAdjust, sphere;
                                             return __generator(this, function (_a) {
                                                 switch (_a.label) {
                                                     case 0:
@@ -2754,18 +2751,18 @@ var EntityUtils;
                                                         _a.label = 13;
                                                     case 13:
                                                         if (!(part.point || part.model || part.billboard || part.ellipse)) return [3 /*break*/, 15];
-                                                        pos3d_1 = GetValue(viewer, part.position);
-                                                        if (!(pos3d_1 === null || pos3d_1 === void 0 ? void 0 : pos3d_1.x)) return [3 /*break*/, 15];
-                                                        toAdjust = [pos3d_1];
+                                                        pos3d = GetValue(viewer, part.position);
+                                                        if (!(pos3d === null || pos3d === void 0 ? void 0 : pos3d.x)) return [3 /*break*/, 15];
+                                                        toAdjust = [pos3d];
                                                         return [4 /*yield*/, ensureHeightRefs(toAdjust, __assign(__assign({}, sample), { heightRef: visualHeightRef }))];
                                                     case 14:
                                                         _a.sent();
-                                                        pos3d_1 = toAdjust[0];
-                                                        posses.push(pos3d_1);
+                                                        pos3d = toAdjust[0];
+                                                        posses.push(pos3d);
                                                         if (part.model) {
                                                             modelExt = part.model;
                                                             if (modelExt._radius && modelExt._radius > -1) {
-                                                                sphere = BoundingSphere.fromPoints([pos3d_1]);
+                                                                sphere = BoundingSphere.fromPoints([pos3d]);
                                                                 sphere.radius = modelExt._radius;
                                                                 spheres.push(sphere);
                                                             }
@@ -2785,7 +2782,7 @@ var EntityUtils;
                                                             }
                                                             radius = Math.max(semiMajorAxis, semiMinorAxis, height);
                                                             if (radius && radius > 0) {
-                                                                sphere = new BoundingSphere(pos3d_1, radius);
+                                                                sphere = new BoundingSphere(pos3d, radius);
                                                                 spheres.push(sphere);
                                                             }
                                                         }
@@ -2795,15 +2792,15 @@ var EntityUtils;
                                                         if (!(part instanceof Cesium3DTileFeature)) return [3 /*break*/, 18];
                                                         data_1 = getLocationFromFeature(part);
                                                         if (!(data_1 != null)) return [3 /*break*/, 18];
-                                                        pos3d_2 = Cartesian3.fromDegrees(data_1.location.longitude, data_1.location.latitude, data_1.location.altitude);
-                                                        toAdjust = [pos3d_2];
+                                                        pos3d = Cartesian3.fromDegrees(data_1.location.longitude, data_1.location.latitude, data_1.location.altitude);
+                                                        toAdjust = [pos3d];
                                                         return [4 /*yield*/, ensureHeightRefs(toAdjust, __assign(__assign({}, sample), { heightRef: data_1.isClamped ? HeightReference.CLAMP_TO_GROUND : HeightReference.NONE }))];
                                                     case 17:
                                                         _a.sent();
-                                                        pos3d_2 = toAdjust[0];
-                                                        posses.push(pos3d_2);
+                                                        pos3d = toAdjust[0];
+                                                        posses.push(pos3d);
                                                         if (data_1.radius != null && !isNaN(data_1.radius)) {
-                                                            sphere = new BoundingSphere(pos3d_2, data_1.radius);
+                                                            sphere = new BoundingSphere(pos3d, data_1.radius);
                                                             spheres.push(sphere);
                                                         }
                                                         _a.label = 18;
@@ -2814,8 +2811,28 @@ var EntityUtils;
                                                 }
                                             });
                                         }); };
+                                        if (!(disallowRendered != true)) return [3 /*break*/, 2];
+                                        return [4 /*yield*/, evaluateRendered()];
+                                    case 1:
+                                        renderedPosses = _a.sent();
+                                        if (renderedPosses === null || renderedPosses === void 0 ? void 0 : renderedPosses.length) {
+                                            return [2 /*return*/, renderedPosses];
+                                        }
+                                        _a.label = 2;
+                                    case 2: return [2 /*return*/, []];
+                                }
+                            });
+                        }); };
+                        getRecordEntityPositions = function (sample) { return __awaiter(_this, void 0, void 0, function () {
+                            var entityId, entity, disallowRendered, evaluateRecord, recordPosses, pos3d, eLocation, geometryRadius, sphere, e_2;
+                            var _this = this;
+                            var _a;
+                            return __generator(this, function (_b) {
+                                switch (_b.label) {
+                                    case 0:
+                                        entityId = sample.entityId, entity = sample.entity, disallowRendered = sample.disallowRendered;
                                         evaluateRecord = function () { return __awaiter(_this, void 0, void 0, function () {
-                                            var posses, location, latitude, longitude, pos3d_3, geometry, pointStr, points, point, pos3d_4, lineStr, points, pPosses, pRings, boundary, points, pPosses, boundaries, point, bPosses;
+                                            var posses, location, latitude, longitude, pos3d, geometry, pointStr, points, point, pos3d, lineStr, points, pPosses, pRings, boundary, points, pPosses, boundaries, point, bPosses;
                                             return __generator(this, function (_a) {
                                                 switch (_a.label) {
                                                     case 0:
@@ -2829,8 +2846,8 @@ var EntityUtils;
                                                             longitude = EnsureNumber(location.longitude);
                                                             // Disallowing exact 0.
                                                             if (latitude || longitude) {
-                                                                pos3d_3 = Cartesian3.fromDegrees(longitude, latitude, EnsureNumber(location.altitude));
-                                                                posses.push(pos3d_3);
+                                                                pos3d = Cartesian3.fromDegrees(longitude, latitude, EnsureNumber(location.altitude));
+                                                                posses.push(pos3d);
                                                             }
                                                         }
                                                         geometry = Entity$1.GetValue({
@@ -2845,8 +2862,8 @@ var EntityUtils;
                                                             points = Geometry.ParsePoints(pointStr);
                                                             point = points.length > 0 ? points[0] : null;
                                                             if (point && Carto.ValidateCarto(point)) {
-                                                                pos3d_4 = Cartesian3.fromDegrees(EnsureNumber(point.longitude), EnsureNumber(point.latitude), EnsureNumber(point.altitude));
-                                                                posses.push(pos3d_4);
+                                                                pos3d = Cartesian3.fromDegrees(EnsureNumber(point.longitude), EnsureNumber(point.latitude), EnsureNumber(point.altitude));
+                                                                posses.push(pos3d);
                                                             }
                                                         }
                                                         lineStr = geometry.LineString;
@@ -2896,78 +2913,26 @@ var EntityUtils;
                                                 }
                                             });
                                         }); };
-                                        if (!(disallowRendered != true)) return [3 /*break*/, 2];
-                                        return [4 /*yield*/, evaluateRendered()];
+                                        return [4 /*yield*/, evaluateRecord()];
                                     case 1:
-                                        renderedPosses = _c.sent();
-                                        if (renderedPosses === null || renderedPosses === void 0 ? void 0 : renderedPosses.length) {
-                                            return [2 /*return*/, renderedPosses];
-                                        }
-                                        _c.label = 2;
+                                        recordPosses = _b.sent();
+                                        if (!(recordPosses === null || recordPosses === void 0 ? void 0 : recordPosses.length)) return [3 /*break*/, 8];
+                                        _b.label = 2;
                                     case 2:
-                                        if (!!entity) return [3 /*break*/, 6];
-                                        if (!(apiCalls < MAX_API_CALLS)) return [3 /*break*/, 6];
-                                        apiCalls += 1;
-                                        _c.label = 3;
-                                    case 3:
-                                        _c.trys.push([3, 5, , 6]);
-                                        return [4 /*yield*/, Entity$1.Get({
-                                                api: api,
-                                                entityId: entityId,
-                                                // Not expanding relative positions at first to see if the entity has valid location just by itself.
-                                                expandLocation: false,
-                                                migrated: true
-                                            })];
-                                    case 4:
-                                        entity = (_c.sent()).entity;
-                                        return [3 /*break*/, 6];
-                                    case 5:
-                                        e_1 = _c.sent();
-                                        console.error(e_1);
-                                        return [3 /*break*/, 6];
-                                    case 6:
-                                        if (!entity) {
-                                            return [2 /*return*/, []];
-                                        }
-                                        return [4 /*yield*/, evaluateRecord()];
-                                    case 7:
-                                        recordPosses = _c.sent();
-                                        if (recordPosses === null || recordPosses === void 0 ? void 0 : recordPosses.length) {
-                                            return [2 /*return*/, recordPosses];
-                                        }
-                                        if (!(apiCalls < MAX_API_CALLS && ((_a = entity === null || entity === void 0 ? void 0 : entity.Bruce) === null || _a === void 0 ? void 0 : _a.AssemblyRootLocation) == null)) return [3 /*break*/, 11];
-                                        _c.label = 8;
-                                    case 8:
-                                        _c.trys.push([8, 10, , 11]);
-                                        apiCalls += 1;
-                                        return [4 /*yield*/, Entity$1.Get({
-                                                api: api,
-                                                entityId: entityId,
-                                                // We'll be expanding relative positioning and related assemblies now.
-                                                expandLocation: true,
-                                                migrated: true
-                                            })];
-                                    case 9:
-                                        entity = (_c.sent()).entity;
-                                        return [3 /*break*/, 11];
-                                    case 10:
-                                        e_2 = _c.sent();
-                                        console.warn(e_2);
-                                        return [3 /*break*/, 11];
-                                    case 11:
+                                        _b.trys.push([2, 6, , 7]);
                                         pos3d = null;
                                         eLocation = Entity$1.GetValue({
                                             entity: entity,
                                             path: ["Bruce", "Location"]
                                         });
-                                        if (!((eLocation === null || eLocation === void 0 ? void 0 : eLocation.longitude) && ((_b = entity === null || entity === void 0 ? void 0 : entity.Bruce) === null || _b === void 0 ? void 0 : _b.AssemblyRootLocation) != null)) return [3 /*break*/, 14];
+                                        if (!((eLocation === null || eLocation === void 0 ? void 0 : eLocation.longitude) && ((_a = entity === null || entity === void 0 ? void 0 : entity.Bruce) === null || _a === void 0 ? void 0 : _a.AssemblyRootLocation) != null)) return [3 /*break*/, 5];
                                         pos3d = Cartesian3.fromDegrees(EnsureNumber(eLocation.longitude), EnsureNumber(eLocation.latitude), EnsureNumber(eLocation.altitude));
-                                        if (!(pos3d === null || pos3d === void 0 ? void 0 : pos3d.x)) return [3 /*break*/, 13];
+                                        if (!(pos3d === null || pos3d === void 0 ? void 0 : pos3d.x)) return [3 /*break*/, 4];
                                         return [4 /*yield*/, processPosHeight(pos3d, HeightReference.NONE)];
-                                    case 12:
-                                        pos3d = _c.sent();
-                                        _c.label = 13;
-                                    case 13:
+                                    case 3:
+                                        pos3d = _b.sent();
+                                        _b.label = 4;
+                                    case 4:
                                         geometryRadius = Entity$1.GetValue({
                                             entity: entity,
                                             path: ["Bruce", "GeometryRadius"]
@@ -2980,24 +2945,28 @@ var EntityUtils;
                                                 spheres.push(sphere);
                                             }
                                         }
-                                        _c.label = 14;
-                                    case 14:
-                                        if (pos3d) {
-                                            return [2 /*return*/, [pos3d]];
-                                        }
-                                        return [2 /*return*/, []];
+                                        _b.label = 5;
+                                    case 5: return [3 /*break*/, 7];
+                                    case 6:
+                                        e_2 = _b.sent();
+                                        console.error(e_2);
+                                        return [3 /*break*/, 7];
+                                    case 7: return [2 /*return*/, recordPosses];
+                                    case 8: return [2 /*return*/, []];
                                 }
                             });
                         }); };
                         allPosses = [];
+                        recordSamples = [];
                         i = 0;
                         _a.label = 1;
                     case 1:
                         if (!(i < samples.length)) return [3 /*break*/, 4];
                         sample = samples[i];
-                        return [4 /*yield*/, getEntityPositions(sample)];
+                        return [4 /*yield*/, getRenderedEntityPositions(sample)];
                     case 2:
                         samplePosses = _a.sent();
+                        added = false;
                         if (samplePosses === null || samplePosses === void 0 ? void 0 : samplePosses.length) {
                             valid = !(allPosses === null || allPosses === void 0 ? void 0 : allPosses.length);
                             if (!valid) {
@@ -3018,17 +2987,91 @@ var EntityUtils;
                             }
                             if (valid) {
                                 allPosses = allPosses.concat(samplePosses);
+                                added = true;
                                 validSamples += 1;
                                 if (validSamples >= MAX_VALID_SAMPLES) {
                                     return [3 /*break*/, 4];
                                 }
                             }
                         }
+                        if (!added) {
+                            recordSamples.push(sample);
+                        }
                         _a.label = 3;
                     case 3:
                         i++;
                         return [3 /*break*/, 1];
                     case 4:
+                        _a.trys.push([4, 7, , 8]);
+                        toSearchIds = recordSamples.filter(function (x) { return !x.entity && x.entityId; }).map(function (x) { return x.entityId; });
+                        if (!toSearchIds.length) return [3 /*break*/, 6];
+                        return [4 /*yield*/, Entity$1.GetListByIds({
+                                entityIds: toSearchIds,
+                                expandLocation: true,
+                                migrated: true,
+                                api: api
+                            })];
+                    case 5:
+                        entities = (_a.sent()).entities;
+                        entitiesMap = new Map();
+                        for (i = 0; i < entities.length; i++) {
+                            entitiesMap.set(entities[i].Bruce.ID, entities[i]);
+                        }
+                        for (i = 0; i < recordSamples.length; i++) {
+                            sample = recordSamples[i];
+                            if (!sample.entity && sample.entityId) {
+                                sample.entity = entitiesMap.get(sample.entityId);
+                            }
+                        }
+                        _a.label = 6;
+                    case 6:
+                        // Filter out samples that still don't have an entity.
+                        recordSamples = recordSamples.filter(function (x) { return !!x.entity; });
+                        return [3 /*break*/, 8];
+                    case 7:
+                        e_1 = _a.sent();
+                        console.error(e_1);
+                        return [3 /*break*/, 8];
+                    case 8:
+                        i = 0;
+                        _a.label = 9;
+                    case 9:
+                        if (!(i < recordSamples.length)) return [3 /*break*/, 12];
+                        sample = recordSamples[i];
+                        return [4 /*yield*/, getRecordEntityPositions(sample)];
+                    case 10:
+                        samplePosses = _a.sent();
+                        if (samplePosses === null || samplePosses === void 0 ? void 0 : samplePosses.length) {
+                            valid = !(allPosses === null || allPosses === void 0 ? void 0 : allPosses.length);
+                            if (!valid) {
+                                for (j = 0; j < samplePosses.length; j++) {
+                                    samplePos = samplePosses[j];
+                                    for (k = 0; k < allPosses.length; k++) {
+                                        allPos = allPosses[k];
+                                        distance = Cartesian3.distance(samplePos, allPos);
+                                        if (distance < MAX_DISTANCE_BETWEEN_SAMPLES) {
+                                            valid = true;
+                                            break;
+                                        }
+                                    }
+                                    if (valid) {
+                                        break;
+                                    }
+                                }
+                            }
+                            if (valid) {
+                                allPosses = allPosses.concat(samplePosses);
+                                validSamples += 1;
+                                if (validSamples >= MAX_VALID_SAMPLES) {
+                                    return [3 /*break*/, 12];
+                                }
+                            }
+                        }
+                        _a.label = 11;
+                    case 11:
+                        i++;
+                        return [3 /*break*/, 9];
+                    case 12:
                         if (allPosses.length > 1) {
                             rect = allPosses.length == 1 ? null : Rectangle.fromCartesianArray(allPosses);
                             if (rect.width > 0 && rect.height > 0) {
@@ -3103,9 +3146,9 @@ var EntityUtils;
             if ((rego === null || rego === void 0 ? void 0 : rego.visual) instanceof Entity) {
                 var visual = rego.visual;
                 if (visual.position) {
-                    var pos3d_5 = GetValue(viewer, visual.position);
+                    var pos3d_1 = GetValue(viewer, visual.position);
                     // Fix height reference.
-                    if (pos3d_5 === null || pos3d_5 === void 0 ? void 0 : pos3d_5.x) {
+                    if (pos3d_1 === null || pos3d_1 === void 0 ? void 0 : pos3d_1.x) {
                         var visualHeightRef = HeightReference.RELATIVE_TO_GROUND;
                         if (visual.model) {
                             visualHeightRef = GetValue(viewer, visual.model.heightReference);
@@ -3132,7 +3175,7 @@ var EntityUtils;
                         return DrawingUtils.EnsurePosHeight({
                             desiredHeightRef: params.returnHeightRef,
                             heightRef: visualHeightRef,
-                            pos3d: pos3d_5,
+                            pos3d: pos3d_1,
                             viewer: viewer
                         });
                     }
@@ -8210,7 +8253,7 @@ var EntityRenderEngine;
                                     !(existingRego === null || existingRego === void 0 ? void 0 : existingRego.stale) &&
                                     // If historic/scenario metadata is different then it's also stale.
                                     ((existingRego === null || existingRego === void 0 ? void 0 : existingRego.historicDateTime) == ((_b = entity.Bruce) === null || _b === void 0 ? void 0 : _b.HistoricDateTime)) &&
-                                    ((existingRego === null || existingRego === void 0 ? void 0 : existingRego.scenario) == ((_c = entity.Bruce) === null || _c === void 0 ? void 0 : _c["Scenario.ID"]))) {
+                                    ((existingRego === null || existingRego === void 0 ? void 0 : existingRego.scenario) == ((_c = entity.Bruce) === null || _c === void 0 ? void 0 : _c.Scenario))) {
                                     // No sorting category needed. Already rendered the way we want.
                                     cEntities.set(id, existingRego.visual);
                                 }
@@ -8224,7 +8267,7 @@ var EntityRenderEngine;
                                         existingRego.historicDateTime = (_d = entity.Bruce) === null || _d === void 0 ? void 0 : _d.HistoricDateTime;
                                         existingRego.historicAttrKey = (_e = entity.Bruce) === null || _e === void 0 ? void 0 : _e.HistoricAttrKey;
                                         existingRego.entityTypeId = entity.Bruce["EntityType.ID"];
-                                        existingRego.scenario = (_f = entity.Bruce) === null || _f === void 0 ? void 0 : _f["Scenario.ID"];
+                                        existingRego.scenario = (_f = entity.Bruce) === null || _f === void 0 ? void 0 : _f.Scenario;
                                         updated.set(id, true);
                                     }
                                     if (displayType == ZoomControl.EDisplayType.Model3D) {
@@ -12019,7 +12062,7 @@ var EntitiesRenderManager;
                 console.warn("Geojson rendering does not support multiple zoom controls. Only the first one will be used.");
                 this.zoomControl = [this.zoomControl[0]];
             }
-            this.scenario = (_b = this.item.BruceEntity) === null || _b === void 0 ? void 0 : _b["Scenario.ID"];
+            this.scenario = (_b = this.item.BruceEntity) === null || _b === void 0 ? void 0 : _b.Scenario;
             var isTagItem = Boolean(this.item.BruceEntity.ExpandLayers);
             var tagsToRender = isTagItem ? this.item.BruceEntity.SelectedExpandLayers : null;
             if (!tagsToRender) {
@@ -12674,7 +12717,7 @@ var EntitiesRenderManager;
                                         })) !== null && _d !== void 0 ? _d : "Unnamed Entity" : "Unnamed Entity",
                                         cdn: _this.item.cdnEnabled,
                                         collection: source.entities,
-                                        scenario: (_f = (_e = group.data) === null || _e === void 0 ? void 0 : _e.Bruce) === null || _f === void 0 ? void 0 : _f["Scenario.ID"]
+                                        scenario: (_f = (_e = group.data) === null || _e === void 0 ? void 0 : _e.Bruce) === null || _f === void 0 ? void 0 : _f.Scenario
                                     };
                                     group.rego = rego;
                                     _this.visualsManager.AddRego({
@@ -12827,7 +12870,7 @@ var EntitiesRenderManager;
                                             cdn: this.item.cdnEnabled,
                                             historicDateTime: (_f = entity.Bruce) === null || _f === void 0 ? void 0 : _f.HistoricDateTime,
                                             historicAttrKey: (_g = entity.Bruce) === null || _g === void 0 ? void 0 : _g.HistoricAttrKey,
-                                            scenario: (_h = entity.Bruce) === null || _h === void 0 ? void 0 : _h["Scenario.ID"]
+                                            scenario: (_h = entity.Bruce) === null || _h === void 0 ? void 0 : _h.Scenario
                                         };
                                         this.visualsManager.AddRego({
                                             rego: rego_1,
@@ -12843,7 +12886,7 @@ var EntitiesRenderManager;
                                         rego.historicAttrKey = (_l = entity.Bruce) === null || _l === void 0 ? void 0 : _l.HistoricAttrKey;
                                         rego.cdn = this.item.cdnEnabled;
                                         rego.schemaId = (_m = entity.Bruce) === null || _m === void 0 ? void 0 : _m.SchemaID;
-                                        rego.scenario = (_o = entity.Bruce) === null || _o === void 0 ? void 0 : _o["Scenario.ID"];
+                                        rego.scenario = (_o = entity.Bruce) === null || _o === void 0 ? void 0 : _o.Scenario;
                                         // Marked as stale meaning some change was performed that requires a refresh.
                                         // This usually means a new sibling was added that we need to update.
                                         if (rego.stale) {
@@ -15932,7 +15975,7 @@ var TilesetCadRenderManager;
                                         expandSources: (_a = _this.item.BruceEntity) === null || _a === void 0 ? void 0 : _a.ExpandSources,
                                         menuItemId: _this.item.id,
                                         register: _this.visualsManager,
-                                        scenario: (_b = _this.item.BruceEntity) === null || _b === void 0 ? void 0 : _b["Scenario.ID"]
+                                        scenario: (_b = _this.item.BruceEntity) === null || _b === void 0 ? void 0 : _b.Scenario
                                     });
                                     _this.viewer.scene.requestRender();
                                 }
@@ -16011,7 +16054,7 @@ var TilesetCadRenderManager;
                 rootId: this.rootId,
                 // TODO: Scenario is tied to the record, not to the Tileset.
                 // So we need a way to update it when we load the record from styling.
-                scenario: (_d = this.item.BruceEntity) === null || _d === void 0 ? void 0 : _d["Scenario.ID"]
+                scenario: (_d = this.item.BruceEntity) === null || _d === void 0 ? void 0 : _d.Scenario
             };
             var featureAny = feature;
             var propertyNames = featureAny.getPropertyNames ? featureAny.getPropertyNames() : (_e = featureAny.getPropertyIds) === null || _e === void 0 ? void 0 : _e.call(featureAny);
@@ -28638,7 +28681,7 @@ var WidgetViewBar = /** @class */ (function (_super) {
     return WidgetViewBar;
 }(Widget.AWidget));
 
-var VERSION = "4.7.9";
+var VERSION = "4.8.1";
 
 export { VERSION, CesiumViewMonitor, ViewerUtils, ViewerEventTracker, MenuItemManager, EntityRenderEngine, EntityRenderEnginePoint, EntityRenderEnginePolyline, EntityRenderEnginePolygon, EntityRenderEngineModel3d, MenuItemCreator, VisualsRegister, RenderManager, EntitiesIdsRenderManager, DataLabRenderManager, EntitiesLoadedRenderManager, EntitiesRenderManager, EntityRenderManager, TilesetCadRenderManager, TilesetArbRenderManager, TilesetEntitiesRenderManager, TilesetOsmRenderManager, TilesetPointcloudRenderManager, TilesetGooglePhotosRenderManager, DataSourceStaticKmlManager, GoogleSearchRenderManager, RelationsRenderManager, SharedGetters, CesiumParabola, EntityLabel, ViewRenderEngine, TileRenderEngine, TilesetRenderEngine, CESIUM_INSPECTOR_KEY, CESIUM_TIMELINE_KEY, ViewUtils, DrawingUtils, MeasureUtils, EntityUtils, CesiumEntityStyler, CesiumAnimatedProperty, CesiumAnimatedInOut, Draw3dPolygon, Draw3dPolyline, MeasureCreator, Widget, VIEWER_BOOKMARKS_WIDGET_KEY, WidgetBookmarks, WidgetBranding, WidgetCursorBar, WidgetEmbeddedInfoView, WidgetInfoView, WidgetNavCompass$$1 as WidgetNavCompass, VIEWER_VIEW_BAR_WIDGET_KEY, WidgetViewBar, WidgetControlViewBar, WidgetControlViewBarSearch, VIEWER_LEFT_PANEL_WIDGET_KEY, VIEWER_LEFT_PANEL_CSS_VAR_LEFT, WidgetLeftPanel, WidgetLeftPanelTab, WidgetLeftPanelTabBookmarks };
 //# sourceMappingURL=bruce-cesium.es5.js.map