bruce-cesium 6.4.9 → 6.5.1

package/dist/bruce-cesium.es5.js

@@ -1,6 +1,6 @@
-import { Cartes, Entity as Entity$1, Calculator, EntityRelationType, EntityType, Style, ENVIRONMENT, ProjectViewTile, DelayQueue, LRUCache, BruceEvent, ObjectUtils, Geometry, EntityHistoricData, EntityLod, ZoomControl, EntityTag, Tileset, Api, EntityCoords, DataLab, EntitySource, ClientFile, MenuItem, EntityRelation, ProgramKey, Bounds, Carto, ProjectView, ProjectViewBookmark, ProjectViewLegacyTile, Camera, AbstractApi, EntityAttachment, EntityAttachmentType, EntityAttribute, MathUtils, Session } from 'bruce-models';
+import { Cartes, Entity as Entity$1, Calculator, EntityRelationType, EntityType, Style, ENVIRONMENT, ProjectViewTile, DelayQueue, LRUCache, BruceEvent, ObjectUtils, Geometry, EntityHistoricData, EntityLod, ZoomControl, EntityTag, Tileset, Api, EntityCoords, DataLab, EntitySource, ClientFile, MenuItem, EntityRelation, ProgramKey, Bounds, Carto, ProjectView, ProjectViewBookmark, Camera, ProjectViewLegacyTile, AbstractApi, Session, EntityAttachment, EntityAttachmentType, EntityAttribute, MathUtils } from 'bruce-models';
 import * as Cesium from 'cesium';
