bruce-cesium 2.7.2 → 2.7.4

package/dist/bruce-cesium.es5.js

@@ -1,6 +1,6 @@
 import { BruceEvent, Cartes, Carto, Entity as Entity$1, Geometry, Tileset, MathUtils, LRUCache, ZoomControl, Style, EntityTag, Calculator, EntityLod, EntityType, ClientFile, ObjectUtils, Bounds, EntityRelationType, DelayQueue, BatchedDataGetter, EntityCoords, EntityFilterGetter, EntitySource, MenuItem, EntityRelation, ENVIRONMENT, ProjectView, ProjectViewBookmark, ProjectViewTile, ProjectViewLegacyTile, ProgramKey, Camera, AbstractApi, EntityAttachment, EntityAttachmentType, EntityAttribute } from 'bruce-models';
 import * as Cesium from 'cesium';
-import { Cartographic, JulianDate, Cartesian2, CallbackProperty, Cartesian3, Color, Rectangle, Math as Math$1, HeightReference, DistanceDisplayCondition, NearFarScalar, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, HeadingPitchRoll, Transforms, ColorBlendMode, SceneMode, Primitive, Cesium3DTileFeature, HeadingPitchRange, Cesium3DTileColorBlendMode, createOsmBuildings, Cesium3DTileStyle, OrthographicFrustum, EasingFunction, EllipsoidTerrainProvider, CesiumInspector, defined, EllipsoidGeodesic, sampleTerrainMostDetailed, Cesium3DTileset, Model, createWorldTerrain, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, Matrix4, Matrix3, IonResource, PolygonPipeline, ScreenSpaceEventHandler, ScreenSpaceEventType, KmlDataSource, ColorMaterialProperty, GeometryInstance, Ion, BoundingSphere } from 'cesium';
+import { Cartographic, Entity, Primitive, Cesium3DTileFeature, Color, Cartesian2, JulianDate, Cartesian3, SceneMode, Math as Math$1, CallbackProperty, Rectangle, HeightReference, DistanceDisplayCondition, NearFarScalar, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, HeadingPitchRoll, Transforms, ColorBlendMode, Cesium3DTileColorBlendMode, HeadingPitchRange, createOsmBuildings, Cesium3DTileStyle, KmlDataSource, EllipsoidTerrainProvider, CesiumInspector, OrthographicFrustum, defined, createWorldTerrain, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, EllipsoidGeodesic, sampleTerrainMostDetailed, Cesium3DTileset, Model, PolygonPipeline, Matrix4, Matrix3, IonResource, ScreenSpaceEventHandler, ScreenSpaceEventType, ColorMaterialProperty, EasingFunction, GeometryInstance, Ion, BoundingSphere } from 'cesium';
 
 var TIME_LAG = 300;
 var POSITION_CHECK_TIMER = 950;
