bruce-cesium 5.2.0 → 5.2.2

package/dist/bruce-cesium.es5.js

@@ -1,6 +1,6 @@
 import { BruceEvent, Cartes, Entity as Entity$1, Carto, Geometry, MathUtils, LRUCache, Api, Calculator, ClientFile, EntityTag, EntityType, ObjectUtils, Style, ProjectViewTile, DelayQueue, EntityLod, Bounds, ZoomControl, EntityRelationType, ENVIRONMENT, EntityHistoricData, Tileset, EntityCoords, DataLab, EntitySource, MenuItem, EntityRelation, ProgramKey, ProjectView, ProjectViewBookmark, Camera, ProjectViewLegacyTile, EntityAttachment, EntityAttachmentType, EntityAttribute, AbstractApi, Session } from 'bruce-models';
 import * as Cesium from 'cesium';
-import { Cartographic, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, JulianDate, Entity, DistanceDisplayCondition, ClassificationType, ArcType, CornerType, ShadowMode, ConstantProperty, ConstantPositionProperty, ColorBlendMode, HeadingPitchRoll, Transforms, Model, SceneMode, HorizontalOrigin, VerticalOrigin, PolygonHierarchy, PolylineGraphics, ColorMaterialProperty, GeoJsonDataSource, Primitive, Cesium3DTileFeature, Cesium3DTileColorBlendMode, HeadingPitchRange, Ion, Cesium3DTileStyle, KmlDataSource, OrthographicFrustum, EasingFunction, NearFarScalar, SceneTransforms, EllipsoidTerrainProvider, IonImageryProvider, createWorldImagery, createWorldImageryAsync, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, CesiumTerrainProvider, EllipsoidGeodesic, sampleTerrainMostDetailed, defined, Cesium3DTileset, PolygonPipeline, Matrix4, Matrix3, IonResource, CesiumInspector, ClockRange, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, ScreenSpaceEventHandler, ScreenSpaceEventType, BoundingSphere, GeometryInstance, Quaternion, CzmlDataSource, Intersect, Fullscreen } from 'cesium';
+import { Cartographic, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, JulianDate, Entity, DistanceDisplayCondition, ClassificationType, ArcType, CornerType, ShadowMode, ConstantProperty, ConstantPositionProperty, HorizontalOrigin, VerticalOrigin, PolygonHierarchy, PolylineGraphics, ColorMaterialProperty, ColorBlendMode, HeadingPitchRoll, Transforms, Model, SceneMode, Primitive, Cesium3DTileFeature, GeoJsonDataSource, Cesium3DTileColorBlendMode, HeadingPitchRange, Cesium3DTileStyle, Ion, KmlDataSource, SceneTransforms, OrthographicFrustum, EasingFunction, NearFarScalar, EllipsoidTerrainProvider, IonImageryProvider, createWorldImagery, createWorldImageryAsync, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, CesiumTerrainProvider, CesiumInspector, defined, ClockRange, Cesium3DTileset, Matrix4, Matrix3, IonResource, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, BoundingSphere, GeometryInstance, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, ScreenSpaceEventHandler, ScreenSpaceEventType, Quaternion, CzmlDataSource, Intersect, Fullscreen } from 'cesium';
 
 const TIME_LAG = 300;
 const POSITION_CHECK_TIMER = 950;
@@ -12183,7 +12183,7 @@ var EntitiesRenderManager;
             const minMax = RenderManager.GetZoomMinMax({
                 zoomControl: this.zoomControl
             });