-import { Cartographic, ColorMaterialProperty, Entity, Color, ConstantProperty, CallbackProperty, Primitive, Cesium3DTileFeature, Math as Math$1, Cartesian3, JulianDate, Quaternion, Transforms, HeadingPitchRoll, Matrix4, DistanceDisplayCondition, HeightReference, ColorBlendMode, ShadowMode, ClassificationType, Model, HorizontalOrigin, VerticalOrigin, ConstantPositionProperty, PolygonHierarchy, PolylineGraphics, ArcType, CornerType, Cartesian2, SceneTransforms, NearFarScalar, Matrix3, Rectangle, KmlDataSource, GeoJsonDataSource, SceneMode, Cesium3DTileStyle, HeadingPitchRange, Cesium3DTileColorBlendMode, Ion, EllipsoidTerrainProvider, IonImageryProvider, createWorldImagery, createWorldImageryAsync, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, CesiumTerrainProvider, IonResource, Cesium3DTileset, OrthographicFrustum, EasingFunction, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, EllipsoidGeodesic, sampleTerrainMostDetailed, defined, BoundingSphere, GeometryInstance, PolygonPipeline, CesiumInspector, ClockRange, ScreenSpaceEventHandler, ScreenSpaceEventType, Intersect, CzmlDataSource, Fullscreen } from 'cesium';
+import { Cartographic, ColorMaterialProperty, Entity, Color, ConstantProperty, CallbackProperty, Primitive, Cesium3DTileFeature, DistanceDisplayCondition, HeightReference, ColorBlendMode, HeadingPitchRoll, Math as Math$1, Transforms, ShadowMode, Cartesian3, ClassificationType, Model, HorizontalOrigin, VerticalOrigin, ConstantPositionProperty, PolygonHierarchy, PolylineGraphics, ArcType, CornerType, JulianDate, Quaternion, Matrix4, Cartesian2, SceneTransforms, NearFarScalar, Matrix3, Rectangle, KmlDataSource, GeoJsonDataSource, SceneMode, Cesium3DTileStyle, HeadingPitchRange, Cesium3DTileColorBlendMode, Ion, Cesium3DTileset, IonResource, OrthographicFrustum, EasingFunction, EllipsoidTerrainProvider, IonImageryProvider, createWorldImagery, createWorldImageryAsync, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, CesiumTerrainProvider, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, EllipsoidGeodesic, sampleTerrainMostDetailed, defined, PolygonPipeline, BoundingSphere, GeometryInstance, CesiumInspector, ClockRange, ScreenSpaceEventHandler, ScreenSpaceEventType, CzmlDataSource, Intersect, Fullscreen } from 'cesium';
 
 /**
  * Ensures a number is returned from a given value.
@@ -8582,7 +8582,7 @@ var EntitiesRenderManager;
             this.sources = [];
         }
         async ReRender(params) {
-            var _a, _b, _c, _d;
+            var _a, _b, _c, _d, _e;
             let { entityIds, force, entities, maintain } = params;
             if (entities && !entityIds) {
                 entityIds = entities.map(x => { var _a; return (_a = x.Bruce) === null || _a === void 0 ? void 0 : _a.ID; });
@@ -8635,9 +8635,10 @@ var EntitiesRenderManager;
                             const data = await Entity$1.GetListByIds({
                                 api: this.apiGetter.getApi(),
                                 entityIds: apiIds,
-                                historicKey: (_c = this.item.BruceEntity) === null || _c === void 0 ? void 0 : _c.historicAttrKey,
+                                entityTypeId: (_c = this.item.BruceEntity) === null || _c === void 0 ? void 0 : _c["EntityType.ID"],
+                                historicKey: (_d = this.item.BruceEntity) === null || _d === void 0 ? void 0 : _d.historicAttrKey,
                                 historicPoint: this.viewer.clock.currentTime.toString(),
-                                schemaId: (_d = this.item.BruceEntity) === null || _d === void 0 ? void 0 : _d.schemaId,
+                                schemaId: (_e = this.item.BruceEntity) === null || _e === void 0 ? void 0 : _e.schemaId,
                                 expandSources: true,
                                 scenario: this.scenario,
                                 migrated: true,
@@ -8731,7 +8732,7 @@ var EntitiesRenderManager;
                         return !maintainedLookup[id] && !this.reRenderState.shouldSkipInRun(id, runId);
                     });
                     const checkBatch = async () => {
-                        var _a, _b;
+                        var _a, _b, _c;
                         apiIds = this.reRenderState.filterNonSkippedIds(apiIds, runId);
                         const entityIds = apiIds.splice(0, CHECK_BATCH_SIZE);
                         if (!entityIds.length) {
@@ -8741,9 +8742,10 @@ var EntitiesRenderManager;
                         const { entities } = await Entity$1.GetListByIds({
                             api,
                             entityIds,
-                            historicKey: (_a = this.item.BruceEntity) === null || _a === void 0 ? void 0 : _a.historicAttrKey,
+                            entityTypeId: (_a = this.item.BruceEntity) === null || _a === void 0 ? void 0 : _a["EntityType.ID"],
+                            historicKey: (_b = this.item.BruceEntity) === null || _b === void 0 ? void 0 : _b.historicAttrKey,
                             historicPoint: this.viewer.clock.currentTime.toString(),
-                            schemaId: (_b = this.item.BruceEntity) === null || _b === void 0 ? void 0 : _b.schemaId,
+                            schemaId: (_c = this.item.BruceEntity) === null || _c === void 0 ? void 0 : _c.schemaId,
                             scenario: this.scenario,
                             expandSources: true,
                             migrated: true,
@@ -12282,7 +12284,7 @@ var TilesetRenderEngine;
             const api = apiGetter.getApi(accountId);
             await api.Loading;
             loadUrl = Tileset.GetFileUrl({
-                file: "tileset.json",
+                file: (tileset === null || tileset === void 0 ? void 0 : tileset.rootFileName) ? tileset === null || tileset === void 0 ? void 0 : tileset.rootFileName : (tileset === null || tileset === void 0 ? void 0 : tileset.RootFileName) ? tileset === null || tileset === void 0 ? void 0 : tileset.RootFileName : "tileset.json",
                 tilesetId: (tileset === null || tileset === void 0 ? void 0 : tileset.ID) ? tileset.ID : params.tileset.id,
                 viaCdn: false,
                 legacy: true,
@@ -12294,15 +12296,8 @@ var TilesetRenderEngine;
             const api = apiGetter.getApi(accountId);
             await api.Loading;
             if (api.GetCdnBaseUrl()) {
-                /*
-                 const rootFile = tileset.RootFileName ? tileset.RootFileName : "tileset.json";
-                 loadUrl = api.LegacyTilesetCdnUrl
-                     .replace("<TILESETID>", tileset.ID)
-                     .replace("<FILEPATH>", rootFile)
-                     .replace("<ACCOUNT>", accountId);
-                 */
                 loadUrl = Tileset.GetFileUrl({
-                    file: "tileset.json",
+                    file: (tileset === null || tileset === void 0 ? void 0 : tileset.rootFileName) ? tileset === null || tileset === void 0 ? void 0 : tileset.rootFileName : (tileset === null || tileset === void 0 ? void 0 : tileset.RootFileName) ? tileset === null || tileset === void 0 ? void 0 : tileset.RootFileName : "tileset.json",
                     tilesetId: (tileset === null || tileset === void 0 ? void 0 : tileset.ID) ? tileset.ID : params.tileset.id,
                     viaCdn: true,
                     legacy: true,
@@ -16278,7 +16273,8 @@ var XGridsRenderEngine;
             // When true it makes the new pieces fade-in.
             // The look is similar to sectioning in cesium. Might be a nice setting.
             useLoadingEffect: false
-        }, () => {
+        }, async () => {
+            var _a, _b;
             // Array index is the LOD level, ie: index 0 = LOD 0.
             const lods = obj.getLodInfos();
             //console.log("xgrids-getLodInfos()", lods);
@@ -16289,6 +16285,25 @@ var XGridsRenderEngine;
             if (maxSplats >= HARD_MAX) {
                 console.warn("Reduced splat quality due to the number of splats being too large. Was: \"" + maxSplats + "\", now is: \"" + HARD_MAX + "\".");
             }
+            // Auto fly to.
+            if (params.flyTo) {
+                const pos3d = (_b = (_a = obj === null || obj === void 0 ? void 0 : obj.getBounds) === null || _a === void 0 ? void 0 : _a.call(obj)) === null || _b === void 0 ? void 0 : _b.origin;
+                if (pos3d && Cartes.ValidateCartes3(pos3d)) {
+                    const altered = await DrawingUtils.RaisePos3d(viewer, pos3d, 300);
+                    if (altered && Cartes.ValidateCartes3(altered)) {
+                        viewer.scene.camera.flyTo({
+                            destination: altered,
+                            orientation: {
+                                heading: Math$1.toRadians(0.0),
+                                pitch: Math$1.toRadians(-90.0),
+                                roll: Math$1.toRadians(0.0)
+                            },
+                            duration: 0
+                        });
+                        return;
+                    }
+                }
+            }
         });
         // Highest LOD.
         obj.setStartLod(0);
@@ -16492,7 +16507,8 @@ var TilesetArbRenderManager;
                     this.lccObject = XGridsRenderEngine.Render({
                         api: api,
                         viewer: this.viewer,
-                        tileset: tileset
+                        tileset: tileset,
+                        flyTo: this.item.FlyTo
                     });
                     // Disposed while it was loading so we'll remove it now.
                     if (this.Disposed && this.lccObject) {
@@ -16728,7 +16744,7 @@ var TilesetArbRenderManager;
             }
         }
         onCTilesetLoad() {
-            if (this.item.FlyTo) {
+            if (this.item.FlyTo && this.cTileset) {
                 this.viewer.zoomTo(this.cTileset, new HeadingPitchRange(0.0, -0.5, this.cTileset.boundingSphere.radius / 4.0));
             }
         }
@@ -35281,7 +35297,7 @@ class WidgetViewBar extends Widget.AWidget {
     }
 }
 
-const VERSION = "6.4.9";
+const VERSION = "6.5.1";
 /**
  * Updates the environment instance used by bruce-cesium to one specified.
  * This can be used to ensure that the instance a parent is referencing is shared between bruce-cesium, bruce-models, and the parent app.