@@ -3066,6 +3066,7 @@ var EntityRenderEngine;
  */
 var CesiumParabola = /** @class */ (function () {
     function CesiumParabola(params) {
+        this.disposed = false;
         this.color = "white";
         this.width = 2;
         this.duration = 10;
@@ -3147,6 +3148,9 @@ var CesiumParabola = /** @class */ (function () {
     };
     CesiumParabola.prototype.Animate = function () {
         var _this = this;
+        if (this.disposed) {
+            return null;
+        }
         if (this.parabola && !this.viewer.entities.contains(this.parabola)) {
             this.viewer.entities.add(this.parabola);
         }
@@ -3178,9 +3182,34 @@ var CesiumParabola = /** @class */ (function () {
         var RATE_PER_SECOND = 1000 / 40;
         var SEC_DURATION = this.duration;
         var HEIGHT_DISTANCE_RATIO = this.heightDistanceRatio;
-        var TOTAL_POINTS = Math.max(50, Math.min(1000, TOTAL_LENGTH * 0.1));
-        var POINT_LENGTH = TOTAL_LENGTH / TOTAL_POINTS;
-        var TICK_LENGTH_INC = SEC_DURATION == 0 ? TOTAL_LENGTH : TOTAL_POINTS / (RATE_PER_SECOND * SEC_DURATION);
+        var TOTAL_POINTS = null;
+        var POINT_LENGTH = null;
+        var TICK_LENGTH_INC = null;
+        // Updates TOTAL_POINTS, POINT_LENGTH, and TICK_LENGTH_INC based on current TOTAL_LENGTH and camera position.
+        // We want less points the further away the camera is.
+        var updateParams = function () {
+            var _a, _b;
+            // TODO: Do distance to parabola line instead.
+            var MIN_POINTS = 30;
+            var totalPoints = 80;
+            var cameraHeight = (_b = (_a = _this.viewer.camera) === null || _a === void 0 ? void 0 : _a.positionCartographic) === null || _b === void 0 ? void 0 : _b.height;
+            if (isNaN(cameraHeight) || cameraHeight >= 100000) {
+                totalPoints = MIN_POINTS;
+            }
+            else if (cameraHeight >= 10000) {
+                totalPoints = 50;
+            }
+            else if (cameraHeight >= 1000) {
+                totalPoints = 80;
+            }
+            else if (cameraHeight >= 100) {
+                totalPoints = 100;
+            }
+            TOTAL_POINTS = Math.max(MIN_POINTS, Math.min(totalPoints, TOTAL_LENGTH * 0.1));
+            POINT_LENGTH = TOTAL_LENGTH / TOTAL_POINTS;
+            TICK_LENGTH_INC = SEC_DURATION == 0 ? TOTAL_LENGTH : TOTAL_POINTS / (RATE_PER_SECOND * SEC_DURATION);
+        };
+        updateParams();
         var curPoint = 0;
         var quadraticKey = null;
         var quadratic = null;
@@ -3336,30 +3365,45 @@ var CesiumParabola = /** @class */ (function () {
             for (var i = 0; i < totalCycles; i++) {
                 posses.push(getPosition(i));
             }
-            posses.push(getPosition(increment + chips));
+            if (chips) {
+                posses.push(getPosition(increment + chips));
+            }
             if (posses.find(function (x) { return !x || !Cartes.ValidateCartes3(x); })) {
                 return;
             }
             _this.curPoints = posses;
         };
+        var lastTickDate = new Date();
+        var finished = false;
         var doTick = function () {
-            var p1 = _this.curPos1;
-            var p2 = _this.curPos2;
-            var newLength = p1 && p2 ? Cartesian3.distance(p1, p2) : -1;
-            if (newLength > 0 && newLength != TOTAL_LENGTH) {
-                TOTAL_LENGTH = newLength;
-                TOTAL_POINTS = Math.max(50, Math.min(1000, TOTAL_LENGTH * 0.1));
-                POINT_LENGTH = TOTAL_LENGTH / TOTAL_POINTS;
-                TICK_LENGTH_INC = SEC_DURATION == 0 ? TOTAL_LENGTH : TOTAL_POINTS / (RATE_PER_SECOND * SEC_DURATION);
-            }
-            prepareQuadratic();
-            if (quadratic) {
-                if (curPoint < TOTAL_POINTS) {
-                    curPoint += TICK_LENGTH_INC;
+            var curDate = new Date();
+            var seconds = (curDate.getTime() - lastTickDate.getTime()) / 1000;
+            var ticks = seconds * RATE_PER_SECOND;
+            if (!isNaN(ticks) && ticks >= 1) {
+                lastTickDate = curDate;
+                var p1 = _this.curPos1;
+                var p2 = _this.curPos2;
+                var newLength = p1 && p2 ? Cartesian3.distance(p1, p2) : -1;
+                if (newLength > 0 && newLength != TOTAL_LENGTH) {
+                    TOTAL_LENGTH = newLength;
+                    updateParams();
+                }
+                prepareQuadratic();
+                if (quadratic) {
+                    if (curPoint < TOTAL_POINTS) {
+                        curPoint += (TICK_LENGTH_INC * ticks);
+                    }
+                    updatePoints();
+                }
+                _this.viewer.scene.requestRender();
+                if (curPoint >= TOTAL_POINTS && !finished) {
+                    finished = true;
+                    // We can make the interval update super slow now.
+                    // We keep it updating in case the positions move.
+                    clearInterval(_this.animateInterval);
+                    _this.animateInterval = setInterval(doTick, 3000);
                 }
-                updatePoints();
             }
-            _this.viewer.scene.requestRender();
         };
         this.animateInterval = setInterval(doTick, RATE_PER_SECOND);
         return {
@@ -3369,6 +3413,7 @@ var CesiumParabola = /** @class */ (function () {
     };
     CesiumParabola.prototype.Dispose = function () {
         var _this = this;
+        this.disposed = true;
         clearTimeout(this.retryTimeout);
         clearInterval(this.animateInterval);
         var cEntities = [
@@ -7600,6 +7645,7 @@ var TilesetCadRenderManager;
                 visual: feature,
                 accountId: (_b = (_a = this.item.tileset) === null || _a === void 0 ? void 0 : _a.ClientAccountID) !== null && _b !== void 0 ? _b : this.getters.GetAccountId(),
                 tilesetId: (_c = this.item.tileset) === null || _c === void 0 ? void 0 : _c.TilesetID,
+                tilesetType: Tileset.EType.Cad,
                 rootId: this.rootId
             };
             var featureAny = feature;
@@ -8373,6 +8419,7 @@ var TilesetEntitiesRenderManager;
                     priority: 0,
                     visual: feature,
                     tilesetId: (_a = this.item.tileset) === null || _a === void 0 ? void 0 : _a.TilesetID,
+                    tilesetType: Tileset.EType.EntitiesSet,
                     accountId: (_c = (_b = this.item.tileset) === null || _b === void 0 ? void 0 : _b.ClientAccountID) !== null && _c !== void 0 ? _c : this.getters.GetAccountId()
                 };
                 this.visualsManager.AddRego({
@@ -8698,6 +8745,7 @@ var TilesetArbRenderManager;
             this.disposed = false;
             this.cTileset = null;
             this.styler = null;
+            this.tilesetType = null;
             this.viewer = params.viewer;
             this.getters = params.getters;
             this.visualsManager = params.register;
@@ -8802,6 +8850,7 @@ var TilesetArbRenderManager;
                             if (this.disposed) {
                                 return [2 /*return*/];
                             }
+                            this.tilesetType = type;
                             if (tileset && loadUrlOverride) {
                                 tileset.loadUrl = loadUrlOverride;
                             }
@@ -8964,7 +9013,8 @@ var TilesetArbRenderManager;
                 priority: 0,
                 visual: feature,
                 accountId: (_b = (_a = this.item.tileset) === null || _a === void 0 ? void 0 : _a.ClientAccountID) !== null && _b !== void 0 ? _b : this.getters.GetAccountId(),
-                tilesetId: (_c = this.item.tileset) === null || _c === void 0 ? void 0 : _c.TilesetID
+                tilesetId: (_c = this.item.tileset) === null || _c === void 0 ? void 0 : _c.TilesetID,
+                tilesetType: this.tilesetType
             };
             // Two different methods for two different Cesium versions...
             var props = feature.getPropertyNames ? feature.getPropertyNames([]) :
@@ -9110,6 +9160,12 @@ var RelationsRenderManager;
                                 })];
                         case 1:
                             cEntities = _c.sent();
+                            if (this.disposed) {
+                                this.register.RemoveRegos({
+                                    menuItemId: this.item.id
+                                });
+                                return [2 /*return*/];
+                            }
                             for (i = 0; i < relations.length; i++) {
                                 relation = relations[i];
                                 key = RelationRenderEngine.GetRenderGroupId(relation);
@@ -12093,7 +12149,7 @@ function renderNavigator(iteration, params, bookmark, view) {
                     }
                     viewer.shadowMap.size = size;
                     viewer.shadowMap.softShadows = Boolean(shadows.soften);
-                    viewer.shadowMap.darkness = EnsureNumber(shadows.darkness, 0.5);
+                    viewer.shadowMap.darkness = EnsureNumber(shadows.darkness, 0.3);
                     ambientOcclusion = bSettings === null || bSettings === void 0 ? void 0 : bSettings.ambientOcclusion;
                     if (ambientOcclusion == null) {
                         ambientOcclusion = (_v = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _v === void 0 ? void 0 : _v.ambientOcclusion;
@@ -15216,7 +15272,7 @@ var ViewerUtils;
     ViewerUtils.CreateWidgets = CreateWidgets;
 })(ViewerUtils || (ViewerUtils = {}));
 
-var VERSION$1 = "2.7.2";
+var VERSION$1 = "2.7.4";
 
 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, ViewRenderEngine, TileRenderEngine, TilesetRenderEngine, CESIUM_INSPECTOR_KEY, ViewUtils, DrawingUtils, MeasureUtils, EntityUtils, Draw3dPolygon, Draw3dPolyline };
 //# sourceMappingURL=bruce-cesium.es5.js.map