bruce-cesium 3.2.6 → 3.2.8

package/dist/bruce-cesium.es5.js

@@ -1,6 +1,6 @@
-import { Cartes, ProjectViewTile, Carto, Entity as Entity$1, Geometry, Tileset, MathUtils, LRUCache, DelayQueue, ZoomControl, Style, EntityTag, Calculator, EntityLod, EntityType, ClientFile, ObjectUtils, Bounds, EntityRelationType, BruceEvent, EntityCoords, Api, EntitySource, MenuItem, EntityRelation, ProgramKey, ENVIRONMENT, AbstractApi, ProjectViewBookmark, EntityAttachment, EntityAttachmentType, EntityAttribute, ProjectView, ProjectViewLegacyTile, Camera } from 'bruce-models';
+import { Cartes, Carto, Entity as Entity$1, Geometry, Tileset, MathUtils, LRUCache, ProjectViewTile, DelayQueue, ZoomControl, Style, EntityTag, Calculator, EntityLod, EntityType, ClientFile, ObjectUtils, Bounds, EntityRelationType, BruceEvent, EntityCoords, Api, EntitySource, MenuItem, EntityRelation, ProgramKey, ENVIRONMENT, 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, DistanceDisplayCondition, NearFarScalar, Model, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, SceneMode, Cesium3DTileColorBlendMode, HeadingPitchRange, Ion, Cesium3DTileStyle, KmlDataSource, SceneTransforms, OrthographicFrustum, EasingFunction, EllipsoidTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, CesiumTerrainProvider, EllipsoidGeodesic, sampleTerrainMostDetailed, defined, Cesium3DTileset, CesiumInspector, Matrix4, Matrix3, IonResource, PolygonPipeline, BoundingSphere, GeometryInstance, ScreenSpaceEventHandler, ScreenSpaceEventType, Intersect, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, ColorMaterialProperty } from 'cesium';
+import { Cartographic, JulianDate, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, DistanceDisplayCondition, NearFarScalar, Model, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, SceneMode, Primitive, Cesium3DTileFeature, Cesium3DTileColorBlendMode, HeadingPitchRange, Ion, Cesium3DTileStyle, KmlDataSource, SceneTransforms, EllipsoidTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, CesiumTerrainProvider, CesiumInspector, OrthographicFrustum, defined, EasingFunction, Cesium3DTileset, Matrix4, Matrix3, IonResource, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, ScreenSpaceEventHandler, ScreenSpaceEventType, BoundingSphere, GeometryInstance, Intersect, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, ColorMaterialProperty } from 'cesium';
 
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation. All rights reserved.
@@ -484,213 +484,6 @@ var DrawingUtils;
     DrawingUtils.RaisePos3d = RaisePos3d;
 })(DrawingUtils || (DrawingUtils = {}));
 
