bruce-cesium 3.0.7 → 3.0.9

package/dist/bruce-cesium.umd.js

@@ -506,15 +506,23 @@
          * @returns
          */
         function GetTerrainHeight(params) {
+            var _a;
             return __awaiter(this, void 0, void 0, function () {
-                var pos3d, viewer, sample, height, e_1;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
+                var pos3d, viewer, terrainProviderReady, sample, height, e_1;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
                         case 0:
                             pos3d = params.pos3d, viewer = params.viewer;
-                            _a.label = 1;
+                            _b.label = 1;
                         case 1:
-                            _a.trys.push([1, 3, , 4]);
+                            _b.trys.push([1, 3, , 4]);
+                            terrainProviderReady = Boolean((_a = viewer === null || viewer === void 0 ? void 0 : viewer.terrainProvider) === null || _a === void 0 ? void 0 : _a.ready);
+                            if (!terrainProviderReady) {
+                                return [2 /*return*/, {
+                                        height: 0,
+                                        error: "Terrain provider not ready."
+                                    }];
+                            }
                             if (viewer.scene.terrainProvider instanceof Cesium.EllipsoidTerrainProvider) {
                                 return [2 /*return*/, {
                                         height: 0
@@ -522,7 +530,7 @@
                             }
                             return [4 /*yield*/, Cesium.sampleTerrainMostDetailed(viewer.scene.terrainProvider, [Cesium.Cartographic.fromCartesian(pos3d)])];
                         case 2:
-                            sample = _a.sent();
+                            sample = _b.sent();
                             height = (sample === null || sample === void 0 ? void 0 : sample.length) ? sample[0].height : null;
                             if (isNaN(height)) {
                                 return [2 /*return*/, {
@@ -534,7 +542,7 @@
                                     height: height
                                 }];
                         case 3:
-                            e_1 = _a.sent();
+                            e_1 = _b.sent();
                             return [2 /*return*/, {
                                     height: 0,
                                     error: e_1
@@ -705,12 +713,17 @@
          * @param minimumHeight height relative to ground
          */
         function RaisePos3d(viewer, pos3d, minimumHeight) {
+            var _a;
             if (minimumHeight === void 0) { minimumHeight = 0; }
             return __awaiter(this, void 0, void 0, function () {
-                var carto, terrainCarto, sample, terrainHeight;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
+                var terrainProviderReady, carto, terrainCarto, sample, terrainHeight;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
                         case 0:
+                            terrainProviderReady = Boolean((_a = viewer === null || viewer === void 0 ? void 0 : viewer.terrainProvider) === null || _a === void 0 ? void 0 : _a.ready);
+                            if (!terrainProviderReady) {
+                                return [2 /*return*/, pos3d];
+                            }
                             carto = Cesium.Cartographic.fromCartesian(pos3d);
                             terrainCarto = carto.clone();
                             terrainCarto.height = 0;
@@ -719,12 +732,12 @@
                             return [3 /*break*/, 3];
                         case 1: return [4 /*yield*/, Cesium.sampleTerrainMostDetailed(viewer.scene.terrainProvider, [terrainCarto])];
                         case 2:
-                            sample = _a.sent();
+                            sample = _b.sent();
                             terrainHeight = (sample === null || sample === void 0 ? void 0 : sample.length) ? sample[0].height : null;
                             if (terrainHeight != null) {
                                 carto.height = Math.max(carto.height, terrainHeight + minimumHeight);
                             }
-                            _a.label = 3;
+                            _b.label = 3;
                         case 3: return [2 /*return*/, Cesium.Cartesian3.fromRadians(carto.longitude, carto.latitude, carto.height)];
                     }
                 });
@@ -804,7 +817,7 @@
         function GatherTerrainTile(params) {
             var viewer = params.viewer;
             var provider = viewer.terrainProvider;
-            if (provider._bMeta) {
+            if (provider === null || provider === void 0 ? void 0 : provider._bMeta) {
                 return {
                     terrain: {
                         accountId: provider._bMeta.accountId,
@@ -1109,12 +1122,12 @@
          * @param params
          */
         function GetLocation(params) {
-            var _a;
+            var _a, _b;
             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, processPosHeight, ensureHeightRefs, getEntityPositions, allPosses, i, sample, samplePosses, valid, j, samplePos, k, allPos, distance, rect, factor, marginX, marginY, diagonalLen, terrData, posCarto, height, MIN_POSSES_LEN;
+                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, terrainProviderReady, data, processPosHeight, ensureHeightRefs, getEntityPositions, allPosses, i, sample, samplePosses, valid, j, samplePos, k, allPos, distance, rect, factor, marginX, marginY, diagonalLen, terrData, posCarto, height, MIN_POSSES_LEN;
                 var _this = this;
-                return __generator(this, function (_b) {
-                    switch (_b.label) {
+                return __generator(this, function (_c) {
+                    switch (_c.label) {
                         case 0:
                             api = params.api, viewer = params.viewer, samples = params.samples, visualRegister = params.visualRegister, minimumAlt = params.minimumAlt, paddingAlt = params.paddingAlt;
                             if (!paddingAlt) {
@@ -1131,6 +1144,7 @@
                             if (MIN_RECT_DIAGONAL_LENGTH < 1500) {
                                 MIN_RECT_DIAGONAL_LENGTH = 1500;
                             }
+                            terrainProviderReady = Boolean((_a = viewer === null || viewer === void 0 ? void 0 : viewer.terrainProvider) === null || _a === void 0 ? void 0 : _a.ready);
                             data = {
                                 pos3d: null,
                                 rectangle: null
@@ -1140,11 +1154,12 @@
                                 return __generator(this, function (_a) {
                                     switch (_a.label) {
                                         case 0:
-                                            if (!(!isNaN(minimumAlt) && minimumAlt != null)) return [3 /*break*/, 5];
+                                            if (!(!isNaN(minimumAlt) && minimumAlt != null)) return [3 /*break*/, 7];
                                             carto = Cesium.Cartographic.fromCartesian(pos3d);
-                                            if (!(carto === null || carto === void 0 ? void 0 : carto.latitude)) return [3 /*break*/, 4];
+                                            if (!(carto === null || carto === void 0 ? void 0 : carto.latitude)) return [3 /*break*/, 6];
                                             baseHeight = 0;
-                                            if (!(heightRef == null || heightRef == Cesium.HeightReference.RELATIVE_TO_GROUND || heightRef == Cesium.HeightReference.NONE)) return [3 /*break*/, 3];
+                                            if (!(heightRef == null || heightRef == Cesium.HeightReference.RELATIVE_TO_GROUND || heightRef == Cesium.HeightReference.NONE)) return [3 /*break*/, 5];
+                                            if (!terrainProviderReady) return [3 /*break*/, 4];
                                             if (!(terrainSamples > MAX_TERRAIN_SAMPLES)) return [3 /*break*/, 1];
                                             baseHeight = viewer.scene.globe.getHeight(carto);
                                             return [3 /*break*/, 3];
@@ -1157,7 +1172,11 @@
                                             baseHeight = terrData === null || terrData === void 0 ? void 0 : terrData.height;
                                             terrainSamples += 1;
                                             _a.label = 3;
-                                        case 3:
+                                        case 3: return [3 /*break*/, 5];
+                                        case 4:
+                                            baseHeight = 0;
+                                            _a.label = 5;
+                                        case 5:
                                             if (baseHeight != undefined && !isNaN(baseHeight)) {
                                                 height = baseHeight + minimumAlt;
                                                 if (height > carto.height) {
@@ -1165,17 +1184,17 @@
                                                 }
                                                 return [2 /*return*/, Cesium.Cartesian3.fromRadians(carto.longitude, carto.latitude, carto.height + paddingAlt)];
                                             }
-                                            _a.label = 4;
-                                        case 4: return [3 /*break*/, 6];
-                                        case 5:
+                                            _a.label = 6;
+                                        case 6: return [3 /*break*/, 8];
+                                        case 7:
                                             if (paddingAlt) {
                                                 carto = Cesium.Cartographic.fromCartesian(pos3d);
                                                 if (carto === null || carto === void 0 ? void 0 : carto.latitude) {
                                                     return [2 /*return*/, Cesium.Cartesian3.fromRadians(carto.longitude, carto.latitude, carto.height + paddingAlt)];
                                                 }
                                             }
-                                            _a.label = 6;
-                                        case 6: return [2 /*return*/, pos3d];
+                                            _a.label = 8;
+                                        case 8: return [2 /*return*/, pos3d];
                                     }
                                 });
                             }); };
@@ -1542,13 +1561,13 @@
                             }); };
                             allPosses = [];
                             i = 0;
-                            _b.label = 1;
+                            _c.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 = _c.sent();
                             if (samplePosses === null || samplePosses === void 0 ? void 0 : samplePosses.length) {
                                 valid = !(allPosses === null || allPosses === void 0 ? void 0 : allPosses.length);
                                 if (!valid) {
@@ -1575,7 +1594,7 @@
                                     }
                                 }
                             }
-                            _b.label = 3;
+                            _c.label = 3;
                         case 3:
                             i++;
                             return [3 /*break*/, 1];
@@ -1593,7 +1612,7 @@
                                 terrData = exports.ViewUtils.GatherTerrainTile({
                                     viewer: viewer
                                 });
-                                if (((_a = terrData === null || terrData === void 0 ? void 0 : terrData.terrain) === null || _a === void 0 ? void 0 : _a.tilesetId) == bruceModels.ProjectViewTile.EDefaultTerrain.FlatTerrain) {
+                                if (((_b = terrData === null || terrData === void 0 ? void 0 : terrData.terrain) === null || _b === void 0 ? void 0 : _b.tilesetId) == bruceModels.ProjectViewTile.EDefaultTerrain.FlatTerrain) {
                                     MIN_RECT_DIAGONAL_LENGTH = 0;
                                 }
                                 posCarto = Cesium.Cartographic.fromCartesian(allPosses[0]);
@@ -2959,6 +2978,11 @@
                 if (viewer.isDestroyed()) {
                     return;
                 }
+                // Entity relations have an embedded dispose method.
+                if (entity === null || entity === void 0 ? void 0 : entity._dispose) {
+                    entity._dispose();
+                    entity._dispose = null;
+                }
                 if (entity._parentEntity && !ignoreParent) {
                     doRemove({
                         viewer: viewer,
@@ -3993,6 +4017,7 @@
             this.curPoints = [];
             this.animateInterval = null;
             this.retryTimeout = null;
+            this.hidden = false;
             this.viewer = params.viewer;
             this.pos1 = params.pos1;
             this.pos2 = params.pos2;
@@ -4010,6 +4035,20 @@
             }
             this.prepareEntities();
         }
+        Object.defineProperty(CesiumParabola.prototype, "Disposed", {
+            get: function () {
+                return this.disposed;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(CesiumParabola.prototype, "Hidden", {
+            set: function (value) {
+                this.hidden = value;
+            },
+            enumerable: false,
+            configurable: true
+        });
         Object.defineProperty(CesiumParabola.prototype, "curPos1", {
             get: function () {
                 return this.pos1 instanceof Function ? this.pos1() : this.pos1;
@@ -4032,7 +4071,10 @@
                         return _this.curPoints;
                     }, false),
                     width: this.width,
-                    material: Cesium.Color.fromCssColorString(this.color)
+                    material: Cesium.Color.fromCssColorString(this.color),
+                    show: new Cesium.CallbackProperty(function () {
+                        return !_this.hidden;
+                    }, false)
                 }
             });
             var p1Entity = new Cesium.Entity({
@@ -4044,7 +4086,10 @@
                     pixelSize: this.width * 1.3,
                     color: Cesium.Color.fromCssColorString(this.color),
                     outlineColor: Cesium.Color.WHITE,
-                    outlineWidth: 2
+                    outlineWidth: 2,
+                    show: new Cesium.CallbackProperty(function () {
+                        return !_this.hidden;
+                    }, false)
                 }
             });
             var p2Entity = new Cesium.Entity({
@@ -4056,7 +4101,10 @@
                     pixelSize: this.width * 1.8,
                     color: Cesium.Color.fromCssColorString(this.color),
                     outlineColor: Cesium.Color.WHITE,
-                    outlineWidth: 2
+                    outlineWidth: 2,
+                    show: new Cesium.CallbackProperty(function () {
+                        return !_this.hidden;
+                    }, false)
                 }
             });
             p1Entity.parent = parabola;
@@ -4064,7 +4112,9 @@
             var siblings = [p1Entity, p2Entity];
             this.parabola = parabola;
             this.siblings = siblings;
-            this.viewer.entities.add(this.parabola);
+            // The parabola is hidden while this entity is not added.
+            // If we avoid adding it now, then the parent can control if the parabola is visible at first or not.
+            // this.viewer.entities.add(this.parabola);
             this.viewer.entities.add(p1Entity);
             this.viewer.entities.add(p2Entity);
         };
@@ -4493,7 +4543,7 @@
             function Render(params) {
                 var _a;
                 return __awaiter(this, void 0, void 0, function () {
-                    var style, entity, bColor, cColor, width, duration, hDistanceRatio, fromPos, toPos, updatingPosses, updatePosses, parabola, cEntities, cEntity, i, sibling, updateInterval;
+                    var style, entity, bColor, cColor, width, duration, hDistanceRatio, fromPos, toPos, updatingPosses, updatePosses, parabola, cEntities, cEntity, i, sibling, updateInterval, disposed;
                     var _this = this;
                     return __generator(this, function (_b) {
                         style = (_a = params.style) === null || _a === void 0 ? void 0 : _a.Settings;
@@ -4566,6 +4616,7 @@
                             duration: duration,
                             heightDistanceRatio: hDistanceRatio
                         });
+                        parabola.Hidden = true;
                         cEntities = parabola.Animate();
                         cEntity = cEntities.parabola;
                         cEntity._siblingGraphics = [];
@@ -4577,14 +4628,29 @@
                             var _a;
                             if (!((_a = params.viewer) === null || _a === void 0 ? void 0 : _a.scene) ||
                                 params.viewer.isDestroyed() ||
-                                !params.viewer.entities.contains(cEntity)) {
+                                (!parabola || parabola.Disposed)) {
                                 clearInterval(updateInterval);
                                 parabola.Dispose();
                                 return;
                             }
+                            if (parabola) {
+                                var visible = cEntity && cEntity.show != false && params.viewer.entities.contains(cEntity);
+                                parabola.Hidden = !visible;
+                            }
                             updatePosses();
                             params.viewer.scene.requestRender();
                         }, 1000);
+                        disposed = false;
+                        cEntity._dispose = function () {
+                            if (disposed) {
+                                return;
+                            }
+                            disposed = true;
+                            clearInterval(updateInterval);
+                            if (parabola) {
+                                parabola.Dispose();
+                            }
+                        };
                         return [2 /*return*/, cEntity];
                     });
                 });
@@ -8874,21 +8940,20 @@
                 }
             }
             else {
-                if (!(location === null || location === void 0 ? void 0 : location.latitude)) {
-                    return;
+                if ((location === null || location === void 0 ? void 0 : location.latitude) || (location === null || location === void 0 ? void 0 : location.longitude)) {
+                    var translationMatrix = Cesium.Matrix4.fromTranslation(new Cesium.Cartesian3(EnsureNumber(transform.x), EnsureNumber(transform.y), EnsureNumber(transform.z)), new Cesium.Matrix4());
+                    var pos3d = Cesium.Cartesian3.fromDegrees(EnsureNumber(location.longitude), EnsureNumber(location.latitude), EnsureNumber(location.altitude));
+                    var m1 = Cesium.Transforms.eastNorthUpToFixedFrame(pos3d);
+                    var hpr = Cesium.HeadingPitchRoll.fromDegrees(EnsureNumber(transform.heading), EnsureNumber(transform.pitch), EnsureNumber(transform.roll), new Cesium.HeadingPitchRoll());
+                    var hprRotation = Cesium.Matrix3.fromHeadingPitchRoll(hpr);
+                    var scaleMatrix = Cesium.Matrix4.fromUniformScale(EnsureNumber(transform.scale), new Cesium.Matrix4());
+                    var combinedMatrix = Cesium.Matrix4.multiply(m1, translationMatrix, new Cesium.Matrix4());
+                    combinedMatrix = Cesium.Matrix4.multiply(combinedMatrix, Cesium.Matrix4.fromRotation(hprRotation), new Cesium.Matrix4());
+                    combinedMatrix = Cesium.Matrix4.multiply(combinedMatrix, scaleMatrix, new Cesium.Matrix4());
+                    root.transform = combinedMatrix;
+                    // Force matrix to update
+                    root.updateTransform();
                 }
-                var translationMatrix = Cesium.Matrix4.fromTranslation(new Cesium.Cartesian3(EnsureNumber(transform.x), EnsureNumber(transform.y), EnsureNumber(transform.z)), new Cesium.Matrix4());
-                var pos3d = Cesium.Cartesian3.fromDegrees(EnsureNumber(location.longitude), EnsureNumber(location.latitude), EnsureNumber(location.altitude));
-                var m1 = Cesium.Transforms.eastNorthUpToFixedFrame(pos3d);
-                var hpr = Cesium.HeadingPitchRoll.fromDegrees(EnsureNumber(transform.heading), EnsureNumber(transform.pitch), EnsureNumber(transform.roll), new Cesium.HeadingPitchRoll());
-                var hprRotation = Cesium.Matrix3.fromHeadingPitchRoll(hpr);
-                var scaleMatrix = Cesium.Matrix4.fromUniformScale(EnsureNumber(transform.scale), new Cesium.Matrix4());
-                var combinedMatrix = Cesium.Matrix4.multiply(m1, translationMatrix, new Cesium.Matrix4());
-                combinedMatrix = Cesium.Matrix4.multiply(combinedMatrix, Cesium.Matrix4.fromRotation(hprRotation), new Cesium.Matrix4());
-                combinedMatrix = Cesium.Matrix4.multiply(combinedMatrix, scaleMatrix, new Cesium.Matrix4());
-                root.transform = combinedMatrix;
-                // Force matrix to update
-                root.updateTransform();
             }
             // Store data in the tileset as we can't interpret it using the cesium primitive later.
             var cTilesetExt = cTileset;
@@ -10477,6 +10542,10 @@
                 if (!getter) {
                     getter = new EntityFilterGetter.Getter(params.api, params.monitor, params.typeId, params.batchSize, params.attrFilter, params.cdn);
                     this.data[cacheKey] = getter;
+                    /**
+                     * Debug option.
+                     * This will display the bounds of the cells that are being fetched.
+                     */
                     if (params.viewer && params.debugShowBounds) {
                         // Cell id -> entity.
                         var cellCache_1 = {};
@@ -12059,6 +12128,10 @@
                                     if (cEntity && !_this.viewer.isDestroyed() && _this.viewer.entities.contains(cEntity)) {
                                         _this.viewer.entities.remove(cEntity);
                                     }
+                                    if (cEntity === null || cEntity === void 0 ? void 0 : cEntity._dispose) {
+                                        cEntity._dispose();
+                                        cEntity._dispose = null;
+                                    }
                                 };
                                 return [4 /*yield*/, RelationRenderEngine.Render({
                                         apiGetter: this.apiGetter,
@@ -12470,6 +12543,10 @@
                                     if (cEntity && !_this.viewer.isDestroyed() && _this.viewer.entities.contains(cEntity)) {
                                         _this.viewer.entities.remove(cEntity);
                                     }
+                                    if (cEntity === null || cEntity === void 0 ? void 0 : cEntity._dispose) {
+                                        cEntity._dispose();
+                                        cEntity._dispose = null;
+                                    }
                                 };
                                 return [4 /*yield*/, RelationRenderEngine.Render({
                                         apiGetter: this.apiGetter,
@@ -15320,7 +15397,8 @@
                             params.manager.VisualsRegister.SetSelected({
                                 selected: true,
                                 entityIds: selectedIds,
-                                refreshIfSelected: false
+                                refreshIfSelected: false,
+                                requestRender: false
                             });
                         }
                         params.manager.VisualsRegister.ClearHidden();
@@ -15331,7 +15409,8 @@
                         if (hiddenIds != null) {
                             params.manager.VisualsRegister.SetHidden({
                                 hidden: true,
-                                entityIds: hiddenIds
+                                entityIds: hiddenIds,
+                                requestRender: false
                             });
                         }
                         params.manager.VisualsRegister.ClearIsolated();
@@ -15342,7 +15421,8 @@
                         if (isolatedIds != null) {
                             params.manager.VisualsRegister.SetIsolated({
                                 isolated: true,
-                                entityIds: isolatedIds
+                                entityIds: isolatedIds,
+                                requestRender: false
                             });
                         }
                         labelledIds = bSettings === null || bSettings === void 0 ? void 0 : bSettings.labelledEntityIds;
@@ -15350,7 +15430,9 @@
                             labelledIds = (_2 = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _2 === void 0 ? void 0 : _2.labelledEntityIds;
                         }
                         if (!(labelledIds === null || labelledIds === void 0 ? void 0 : labelledIds.length)) {
-                            params.manager.VisualsRegister.ClearLabelled();
+                            params.manager.VisualsRegister.ClearLabelled({
+                                requestRender: false
+                            });
                         }
                         else {
                             curLabelledIds = params.manager.VisualsRegister.GetLabelled();
@@ -15362,7 +15444,8 @@
                             toUnLabel = curLabelledIds.filter(function (id) { return labelledIds.indexOf(id) === -1; });
                             params.manager.VisualsRegister.SetLabelled({
                                 labelled: false,
-                                entityIds: toUnLabel
+                                entityIds: toUnLabel,
+                                requestRender: false
                             });
                         }
                         params.manager.VisualsRegister.ClearOpacity();
@@ -15376,7 +15459,8 @@
                                 if (opacity != 1) {
                                     params.manager.VisualsRegister.SetOpacity({
                                         entityIds: [entityId],
-                                        opacity: opacity
+                                        opacity: opacity,
+                                        requestRender: false
                                     });
                                 }
                             }
@@ -15411,6 +15495,7 @@
                         if (!relations) {
                             relations = [];
                         }
+                        viewer.scene.requestRender();
                         curEnabled = params.manager.GetEnabledItemIds();
                         newItemIds = (_5 = bSettings === null || bSettings === void 0 ? void 0 : bSettings.menuItemIds) !== null && _5 !== void 0 ? _5 : [];
                         for (_i = 0, curEnabled_1 = curEnabled; _i < curEnabled_1.length; _i++) {
@@ -18397,7 +18482,7 @@
         ViewerUtils.CreateWidgets = CreateWidgets;
     })(exports.ViewerUtils || (exports.ViewerUtils = {}));
 
-    var VERSION$1 = "3.0.7";
+    var VERSION$1 = "3.0.9";
 
     exports.VERSION = VERSION$1;
     exports.CesiumParabola = CesiumParabola;