-            this.getter.IncludeMenuItem(this.item.id, (tagsToRender === null || tagsToRender === void 0 ? void 0 : tagsToRender.length) ? tagsToRender : [], minMax[0], minMax[1]);
+            this.getter.IncludeMenuItem(this.item.id, this.item.BruceEntity["EntityType.ID"], (tagsToRender === null || tagsToRender === void 0 ? void 0 : tagsToRender.length) ? tagsToRender : [], minMax[0], minMax[1]);
             this.getterSub = this.getter.OnUpdate.Subscribe((entities) => {
                 if (isTagItem) {
                     this.distributeForRender(entities.filter((entity) => {
@@ -14633,7 +14633,8 @@ const MAX_RETRY_ATTEMPTS = 1;
 const RETRY_DELAY_INCREMENT = 500;
 const REQUEST_PAGE_DELAY = 50;
 class regMenuItemGetter {
-    constructor(tagIds, minHeight, maxHeight) {
+    constructor(typeId, tagIds, minHeight, maxHeight) {
+        this.TypeId = typeId;
         this.TagIds = tagIds;
         this.MinHeight = minHeight;
         this.MaxHeight = maxHeight;
@@ -14700,9 +14701,9 @@ var EntityFilterGetter;
             // We use this for refreshing historic data without having to repeat geographic queries.
             this.gatheredIntegrity = null;
             this.gatheredEntityIds = [];
-            const { api, viewer, viewPort, typeId, schemaId, batchSize, attrFilter, historicAttrKey, historicInterpolation, historic, viaCdn, scenario } = params;
+            const { api, viewer, viewPort, typeIds, schemaId, batchSize, attrFilter, historicAttrKey, historicInterpolation, historic, viaCdn, scenario } = params;
             this.api = api;
-            this.typeId = typeId;
+            this.typeIds = typeIds;
             this.schemaId = schemaId;
             this.historic = Boolean(historic);
             this.historicAttrKey = historicAttrKey;
@@ -14732,6 +14733,9 @@ var EntityFilterGetter;
             if (this.scenario) {
                 integrity += this.scenario;
             }
+            if (this.typeIds) {
+                integrity += this.typeIds.join();
+            }
             return integrity;
         }
         viewAreaSub() {
@@ -14829,8 +14833,8 @@ var EntityFilterGetter;
         GetMenuItems() {
             return Object.keys(this.registeredItems);
         }
-        IncludeMenuItem(menuItemId, layerIds, minHeight, maxHeight) {
-            this.registeredItems[menuItemId] = new regMenuItemGetter(layerIds, minHeight, maxHeight);
+        IncludeMenuItem(menuItemId, typeId, layerIds, minHeight, maxHeight) {
+            this.registeredItems[menuItemId] = new regMenuItemGetter(typeId, layerIds, minHeight, maxHeight);
             this.updateState();
         }
         ExcludeMenuItem(menuItemId) {
@@ -14854,6 +14858,7 @@ var EntityFilterGetter;
         }
         updateState() {
             const tagIds = [];
+            const typeIds = [];
             const menuItemIds = this.GetMenuItems();
             let minHeight = null;
             let maxHeight = null;
@@ -14875,12 +14880,19 @@ var EntityFilterGetter;
                             }
                         }
                     }
+                    const itemTypeId = menuItem.TypeId;
+                    if (itemTypeId) {
+                        if (!typeIds.includes(itemTypeId)) {
+                            typeIds.push(itemTypeId);
+                        }
+                    }
                 }
             }
             if (menuItemIds.length > 0) {
                 // Reset cells so none are marked as fetched.
                 this.cells = new EntityGlobe.Grid();
                 this.tagIds = tagIds;
+                this.typeIds = typeIds;
                 this.minHeight = minHeight;
                 this.maxHeight = maxHeight;
                 this.updateBounds();
@@ -14977,7 +14989,7 @@ var EntityFilterGetter;
                             nextPage: false,
                             nextPageUrl: null
                         };
-                        await SharedGetters.Queue.Run("Loading Entities from Menu Item that loads Entity Type: " + this.typeId, async () => {
+                        await SharedGetters.Queue.Run("Loading Entities from Menu Item that loads Entity Type: " + this.typeIds, async () => {
                             var _a;
                             if (abortController.signal.aborted || !((_a = this.GetMenuItems()) === null || _a === void 0 ? void 0 : _a.length)) {
                                 return;
@@ -15005,7 +15017,7 @@ var EntityFilterGetter;
                                     filter: {
                                         pageSize: PAGE_SIZE,
                                         pageIndex: curCell.FetchPageIndex,
-                                        entityTypeId: this.typeId,
+                                        entityTypeId: this.typeIds,
                                         layerIds: this.tagIds,
                                         // Any tag specified will be allowed.
                                         layerIdsOperator: "in",
@@ -15150,7 +15162,7 @@ var EntityFilterGetter;
                         // Controller we can use to abort the request when a new loop starts.
                         const controller = this.historicRefreshAbortController = new AbortController();
                         let entities = [];
-                        await SharedGetters.Queue.Run("Refreshing historic data in Menu Item that loads Entity Type: " + this.typeId, async () => {
+                        await SharedGetters.Queue.Run("Refreshing historic data in Menu Item that loads Entity Type: " + this.typeIds, async () => {
                             var _a;
                             if (controller.signal.aborted || !((_a = this.GetMenuItems()) === null || _a === void 0 ? void 0 : _a.length)) {
                                 return;
@@ -15164,7 +15176,7 @@ var EntityFilterGetter;
                                 filter: {
                                     pageSize: batch.length,
                                     pageIndex: 0,
-                                    entityTypeId: this.typeId,
+                                    entityTypeId: this.typeIds,
                                     layerIds: this.tagIds,
                                     layerIdsOperator: "in",
                                     sortOrder: Api.ESortOrder.Asc,
@@ -15220,7 +15232,9 @@ var EntityFilterGetter;
 function createFilterGetterCacheKey(params) {
     let cacheKey = "";
     cacheKey += params.api.GetBaseUrl();
-    cacheKey += params.typeId;
+    // Not including Type ID in the cache key now.
+    // This allows us to re-use the same getter between Entity Types.
+    // cacheKey += params.typeId;
     cacheKey += params.batchSize;
     cacheKey += String(params.cdn);
     cacheKey += params.schemaId ? params.schemaId : "";
@@ -15250,7 +15264,7 @@ var SharedGetters;
                     api: params.api,
                     viewer: params.viewer,
                     viewPort: params.monitor,
-                    typeId: params.typeId,
+                    typeIds: !params.typeId ? null : typeof params.typeId == "string" ? [params.typeId] : params.typeId,
                     schemaId: params.schemaId,
                     batchSize: params.batchSize,
                     attrFilter: params.attrFilter,
@@ -16893,7 +16907,7 @@ var TilesetCadRenderManager;
                 this.renderPriority = 0;
             }
             (async () => {
-                var _a, _b;
+                var _a, _b, _c;
                 let api = this.getters.GetBruceApi();
                 let coords = null;
                 let tileset = null;
@@ -16950,13 +16964,33 @@ var TilesetCadRenderManager;
                 if (!tileset || this.disposed) {
                     return;
                 }
+                // Get the model tree if it's in a separate file.
+                // There is a setting that is more explicit but it's lying on the file name so can't trust it yet.
+                if (((_a = tileset.settings) === null || _a === void 0 ? void 0 : _a["tilesetVersion"]) > 1) {
+                    try {
+                        const modelTreeUrl = Tileset.GetFileUrl({
+                            api: api,
+                            file: "model_tree.json",
+                            tilesetId: tileset.id,
+                            cacheToken: tileset.generateVersion,
+                            viaCdn: Boolean(this.item.cdnEnabled == null ? true : this.item.cdnEnabled)
+                        });
+                        this.modelTree = await api.get(modelTreeUrl);
+                    }
+                    catch (e) {
+                        console.error(e);
+                    }
+                }
+                if (this.disposed) {
+                    return;
+                }
                 // Render outside the shared process because we can't control file requests from Cesium.
                 const cTileset = this.cTileset = await TilesetRenderEngine.Render({
                     apiGetter: this.getters.GetBruceGetter(),
                     tileset: tileset,
                     viewer: this.viewer,
                     coords: coords,
-                    accountId: (_b = (_a = this.item.tileset) === null || _a === void 0 ? void 0 : _a.ClientAccountID) !== null && _b !== void 0 ? _b : this.getters.GetAccountId(),
+                    accountId: (_c = (_b = this.item.tileset) === null || _b === void 0 ? void 0 : _b.ClientAccountID) !== null && _c !== void 0 ? _c : this.getters.GetAccountId(),
                     viaCdn: Boolean(this.item.cdnEnabled == null ? true : this.item.cdnEnabled),
                     noMemoryLimit: this.item["noMaximumMemory"]
                 });
@@ -17077,7 +17111,7 @@ var TilesetCadRenderManager;
                 }
             };
             const setByEntityId = () => {
-                const bruceIdProp = propertyNames.find(x => String(x).toLowerCase() == "bruceid");
+                const bruceIdProp = propertyNames.find(x => (String(x).toLowerCase() == "bruceid"));
                 if (bruceIdProp) {
                     rego.entityId = feature.getProperty(bruceIdProp);
                 }
@@ -17135,6 +17169,13 @@ var TilesetCadRenderManager;
         getMetaByGeomId(geomId, tileset) {
             var _a;
             let modelTree = (_a = tileset === null || tileset === void 0 ? void 0 : tileset.extensions) === null || _a === void 0 ? void 0 : _a.modelTree;
+            // Wasn't inside tileset.json and instead in a separate file.
+            if (!modelTree) {
+                modelTree = this.modelTree;
+            }
+            if (!modelTree) {
+                return null;
+            }
             return this.digMetaByGeomId(geomId, modelTree, [], 0);
         }
         digMetaByGeomId(geomId, branch, path, depth) {
@@ -29882,7 +29923,7 @@ class WidgetViewBar extends Widget.AWidget {
     }
 }
 
-const VERSION = "5.2.0";
+const VERSION = "5.2.2";
 
 export { VERSION, CesiumViewMonitor, ViewerUtils, ViewerEventTracker, MenuItemManager, isHistoricMetadataChanged, EntityRenderEngine, EntityRenderEnginePoint, EntityRenderEnginePolyline, EntityRenderEnginePolygon, EntityRenderEngineModel3d, MenuItemCreator, VisualsRegister, RenderManager, EntitiesIdsRenderManager, DataLabRenderManager, EntitiesLoadedRenderManager, EntitiesRenderManager, EntityRenderManager, TilesetCadRenderManager, TilesetArbRenderManager, TilesetEntitiesRenderManager, TilesetOsmRenderManager, TilesetPointcloudRenderManager, TilesetGooglePhotosRenderManager, DataSourceStaticKmlManager, GoogleSearchRenderManager, RelationsRenderManager, SharedGetters, CesiumParabola, EntityLabel, ViewRenderEngine, TileRenderEngine, TilesetRenderEngine, CESIUM_INSPECTOR_KEY, CESIUM_TIMELINE_KEY, ViewUtils, DrawingUtils, MeasureUtils, EntityUtils, CesiumEntityStyler, CesiumAnimatedProperty, CesiumAnimatedInOut, Draw3dPolygon, Draw3dPolyline, MeasureCreator, Walkthrough, Widget, VIEWER_BOOKMARKS_WIDGET_KEY, WidgetBookmarks, WidgetBranding, WidgetCursorBar, WidgetEmbeddedInfoView, WidgetInfoView, WidgetNavCompass$$1 as WidgetNavCompass, VIEWER_VIEW_BAR_WIDGET_KEY, WidgetViewBar, WidgetControlViewBar, WidgetControlViewBarSearch, VIEWER_LEFT_PANEL_WIDGET_KEY, VIEWER_LEFT_PANEL_CSS_VAR_LEFT, WidgetLeftPanel, WidgetLeftPanelTab, WidgetLeftPanelTabBookmarks };
 //# sourceMappingURL=bruce-cesium.es5.js.map