-var CESIUM_INSPECTOR_KEY = "_nextspace_inspector";
-var ViewUtils;
-(function (ViewUtils) {
-    function GatherLegacyMapTiles(params) {
-        var viewer = params.viewer;
-        var collection = viewer.imageryLayers;
-        var tiles = [];
-        for (var i = 0; i < collection.length; i++) {
-            var layer = collection.get(i);
-            if (layer._bName) {
-                tiles.push({
-                    alpha: layer.alpha,
-                    brightness: layer.brightness,
-                    contrast: layer.contrast,
-                    hue: layer.hue,
-                    saturation: layer.saturation,
-                    gamma: layer.gamma,
-                    title: layer._bName,
-                });
-            }
-        }
-        return {
-            imagery: tiles.reverse()
-        };
-    }
-    ViewUtils.GatherLegacyMapTiles = GatherLegacyMapTiles;
-    function GatherLegacyTerrainTile(params) {
-        var viewer = params.viewer;
-        var enabled = viewer.terrainProvider;
-        if (enabled === null || enabled === void 0 ? void 0 : enabled._bName) {
-            return {
-                terrain: enabled._bName
-            };
-        }
-        return {
-            terrain: "flatterrain"
-        };
-    }
-    ViewUtils.GatherLegacyTerrainTile = GatherLegacyTerrainTile;
-    function GatherMapTiles(params) {
-        var viewer = params.viewer;
-        var imagery = viewer.imageryLayers;
-        var tiles = [];
-        var _loop_1 = function (i) {
-            var provider = imagery.get(i);
-            if (provider._bMeta) {
-                var idCombo_1 = provider._bMeta.accountId + provider._bMeta.tilesetId;
-                if (!tiles.find(function (x) { return x.accountId + x.tilesetId === idCombo_1; })) {
-                    tiles.push({
-                        accountId: provider._bMeta.accountId,
-                        tilesetId: provider._bMeta.tilesetId,
-                        alpha: provider.alpha,
-                        brightness: provider.brightness,
-                        contrast: provider.contrast,
-                        hue: provider.hue,
-                        saturation: provider.saturation,
-                        gamma: provider.gamma
-                    });
-                }
-            }
-        };
-        for (var i = 0; i < imagery.length; i++) {
-            _loop_1(i);
-        }
-        return {
-            imagery: tiles
-        };
-    }
-    ViewUtils.GatherMapTiles = GatherMapTiles;
-    function GatherTerrainTile(params) {
-        var viewer = params.viewer;
-        var provider = viewer.terrainProvider;
-        if (provider === null || provider === void 0 ? void 0 : provider._bMeta) {
-            return {
-                terrain: {
-                    accountId: provider._bMeta.accountId,
-                    tilesetId: provider._bMeta.tilesetId,
-                }
-            };
-        }
-        else if (provider instanceof EllipsoidTerrainProvider) {
-            return {
-                terrain: {
-                    tilesetId: ProjectViewTile.EDefaultTerrain.FlatTerrain,
-                    accountId: null
-                }
-            };
-        }
-        return null;
-    }
-    ViewUtils.GatherTerrainTile = GatherTerrainTile;
-    function SetTerrainWireframeStatus(params) {
-        if (!params.viewer[CESIUM_INSPECTOR_KEY]) {
-            var InspectorClass = CesiumInspector;
-            if (InspectorClass) {
-                var inspector = new InspectorClass(document.createElement("div"), params.viewer.scene);
-                inspector.container.style.display = "none";
-                params.viewer[CESIUM_INSPECTOR_KEY] = inspector;
-                params.viewer.scene.requestRender();
-            }
-        }
-        if (params.viewer[CESIUM_INSPECTOR_KEY]) {
-            params.viewer[CESIUM_INSPECTOR_KEY].viewModel.wireframe = params.status;
-        }
-    }
-    ViewUtils.SetTerrainWireframeStatus = SetTerrainWireframeStatus;
-    function GetTerrainWireframeStatus(params) {
-        var _a, _b;
-        if (!params.viewer[CESIUM_INSPECTOR_KEY]) {
-            return false;
-        }
-        return (_b = (_a = params.viewer[CESIUM_INSPECTOR_KEY]) === null || _a === void 0 ? void 0 : _a.viewModel) === null || _b === void 0 ? void 0 : _b.wireframe;
-    }
-    ViewUtils.GetTerrainWireframeStatus = GetTerrainWireframeStatus;
-    /**
-     * Changes between perspective and orthographic view.
-     * When Cesium stops being bad at picking positions in 2d mode we'll use the flat earth mode instead.
-     * @param params
-     */
-    function Set2dStatus(params) {
-        var viewer = params.viewer, is2d = params.status, moveCamera = params.moveCamera;
-        var curLens2d = viewer.camera.frustum instanceof OrthographicFrustum;
-        if (curLens2d && !is2d) {
-            viewer.camera.switchToPerspectiveFrustum();
-            viewer.scene.screenSpaceCameraController.enableTilt = true;
-            viewer.scene.requestRender();
-        }
-        else if (!curLens2d && is2d) {
-            viewer.camera.switchToOrthographicFrustum();
-            viewer.scene.screenSpaceCameraController.enableTilt = false;
-            if (moveCamera != false) {
-                try {
-                    // Face camera downwards to make it look 2d.
-                    // We want to try make it look at the center-point of the current view.
-                    // If center cannot be calculated then we'll simply raise the camera and face it downwards.
-                    var scene = viewer.scene;
-                    var windowPosition = new Cartesian2(scene.canvas.clientWidth / 2, scene.canvas.clientHeight / 2);
-                    var ray = viewer.camera.getPickRay(windowPosition);
-                    var intersection = scene.globe.pick(ray, scene);
-                    var center = void 0;
-                    if (defined(intersection)) {
-                        center = Cartographic.fromCartesian(intersection);
-                    }
-                    // Use current camera position if we can't calculate the center.
-                    else {
-                        center = Cartographic.fromCartesian(viewer.camera.position);
-                        center.height = 0;
-                    }
-                    center.height = viewer.camera.positionCartographic.height + 100;
-                    viewer.camera.setView({
-                        destination: Cartographic.toCartesian(center),
-                        orientation: {
-                            heading: 0.0,
-                            pitch: Math$1.toRadians(-90.0),
-                            roll: 0.0
-                        }
-                    });
-                }
-                catch (e) {
-                    console.error(e);
-                }
-            }
-            viewer.scene.requestRender();
-        }
-    }
-    ViewUtils.Set2dStatus = Set2dStatus;
-    function Get2dStatus(params) {
-        var viewer = params.viewer;
-        return viewer.camera.frustum instanceof OrthographicFrustum;
-    }
-    ViewUtils.Get2dStatus = Get2dStatus;
-    function SetLockedCameraStatus(params) {
-        var viewer = params.viewer, status = params.status;
-        var scene = viewer === null || viewer === void 0 ? void 0 : viewer.scene;
-        if (!scene) {
-            return;
-        }
-        if (status) {
-            scene.screenSpaceCameraController.enableInputs = false;
-            scene.screenSpaceCameraController.enableTranslate = false;
-            scene.screenSpaceCameraController.enableZoom = false;
-            scene.screenSpaceCameraController.enableRotate = false;
-            scene.screenSpaceCameraController.enableTilt = false;
-        }
-        else {
-            scene.screenSpaceCameraController.enableInputs = true;
-            scene.screenSpaceCameraController.enableTranslate = true;
-            scene.screenSpaceCameraController.enableZoom = true;
-            scene.screenSpaceCameraController.enableRotate = true;
-            if (!ViewUtils.Get2dStatus({ viewer: viewer })) {
-                scene.screenSpaceCameraController.enableTilt = true;
-            }
-        }
-        viewer.scene.requestRender();
-    }
-    ViewUtils.SetLockedCameraStatus = SetLockedCameraStatus;
-    function GetLockedCameraStatus(params) {
-        var _a;
-        var scene = (_a = params.viewer) === null || _a === void 0 ? void 0 : _a.scene;
-        if (!scene) {
-            return false;
-        }
-        return !scene.screenSpaceCameraController.enableTranslate;
-    }
-    ViewUtils.GetLockedCameraStatus = GetLockedCameraStatus;
-})(ViewUtils || (ViewUtils = {}));
-
 /**
  * Returns if a given visual can be styled by this utility.
  * @param viewer
@@ -813,6 +606,11 @@ function getColor(viewer, key, graphic) {
     if (!color) {
         if (key == "default") {
             color = calculateCurColor(viewer, graphic);
+            // We'll only store the default color.
+            // Rest can be retrieved every time to get the latest setting value.
+            if (color) {
+                storeColor(viewer, key, color, graphic);
+            }
         }
         else if (key == "select") {
             color = _selectColor;
@@ -820,9 +618,6 @@ function getColor(viewer, key, graphic) {
         else if (key == "highlight") {
             color = _highlightColor;
         }
-        if (color) {
-            storeColor(viewer, key, color, graphic);
-        }
     }
     return color;
 }
@@ -1309,6 +1104,81 @@ function GetValue(viewer, obj) {
     }
     return obj;
 }
+/**
+ * Returns location information from a given tileset feature.
+ * This works well with OSM.
+ * @param feature
+ * @returns
+ */
+var getLocationFromFeature = function (feature) {
+    var _a;
+    var prepareLatitude = function (propName, value) {
+        value = +value;
+        // Check to see if the lat is in valid degrees, if not, try convert from radians.
+        if (value < -90 || value > 90) {
+            value = Math$1.toDegrees(value);
+        }
+        // If the value is really small we'll assume it's in radians.
+        // "cesium#blah" properties are always in degrees. No need to check.
+        if (value < 0.9 && !propName.startsWith("cesium#")) {
+            value = Math$1.toDegrees(value);
+        }
+        return value;
+    };
+    var prepareLongitude = function (propName, value) {
+        value = +value;
+        // Check to see if the lon is in valid degrees, if not, try convert from radians.
+        if (value < -180 || value > 180) {
+            value = Math$1.toDegrees(value);
+        }
+        // If the value is really small we'll assume it's in radians.
+        // "cesium#blah" properties are always in degrees. No need to check.
+        if (value < 0.9 && !propName.startsWith("cesium#")) {
+            value = Math$1.toDegrees(value);
+        }
+        return value;
+    };
+    var result = {
+        location: {
+            latitude: null,
+            longitude: null,
+            altitude: 0
+        },
+        isClamped: true,
+        radius: null
+    };
+    // 'getPropertyIds' = new version of Cesium, 'getPropertyNames' = old version.
+    var featureAny = feature;
+    var propertyNames = featureAny.getPropertyNames ? featureAny.getPropertyNames() : (_a = featureAny.getPropertyIds) === null || _a === void 0 ? void 0 : _a.call(featureAny);
+    propertyNames = [].concat(propertyNames);
+    for (var i = 0; i < propertyNames.length; i++) {
+        var propName = propertyNames[i];
+        var propLower = propName.toLowerCase();
+        if (propLower.includes("latitude")) {
+            result.location.latitude = prepareLatitude(propName, feature.getProperty(propName));
+            continue;
+        }
+        if (propLower.includes("longitude")) {
+            result.location.longitude = prepareLongitude(propName, feature.getProperty(propName));
+            continue;
+        }
+        if (propLower.includes("height")) {
+            result.radius = +feature.getProperty(propName);
+            continue;
+        }
+        if (propLower.includes("terrain")) {
+            result.location.altitude = +feature.getProperty(propName);
+            if (!result.location.altitude) {
+                result.location.altitude = 0;
+            }
+            continue;
+        }
+    }
+    if (result.location.latitude == null || result.location.longitude == null) {
+        return null;
+    }
+    return result;
+};
 var EntityUtils;
 (function (EntityUtils) {
     /**
@@ -1318,12 +1188,11 @@ var EntityUtils;
      * @param params
      */
     function GetLocation(params) {
-        var _a;
         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, MIN_RECT_DIAGONAL_LENGTH, data, spheres, processPosHeight, ensureHeightRefs, getEntityPositions, allPosses, i, sample, samplePosses, valid, j, samplePos, k, allPos, distance, rect, factor, marginX, marginY, diagonalLen, terrData, posCarto, height, MIN_POSSES_LEN, allPointSphere, rectSphere, combinedSphere;
+            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 _this = this;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
                     case 0:
                         api = params.api, viewer = params.viewer, samples = params.samples, visualRegister = params.visualRegister, minimumAlt = params.minimumAlt, paddingAlt = params.paddingAlt;
                         if (!paddingAlt) {
@@ -1336,10 +1205,6 @@ var EntityUtils;
                         apiCalls = 0;
                         MAX_VALID_SAMPLES = 20;
                         validSamples = 0;
-                        MIN_RECT_DIAGONAL_LENGTH = isNaN(minimumAlt) || minimumAlt == null ? 0 : minimumAlt * 10;
-                        if (MIN_RECT_DIAGONAL_LENGTH < 1500) {
-                            MIN_RECT_DIAGONAL_LENGTH = 1500;
-                        }
                         data = {
                             pos3d: null,
                             rectangle: null,
@@ -1437,7 +1302,7 @@ var EntityUtils;
                                     case 0:
                                         entityId = sample.entityId, entity = sample.entity, tileset = sample.tileset, tilesetId = sample.tilesetId;
                                         evaluateRendered = function () { return __awaiter(_this, void 0, void 0, function () {
-                                            var rego, posses, visual, visualHeightRef, hierarchy, hPosses, hPossesSample, step, i, pPosses, pPossesSample, step, i, pPosses, pPossesSample, step, i, pos3d_1, toAdjust, modelExt, 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_1, toAdjust, modelExt, sphere, data_1, pos3d_2, toAdjust, sphere;
                                             return __generator(this, function (_a) {
                                                 switch (_a.label) {
                                                     case 0:
@@ -1445,102 +1310,130 @@ var EntityUtils;
                                                             entityId: sample.entityId,
                                                         }) : null;
                                                         posses = [];
-                                                        if (!((rego === null || rego === void 0 ? void 0 : rego.visual) instanceof Entity)) return [3 /*break*/, 14];
-                                                        visual = rego.visual;
-                                                        visualHeightRef = HeightReference.RELATIVE_TO_GROUND;
-                                                        if (!visual.model) return [3 /*break*/, 1];
-                                                        visualHeightRef = GetValue(viewer, visual.model.heightReference);
-                                                        return [3 /*break*/, 12];
+                                                        parts = GatherEntity({
+                                                            entity: rego === null || rego === void 0 ? void 0 : rego.visual,
+                                                        });
+                                                        i = 0;
+                                                        _a.label = 1;
                                                     case 1:
-                                                        if (!visual.polygon) return [3 /*break*/, 4];
-                                                        visualHeightRef = GetValue(viewer, visual.polygon.heightReference);
-                                                        hierarchy = GetValue(viewer, visual.polygon.hierarchy);
-                                                        if (!(hierarchy === null || hierarchy === void 0 ? void 0 : hierarchy.positions)) return [3 /*break*/, 3];
+                                                        if (!(i < parts.length)) return [3 /*break*/, 19];
+                                                        part = parts[i];
+                                                        if (!(part instanceof Entity)) return [3 /*break*/, 16];
+                                                        visualHeightRef = HeightReference.RELATIVE_TO_GROUND;
+                                                        if (!part.model) return [3 /*break*/, 2];
+                                                        visualHeightRef = GetValue(viewer, part.model.heightReference);
+                                                        return [3 /*break*/, 13];
+                                                    case 2:
+                                                        if (!part.polygon) return [3 /*break*/, 5];
+                                                        visualHeightRef = GetValue(viewer, part.polygon.heightReference);
+                                                        hierarchy = GetValue(viewer, part.polygon.hierarchy);
+                                                        if (!(hierarchy === null || hierarchy === void 0 ? void 0 : hierarchy.positions)) return [3 /*break*/, 4];
                                                         hPosses = hierarchy.positions.map(function (x) { return x.clone ? x.clone() : x; });
                                                         hPossesSample = [];
                                                         step = Math.max(1, Math.floor(hPosses.length / 5));
-                                                        for (i = 0; i < hPosses.length; i += step) {
-                                                            hPossesSample.push(hPosses[i]);
+                                                        for (i_1 = 0; i_1 < hPosses.length; i_1 += step) {
+                                                            hPossesSample.push(hPosses[i_1]);
                                                         }
                                                         return [4 /*yield*/, ensureHeightRefs(hPossesSample, __assign(__assign({}, sample), { heightRef: visualHeightRef }))];
-                                                    case 2:
+                                                    case 3:
                                                         _a.sent();
                                                         posses = posses.concat(hPossesSample);
-                                                        _a.label = 3;
-                                                    case 3: return [3 /*break*/, 12];
-                                                    case 4:
-                                                        if (!visual.polyline) return [3 /*break*/, 7];
-                                                        visualHeightRef = GetValue(viewer, visual.polyline.clampToGround) ?
+                                                        _a.label = 4;
+                                                    case 4: return [3 /*break*/, 13];
+                                                    case 5:
+                                                        if (!part.polyline) return [3 /*break*/, 8];
+                                                        visualHeightRef = GetValue(viewer, part.polyline.clampToGround) ?
                                                             HeightReference.CLAMP_TO_GROUND : HeightReference.NONE;
-                                                        pPosses = GetValue(viewer, visual.polyline.positions);
-                                                        if (!(pPosses === null || pPosses === void 0 ? void 0 : pPosses.length)) return [3 /*break*/, 6];
+                                                        pPosses = GetValue(viewer, part.polyline.positions);
+                                                        if (!(pPosses === null || pPosses === void 0 ? void 0 : pPosses.length)) return [3 /*break*/, 7];
                                                         // Grab 5 positions from the polyline at varied indexes.
                                                         pPosses = pPosses.map(function (x) { return x.clone ? x.clone() : x; });
                                                         pPossesSample = [];
                                                         step = Math.max(1, Math.floor(pPosses.length / 5));
-                                                        for (i = 0; i < pPosses.length; i += step) {
-                                                            pPossesSample.push(pPosses[i]);
+                                                        for (i_2 = 0; i_2 < pPosses.length; i_2 += step) {
+                                                            pPossesSample.push(pPosses[i_2]);
                                                         }
                                                         return [4 /*yield*/, ensureHeightRefs(pPossesSample, __assign(__assign({}, sample), { heightRef: visualHeightRef }))];
-                                                    case 5:
+                                                    case 6:
                                                         _a.sent();
                                                         posses = posses.concat(pPossesSample);
-                                                        _a.label = 6;
-                                                    case 6: return [3 /*break*/, 12];
-                                                    case 7:
-                                                        if (!visual.billboard) return [3 /*break*/, 8];
-                                                        visualHeightRef = GetValue(viewer, visual.billboard.heightReference);
-                                                        return [3 /*break*/, 12];
+                                                        _a.label = 7;
+                                                    case 7: return [3 /*break*/, 13];
                                                     case 8:
-                                                        if (!visual.corridor) return [3 /*break*/, 11];
-                                                        visualHeightRef = GetValue(viewer, visual.corridor.heightReference);
-                                                        pPosses = GetValue(viewer, visual.corridor.positions);
-                                                        if (!(pPosses === null || pPosses === void 0 ? void 0 : pPosses.length)) return [3 /*break*/, 10];
+                                                        if (!part.billboard) return [3 /*break*/, 9];
+                                                        visualHeightRef = GetValue(viewer, part.billboard.heightReference);
+                                                        return [3 /*break*/, 13];
+                                                    case 9:
+                                                        if (!part.corridor) return [3 /*break*/, 12];
+                                                        visualHeightRef = GetValue(viewer, part.corridor.heightReference);
+                                                        pPosses = GetValue(viewer, part.corridor.positions);
+                                                        if (!(pPosses === null || pPosses === void 0 ? void 0 : pPosses.length)) return [3 /*break*/, 11];
                                                         // Grab 5 positions from the corridor at varied indexes.
                                                         pPosses = pPosses.map(function (x) { return x.clone ? x.clone() : x; });
                                                         pPossesSample = [];
                                                         step = Math.max(1, Math.floor(pPosses.length / 5));
-                                                        for (i = 0; i < pPosses.length; i += step) {
-                                                            pPossesSample.push(pPosses[i]);
+                                                        for (i_3 = 0; i_3 < pPosses.length; i_3 += step) {
+                                                            pPossesSample.push(pPosses[i_3]);
                                                         }
                                                         return [4 /*yield*/, ensureHeightRefs(pPossesSample, __assign(__assign({}, sample), { heightRef: visualHeightRef }))];
-                                                    case 9:
+                                                    case 10:
                                                         _a.sent();
                                                         posses = posses.concat(pPossesSample);
-                                                        _a.label = 10;
-                                                    case 10: return [3 /*break*/, 12];
-                                                    case 11:
-                                                        if (visual.ellipse) {
-                                                            visualHeightRef = GetValue(viewer, visual.ellipse.heightReference);
+                                                        _a.label = 11;
+                                                    case 11: return [3 /*break*/, 13];
+                                                    case 12:
+                                                        if (part.ellipse) {
+                                                            visualHeightRef = GetValue(viewer, part.ellipse.heightReference);
                                                         }
-                                                        else if (visual.point) {
-                                                            visualHeightRef = GetValue(viewer, visual.point.heightReference);
+                                                        else if (part.point) {
+                                                            visualHeightRef = GetValue(viewer, part.point.heightReference);
                                                         }
-                                                        _a.label = 12;
-                                                    case 12:
-                                                        pos3d_1 = GetValue(viewer, visual.position);
-                                                        if (!(pos3d_1 === null || pos3d_1 === void 0 ? void 0 : pos3d_1.x)) return [3 /*break*/, 14];
+                                                        _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];
                                                         return [4 /*yield*/, ensureHeightRefs(toAdjust, __assign(__assign({}, sample), { heightRef: visualHeightRef }))];
-                                                    case 13:
+                                                    case 14:
                                                         _a.sent();
                                                         pos3d_1 = toAdjust[0];
                                                         posses.push(pos3d_1);
-                                                        if (visual.model) {
-                                                            modelExt = visual.model;
+                                                        if (part.model) {
+                                                            modelExt = part.model;
                                                             if (modelExt._radius && modelExt._radius > -1) {
                                                                 sphere = BoundingSphere.fromPoints([pos3d_1]);
                                                                 sphere.radius = modelExt._radius;
                                                                 spheres.push(sphere);
                                                             }
                                                         }
-                                                        _a.label = 14;
-                                                    case 14: return [2 /*return*/, posses];
+                                                        _a.label = 15;
+                                                    case 15: return [3 /*break*/, 18];
+                                                    case 16:
+                                                        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];
+                                                        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);
+                                                        if (data_1.radius != null && !isNaN(data_1.radius)) {
+                                                            sphere = new BoundingSphere(pos3d_2, data_1.radius);
+                                                            spheres.push(sphere);
+                                                        }
+                                                        _a.label = 18;
+                                                    case 18:
+                                                        i++;
+                                                        return [3 /*break*/, 1];
+                                                    case 19: return [2 /*return*/, posses];
                                                 }
                                             });
                                         }); };
                                         evaluateRecord = function () { return __awaiter(_this, void 0, void 0, function () {
-                                            var posses, location_1, latitude, longitude, pos3d_2, pointStr, points, point, pos3d_3, lineStr, points, pPosses, pRings, boundary, points, pPosses, point, bPosses;
+                                            var posses, location_1, latitude, longitude, pos3d_3, pointStr, points, point, pos3d_4, lineStr, points, pPosses, pRings, boundary, points, pPosses, point, bPosses;
                                             return __generator(this, function (_a) {
                                                 switch (_a.label) {
                                                     case 0:
@@ -1551,8 +1444,8 @@ var EntityUtils;
                                                             longitude = EnsureNumber(location_1.longitude);
                                                             // Disallowing exact 0.
                                                             if (latitude || longitude) {
-                                                                pos3d_2 = Cartesian3.fromDegrees(longitude, latitude, EnsureNumber(location_1.altitude));
-                                                                posses.push(pos3d_2);
+                                                                pos3d_3 = Cartesian3.fromDegrees(longitude, latitude, EnsureNumber(location_1.altitude));
+                                                                posses.push(pos3d_3);
                                                             }
                                                         }
                                                         if (!(entity.geometry && typeof entity.geometry == "object")) return [3 /*break*/, 4];
@@ -1561,8 +1454,8 @@ var EntityUtils;
                                                             points = Geometry.ParsePoints(pointStr);
                                                             point = points.length > 0 ? points[0] : null;
                                                             if (point && Carto.ValidateCarto(point)) {
-                                                                pos3d_3 = Cartesian3.fromDegrees(EnsureNumber(point.longitude), EnsureNumber(point.latitude), EnsureNumber(point.altitude));
-                                                                posses.push(pos3d_3);
+                                                                pos3d_4 = Cartesian3.fromDegrees(EnsureNumber(point.longitude), EnsureNumber(point.latitude), EnsureNumber(point.altitude));
+                                                                posses.push(pos3d_4);
                                                             }
                                                         }
                                                         lineStr = entity.geometry.LineString;
@@ -1753,13 +1646,13 @@ var EntityUtils;
                         }); };
                         allPosses = [];
                         i = 0;
-                        _b.label = 1;
+                        _a.label = 1;
                     case 1:
                         if (!(i < samples.length)) return [3 /*break*/, 4];
                         sample = samples[i];
                         return [4 /*yield*/, getEntityPositions(sample)];
                     case 2:
-                        samplePosses = _b.sent();
+                        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) {
@@ -1786,7 +1679,7 @@ var EntityUtils;
                                 }
                             }
                         }
-                        _b.label = 3;
+                        _a.label = 3;
                     case 3:
                         i++;
                         return [3 /*break*/, 1];
@@ -1800,25 +1693,29 @@ var EntityUtils;
                             rect.west -= marginX;
                             rect.north += marginY;
                             rect.south -= marginY;
-                            diagonalLen = Cartesian3.distance(Cartesian3.fromRadians(rect.west, rect.north), Cartesian3.fromRadians(rect.east, rect.south));
-                            terrData = ViewUtils.GatherTerrainTile({
-                                viewer: viewer
-                            });
-                            if (((_a = terrData === null || terrData === void 0 ? void 0 : terrData.terrain) === null || _a === void 0 ? void 0 : _a.tilesetId) == ProjectViewTile.EDefaultTerrain.FlatTerrain) {
-                                MIN_RECT_DIAGONAL_LENGTH = 0;
+                            data.rectangle = rect;
+                            carto = Rectangle.center(rect);
+                            carto.height = 0;
+                            for (i = 0; i < allPosses.length; i++) {
+                                pos = allPosses[i];
+                                carto.height += Cartographic.fromCartesian(pos).height;
+                            }
+                            if (carto.height != 0) {
+                                carto.height /= allPosses.length;
                             }
-                            posCarto = Cartographic.fromCartesian(allPosses[0]);
-                            height = posCarto.height + (diagonalLen * 1.5);
-                            data.pos3d = Cartesian3.fromRadians(posCarto.longitude, posCarto.latitude, height);
-                            MIN_POSSES_LEN = 10;
-                            if (diagonalLen >= MIN_RECT_DIAGONAL_LENGTH && allPosses.length >= MIN_POSSES_LEN) {
-                                data.rectangle = rect;
+                            data.pos3d = Cartesian3.fromRadians(carto.longitude, carto.latitude, carto.height);
+                            radius = Cartesian3.distance(Cartesian3.fromRadians(rect.west, rect.north), Cartesian3.fromRadians(rect.east, rect.south));
+                            if (radius != 0) {
+                                radius /= 2;
                             }
+                            sphere = new BoundingSphere(data.pos3d, radius);
+                            spheres.push(sphere);
+                            data.sphere = sphere;
                         }
                         else if (allPosses.length == 1) {
                             data.pos3d = allPosses[0];
                         }
-                        if (spheres.length) {
+                        if ((data.rectangle && spheres.length > 1) || (!data.rectangle && spheres.length > 0)) {
                             allPointSphere = BoundingSphere.fromPoints(allPosses);
                             spheres.push(allPointSphere);
                             if (data.rectangle) {
@@ -1850,9 +1747,9 @@ var EntityUtils;
             if ((rego === null || rego === void 0 ? void 0 : rego.visual) instanceof Entity) {
                 var visual = rego.visual;
                 if (visual.position) {
-                    var pos3d_4 = GetValue(viewer, visual.position);
+                    var pos3d_5 = GetValue(viewer, visual.position);
                     // Fix height reference.
-                    if (pos3d_4 === null || pos3d_4 === void 0 ? void 0 : pos3d_4.x) {
+                    if (pos3d_5 === null || pos3d_5 === void 0 ? void 0 : pos3d_5.x) {
                         var visualHeightRef = HeightReference.RELATIVE_TO_GROUND;
                         if (visual.model) {
                             visualHeightRef = GetValue(viewer, visual.model.heightReference);
@@ -1879,7 +1776,7 @@ var EntityUtils;
                         return DrawingUtils.EnsurePosHeight({
                             desiredHeightRef: params.returnHeightRef,
                             heightRef: visualHeightRef,
-                            pos3d: pos3d_4,
+                            pos3d: pos3d_5,
                             viewer: viewer
                         });
                     }
@@ -2542,6 +2439,213 @@ var RenderManager;
     RenderManager.GetZoomMinMax = GetZoomMinMax;
 })(RenderManager || (RenderManager = {}));
 
+var CESIUM_INSPECTOR_KEY = "_nextspace_inspector";
+var ViewUtils;
+(function (ViewUtils) {
+    function GatherLegacyMapTiles(params) {
+        var viewer = params.viewer;
+        var collection = viewer.imageryLayers;
+        var tiles = [];
+        for (var i = 0; i < collection.length; i++) {
+            var layer = collection.get(i);
+            if (layer._bName) {
+                tiles.push({
+                    alpha: layer.alpha,
+                    brightness: layer.brightness,
+                    contrast: layer.contrast,
+                    hue: layer.hue,
+                    saturation: layer.saturation,
+                    gamma: layer.gamma,
+                    title: layer._bName,
+                });
+            }
+        }
+        return {
+            imagery: tiles.reverse()
+        };
+    }
+    ViewUtils.GatherLegacyMapTiles = GatherLegacyMapTiles;
+    function GatherLegacyTerrainTile(params) {
+        var viewer = params.viewer;
+        var enabled = viewer.terrainProvider;
+        if (enabled === null || enabled === void 0 ? void 0 : enabled._bName) {
+            return {
+                terrain: enabled._bName
+            };
+        }
+        return {
+            terrain: "flatterrain"
+        };
+    }
+    ViewUtils.GatherLegacyTerrainTile = GatherLegacyTerrainTile;
+    function GatherMapTiles(params) {
+        var viewer = params.viewer;
+        var imagery = viewer.imageryLayers;
+        var tiles = [];
+        var _loop_1 = function (i) {
+            var provider = imagery.get(i);
+            if (provider._bMeta) {
+                var idCombo_1 = provider._bMeta.accountId + provider._bMeta.tilesetId;
+                if (!tiles.find(function (x) { return x.accountId + x.tilesetId === idCombo_1; })) {
+                    tiles.push({
+                        accountId: provider._bMeta.accountId,
+                        tilesetId: provider._bMeta.tilesetId,
+                        alpha: provider.alpha,
+                        brightness: provider.brightness,
+                        contrast: provider.contrast,
+                        hue: provider.hue,
+                        saturation: provider.saturation,
+                        gamma: provider.gamma
+                    });
+                }
+            }
+        };
+        for (var i = 0; i < imagery.length; i++) {
+            _loop_1(i);
+        }
+        return {
+            imagery: tiles
+        };
+    }
+    ViewUtils.GatherMapTiles = GatherMapTiles;
+    function GatherTerrainTile(params) {
+        var viewer = params.viewer;
+        var provider = viewer.terrainProvider;
+        if (provider === null || provider === void 0 ? void 0 : provider._bMeta) {
+            return {
+                terrain: {
+                    accountId: provider._bMeta.accountId,
+                    tilesetId: provider._bMeta.tilesetId,
+                }
+            };
+        }
+        else if (provider instanceof EllipsoidTerrainProvider) {
+            return {
+                terrain: {
+                    tilesetId: ProjectViewTile.EDefaultTerrain.FlatTerrain,
+                    accountId: null
+                }
+            };
+        }
+        return null;
+    }
+    ViewUtils.GatherTerrainTile = GatherTerrainTile;
+    function SetTerrainWireframeStatus(params) {
+        if (!params.viewer[CESIUM_INSPECTOR_KEY]) {
+            var InspectorClass = CesiumInspector;
+            if (InspectorClass) {
+                var inspector = new InspectorClass(document.createElement("div"), params.viewer.scene);
+                inspector.container.style.display = "none";
+                params.viewer[CESIUM_INSPECTOR_KEY] = inspector;
+                params.viewer.scene.requestRender();
+            }
+        }
+        if (params.viewer[CESIUM_INSPECTOR_KEY]) {
+            params.viewer[CESIUM_INSPECTOR_KEY].viewModel.wireframe = params.status;
+        }
+    }
+    ViewUtils.SetTerrainWireframeStatus = SetTerrainWireframeStatus;
+    function GetTerrainWireframeStatus(params) {
+        var _a, _b;
+        if (!params.viewer[CESIUM_INSPECTOR_KEY]) {
+            return false;
+        }
+        return (_b = (_a = params.viewer[CESIUM_INSPECTOR_KEY]) === null || _a === void 0 ? void 0 : _a.viewModel) === null || _b === void 0 ? void 0 : _b.wireframe;
+    }
+    ViewUtils.GetTerrainWireframeStatus = GetTerrainWireframeStatus;
+    /**
+     * Changes between perspective and orthographic view.
+     * When Cesium stops being bad at picking positions in 2d mode we'll use the flat earth mode instead.
+     * @param params
+     */
+    function Set2dStatus(params) {
+        var viewer = params.viewer, is2d = params.status, moveCamera = params.moveCamera;
+        var curLens2d = viewer.camera.frustum instanceof OrthographicFrustum;
+        if (curLens2d && !is2d) {
+            viewer.camera.switchToPerspectiveFrustum();
+            viewer.scene.screenSpaceCameraController.enableTilt = true;
+            viewer.scene.requestRender();
+        }
+        else if (!curLens2d && is2d) {
+            viewer.camera.switchToOrthographicFrustum();
+            viewer.scene.screenSpaceCameraController.enableTilt = false;
+            if (moveCamera != false) {
+                try {
+                    // Face camera downwards to make it look 2d.
+                    // We want to try make it look at the center-point of the current view.
+                    // If center cannot be calculated then we'll simply raise the camera and face it downwards.
+                    var scene = viewer.scene;
+                    var windowPosition = new Cartesian2(scene.canvas.clientWidth / 2, scene.canvas.clientHeight / 2);
+                    var ray = viewer.camera.getPickRay(windowPosition);
+                    var intersection = scene.globe.pick(ray, scene);
+                    var center = void 0;
+                    if (defined(intersection)) {
+                        center = Cartographic.fromCartesian(intersection);
+                    }
+                    // Use current camera position if we can't calculate the center.
+                    else {
+                        center = Cartographic.fromCartesian(viewer.camera.position);
+                        center.height = 0;
+                    }
+                    center.height = viewer.camera.positionCartographic.height + 100;
+                    viewer.camera.setView({
+                        destination: Cartographic.toCartesian(center),
+                        orientation: {
+                            heading: 0.0,
+                            pitch: Math$1.toRadians(-90.0),
+                            roll: 0.0
+                        }
+                    });
+                }
+                catch (e) {
+                    console.error(e);
+                }
+            }
+            viewer.scene.requestRender();
+        }
+    }
+    ViewUtils.Set2dStatus = Set2dStatus;
+    function Get2dStatus(params) {
+        var viewer = params.viewer;
+        return viewer.camera.frustum instanceof OrthographicFrustum;
+    }
+    ViewUtils.Get2dStatus = Get2dStatus;
+    function SetLockedCameraStatus(params) {
+        var viewer = params.viewer, status = params.status;
+        var scene = viewer === null || viewer === void 0 ? void 0 : viewer.scene;
+        if (!scene) {
+            return;
+        }
+        if (status) {
+            scene.screenSpaceCameraController.enableInputs = false;
+            scene.screenSpaceCameraController.enableTranslate = false;
+            scene.screenSpaceCameraController.enableZoom = false;
+            scene.screenSpaceCameraController.enableRotate = false;
+            scene.screenSpaceCameraController.enableTilt = false;
+        }
+        else {
+            scene.screenSpaceCameraController.enableInputs = true;
+            scene.screenSpaceCameraController.enableTranslate = true;
+            scene.screenSpaceCameraController.enableZoom = true;
+            scene.screenSpaceCameraController.enableRotate = true;
+            if (!ViewUtils.Get2dStatus({ viewer: viewer })) {
+                scene.screenSpaceCameraController.enableTilt = true;
+            }
+        }
+        viewer.scene.requestRender();
+    }
+    ViewUtils.SetLockedCameraStatus = SetLockedCameraStatus;
+    function GetLockedCameraStatus(params) {
+        var _a;
+        var scene = (_a = params.viewer) === null || _a === void 0 ? void 0 : _a.scene;
+        if (!scene) {
+            return false;
+        }
+        return !scene.screenSpaceCameraController.enableTranslate;
+    }
+    ViewUtils.GetLockedCameraStatus = GetLockedCameraStatus;
+})(ViewUtils || (ViewUtils = {}));
+
 var MODEL_MIN_RADIUS = 10;
 var POINT_MIN_RADIUS = 15;
 // If a shape has more than this amount of points, we'll avoid checking it because it will take too long.
@@ -19899,7 +20003,7 @@ var CesiumViewMonitor;
     CesiumViewMonitor$$1.Monitor = Monitor;
 })(CesiumViewMonitor || (CesiumViewMonitor = {}));
 
-var VERSION$1 = "3.2.6";
+var VERSION$1 = "3.2.8";
 
 export { VERSION$1 as 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, ViewUtils, DrawingUtils, MeasureUtils, EntityUtils, Draw3dPolygon, Draw3dPolyline };
 //# sourceMappingURL=bruce-cesium.es5.js.map