bruce-cesium 6.4.2 → 6.4.3

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, Carto, ProjectView, ProjectViewBookmark, Bounds, Camera, ProjectViewLegacyTile, AbstractApi, EntityAttachment, EntityAttachmentType, EntityAttribute, MathUtils, Session } from 'bruce-models';
 import * as Cesium from 'cesium';
-import { Cartographic, ColorMaterialProperty, Entity, Color, ConstantProperty, CallbackProperty, Primitive, Cesium3DTileFeature, DistanceDisplayCondition, HeightReference, ColorBlendMode, HeadingPitchRoll, Math as Math$1, Transforms, ShadowMode, Cartesian3, ClassificationType, Model, PolygonHierarchy, ConstantPositionProperty, PolylineGraphics, ArcType, CornerType, HorizontalOrigin, VerticalOrigin, JulianDate, Quaternion, Matrix4, Cartesian2, SceneTransforms, NearFarScalar, Matrix3, Rectangle, KmlDataSource, GeoJsonDataSource, SceneMode, Cesium3DTileStyle, HeadingPitchRange, Ion, Cesium3DTileColorBlendMode, EllipsoidTerrainProvider, IonImageryProvider, createWorldImagery, createWorldImageryAsync, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, CesiumTerrainProvider, IonResource, OrthographicFrustum, EasingFunction, Cesium3DTileset, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, EllipsoidGeodesic, sampleTerrainMostDetailed, defined, PolygonPipeline, BoundingSphere, GeometryInstance, CesiumInspector, ClockRange, ScreenSpaceEventHandler, ScreenSpaceEventType, Intersect, CzmlDataSource, Fullscreen } from 'cesium';
+import { Cartographic, ColorMaterialProperty, Entity, Color, ConstantProperty, CallbackProperty, Primitive, Cesium3DTileFeature, DistanceDisplayCondition, Math as Math$1, Cartesian3, JulianDate, Quaternion, Transforms, HeadingPitchRoll, Matrix4, HeightReference, ColorBlendMode, ShadowMode, ClassificationType, Model, HorizontalOrigin, VerticalOrigin, ConstantPositionProperty, ArcType, CornerType, PolygonHierarchy, PolylineGraphics, Cartesian2, SceneTransforms, NearFarScalar, Matrix3, Rectangle, KmlDataSource, GeoJsonDataSource, SceneMode, Cesium3DTileStyle, HeadingPitchRange, Ion, Cesium3DTileset, IonResource, OrthographicFrustum, EasingFunction, Cesium3DTileColorBlendMode, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, EllipsoidTerrainProvider, IonImageryProvider, createWorldImagery, createWorldImageryAsync, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, CesiumTerrainProvider, PolygonPipeline, EllipsoidGeodesic, sampleTerrainMostDetailed, defined, BoundingSphere, GeometryInstance, CesiumInspector, ClockRange, ScreenSpaceEventHandler, ScreenSpaceEventType, Intersect, CzmlDataSource, Fullscreen } from 'cesium';
 
 /**
  * Ensures a number is returned from a given value.
@@ -3019,7 +3019,8 @@ var RelationRenderEngine;
         let entities = (await Entity$1.GetListByIds({
             entityIds: neededEntityIdsIds,
             api: apiGetter.getApi(),
-            migrated: true
+            migrated: true,
+            maxSearchTimeSec: 60 * 2
         })).entities;
         // Create a map for quick reference.
         const entitiesMap = {};
@@ -7833,6 +7834,9 @@ class PointClustering {
     }
 }
 
+function isTurfAvailable() {
+    return window && window.turf != null;
+}
 /**
  * Util for simplifying geometry on the fly.
  */
@@ -7880,7 +7884,7 @@ var SimplifyGeometry;
      */
     function Simplify(entityId, geometry, tolerance) {
         var _a;
-        if (!geometry || !turf || !turf.simplify) {
+        if (!geometry || !isTurfAvailable() || !turf.simplify) {
             return geometry;
         }
         // Convert to geojson so that we can interact with turf.
@@ -8234,7 +8238,7 @@ var EntitiesRenderManager;
                 this.item = params.item;
             }
             (async () => {
-                var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+                var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
                 if (this.disposed) {
                     return;
                 }
@@ -8281,8 +8285,6 @@ var EntitiesRenderManager;
                     this.unsetGetter();
                     (_g = this.viewMonitorRemoval) === null || _g === void 0 ? void 0 : _g.call(this);
                     this.viewMonitorRemoval = null;
-                    (_h = this.entityCheckQueue) === null || _h === void 0 ? void 0 : _h.Dispose();
-                    this.entityCheckQueue = null;
                     clearInterval(this.renderQueueInterval);
                     this.renderQueueInterval = null;
                     this.renderQueue = [];
@@ -8293,30 +8295,23 @@ var EntitiesRenderManager;
                             menuItemId: this.item.id,
                             retainTagIds: tagsToRender
                         });
-                        (_j = this.clustering) === null || _j === void 0 ? void 0 : _j.Dispose();
+                        (_h = this.clustering) === null || _h === void 0 ? void 0 : _h.Dispose();
                     }
                     else {
                         this.visualsManager.RemoveRegos({
                             menuItemId: this.item.id
                         });
-                        (_k = this.clustering) === null || _k === void 0 ? void 0 : _k.Dispose();
+                        (_j = this.clustering) === null || _j === void 0 ? void 0 : _j.Dispose();
                         return;
                     }
                     if (this.item.enableClustering) {
-                        this.clustering = new PointClustering(this.visualsManager, this.item.id, (_l = this.item) === null || _l === void 0 ? void 0 : _l.clustering);
+                        this.clustering = new PointClustering(this.visualsManager, this.item.id, (_k = this.item) === null || _k === void 0 ? void 0 : _k.clustering);
                     }
                     this.setGetter();
                     this.viewMonitorRemoval = this.monitor.Updated().Subscribe(() => {
-                        this.entityCheckQueue.Call();
+                        var _a;
+                        (_a = this.entityCheckQueue) === null || _a === void 0 ? void 0 : _a.Call();
                     });
-                    this.entityCheckQueue = new DelayQueue(() => {
-                        // Don't bother checking for zoom control changes if we only have 1 item.
-                        // We'll let Cesium handle hide/show at max zoom range. 
-                        const shouldCheck = this.zoomControl && this.zoomControl.length > 1;
-                        if (shouldCheck) {
-                            this.doEntityCheck(Object.keys(this.renderedEntities));
-                        }
-                    }, 3000);
                 }
                 catch (e) {
                     console.error(e);
@@ -8368,7 +8363,7 @@ var EntitiesRenderManager;
             }
         }
         setGetter() {
-            var _a, _b, _c;
+            var _a, _b, _c, _d;
             this.unsetGetter();
             const isTagItem = Boolean(this.item.BruceEntity.ExpandLayers);
             let tagsToRender = isTagItem ? this.item.BruceEntity.SelectedExpandLayers : null;
@@ -8419,13 +8414,22 @@ var EntitiesRenderManager;
                     this.distributeForRender(data.entities);
                 }
             });
+            // Cesium itself handles single-visibility ranges very well.
+            // That means we only occasionally check if there is 1 display item for the purpose of cleaning up the registry.
+            const displayItems = this.zoomControl ? (_d = this.zoomControl) === null || _d === void 0 ? void 0 : _d.filter(x => x.DisplayType != ZoomControl.EDisplayType.Hidden) : [];
+            const shouldCheck = displayItems.length > 1;
+            this.entityCheckQueue = new DelayQueue(() => {
+                this.doEntityCheck(Object.keys(this.renderedEntities));
+            }, shouldCheck ? 3000 : 30000);
         }
         unsetGetter() {
-            var _a, _b;
+            var _a, _b, _c;
             (_a = this.getter) === null || _a === void 0 ? void 0 : _a.ExcludeMenuItem(this.item.id);
             this.getter = null;
             (_b = this.getterSub) === null || _b === void 0 ? void 0 : _b.call(this);
             this.getterSub = null;
+            (_c = this.entityCheckQueue) === null || _c === void 0 ? void 0 : _c.Dispose();
+            this.entityCheckQueue = null;
         }
         Dispose() {
             if (this.disposed) {
@@ -8481,7 +8485,10 @@ var EntitiesRenderManager;
                             historicKey: (_a = this.item.BruceEntity) === null || _a === void 0 ? void 0 : _a.historicAttrKey,
                             historicPoint: this.viewer.clock.currentTime.toString(),
                             schemaId: (_b = this.item.BruceEntity) === null || _b === void 0 ? void 0 : _b.schemaId,
-                            migrated: true
+                            expandSources: true,
+                            scenario: this.scenario,
+                            migrated: true,
+                            maxSearchTimeSec: 60 * 2
                         });
                         this.renderEntities(data.entities, true);
                     }
@@ -8556,7 +8563,10 @@ var EntitiesRenderManager;
                             historicKey: (_a = this.item.BruceEntity) === null || _a === void 0 ? void 0 : _a.historicAttrKey,
                             historicPoint: this.viewer.clock.currentTime.toString(),
                             schemaId: (_b = this.item.BruceEntity) === null || _b === void 0 ? void 0 : _b.schemaId,
-                            migrated: true
+                            scenario: this.scenario,
+                            expandSources: true,
+                            migrated: true,
+                            maxSearchTimeSec: 60 * 2
                         });
                         if (this.disposed) {
                             return;
@@ -9448,7 +9458,9 @@ var EntitiesLoadedRenderManager;
                         const { entities } = await Entity$1.GetListByIds({
                             api,
                             entityIds,
-                            migrated: true
+                            expandSources: true,
+                            migrated: true,
+                            maxSearchTimeSec: 60 * 2
                         });
                         if (this.disposed) {
                             return;
@@ -10068,6 +10080,7 @@ var EntitiesIdsRenderManager;
                     entityIds,
                     historicPoint: newDateTime,
                     historicKey: this.item.BruceEntity.historicAttrKey,
+                    expandSources: true,
                     migrated: true,
                     // If we're taking 5+ minutes to make a query, it's a dud.
                     // This is a timeout imposed on our DB and not external sources.
@@ -10868,7 +10881,8 @@ class EntityGatherer {
                             entityIds: batch,
                             historicPoint: this.historic ? rTime : null,
                             expandSources: this.expandSources,
-                            api: this.api
+                            api: this.api,
+                            maxSearchTimeSec: 60 * 2
                         });
                         handleResponse(entities);
                         requestedIds.push(...batch);
@@ -10904,7 +10918,8 @@ class EntityGatherer {
                             entityIds: batch,
                             historicPoint: this.historic ? rTime : null,
                             expandSources: this.expandSources,
-                            api: this.api
+                            api: this.api,
+                            maxSearchTimeSec: 60 * 2
                         });
                         handleResponse(entities);
                         requestedIds.push(...batch);
@@ -18558,7 +18573,10 @@ var AssemblyRenderManager;
                     entityIds: batch,
                     api: this.getters.GetBruceApi(),
                     expandLODs: true,
-                    expandLocation: true
+                    expandLocation: true,
+                    expandSources: true,
+                    migrated: true,
+                    maxSearchTimeSec: 60 * 2
                 });
                 if (this.disposed) {
                     return;
@@ -29148,7 +29166,9 @@ var EntityUtils;
                     entityIds: toSearchIds,
                     historicPoint: latestDate,
                     expandLocation: true,
+                    expandSources: true,
                     migrated: true,
+                    maxSearchTimeSec: 60 * 2,
                     api
                 });
                 const entitiesMap = new Map();
@@ -30905,17 +30925,45 @@ var EntityRenderEnginePoint;
         var _a, _b, _c, _d, _e;
         const api = params.apiGetter.getApi();
         const cEntities = new Map();
+        // Gathering tags in case styling needs it.
+        // TODO: analyze styles before requesting tags.
+        const tagMap = new Map();
+        {
+            // Gather all tags from the Entities to minimize number of requests.
+            let tagIds = [];
+            for (let i = 0; i < params.entities.length; i++) {
+                const entity = params.entities[i];
+                const entityTagIds = entity.Bruce["Layer.ID"];
+                if (entityTagIds && entityTagIds.length > 0) {
+                    tagIds = tagIds.concat(entityTagIds);
+                }
+            }
+            // De-dupe the tag IDs.
+            tagIds = Array.from(new Set(tagIds));
+            // Request if at least one then create a quick lookup map for tags.
+            const tags = tagIds.length > 0 ? (await EntityTag.GetListByIds({
+                api,
+                tagIds
+            })).tags : [];
+            for (let i = 0; i < tags.length; i++) {
+                const tag = tags[i];
+                tagMap.set(tag.ID, tag);
+            }
+        }
         for (let i = 0; i < params.entities.length; i++) {
             const entity = params.entities[i];
             const zoomItem = params.zoomItems[entity.Bruce.ID];
             const style = zoomItem.StyleID != -1 ? (_a = (await getStyle$1(api, entity, zoomItem.StyleID))) === null || _a === void 0 ? void 0 : _a.Settings : zoomItem.Style;
+            // Pass through tags that may be needed for styling.
             const tagIds = entity.Bruce["Layer.ID"];
-            let tags = [];
+            const tags = [];
             if (tagIds && tagIds.length > 0) {
-                tags = (await EntityTag.GetListByIds({
-                    api,
-                    tagIds
-                })).tags;
+                for (let j = 0; j < tagIds.length; j++) {
+                    const tag = tagMap.get(tagIds[j]);
+                    if (tag) {
+                        tags.push(tag);
+                    }
+                }
             }
             const pStyle = (_b = style === null || style === void 0 ? void 0 : style.pointStyle) !== null && _b !== void 0 ? _b : {};
             let rego = null;
@@ -31726,17 +31774,45 @@ var EntityRenderEngineModel3d;
             "externalSources": false,
             "Items": []
         };
+        // Gathering tags in case styling needs it.
+        // TODO: analyze styles before requesting tags.
+        const tagMap = new Map();
+        {
+            // Gather all tags from the Entities to minimize number of requests.
+            let tagIds = [];
+            for (let i = 0; i < params.entities.length; i++) {
+                const entity = params.entities[i];
+                const entityTagIds = entity.Bruce["Layer.ID"];
+                if (entityTagIds && entityTagIds.length > 0) {
+                    tagIds = tagIds.concat(entityTagIds);
+                }
+            }
+            // De-dupe the tag IDs.
+            tagIds = Array.from(new Set(tagIds));
+            // Request if at least one then create a quick lookup map for tags.
+            const tags = tagIds.length > 0 ? (await EntityTag.GetListByIds({
+                api,
+                tagIds
+            })).tags : [];
+            for (let i = 0; i < tags.length; i++) {
+                const tag = tags[i];
+                tagMap.set(tag.ID, tag);
+            }
+        }
         for (let i = 0; i < params.entities.length; i++) {
             const entity = params.entities[i];
             const zoomItem = params.zoomItems[entity.Bruce.ID];
             const style = zoomItem.StyleID != -1 ? (_a = (await getStyle$2(api, entity, zoomItem.StyleID))) === null || _a === void 0 ? void 0 : _a.Settings : zoomItem.Style;
+            // Pass through tags that may be needed for styling.
             const tagIds = entity.Bruce["Layer.ID"];
-            let tags = [];
+            const tags = [];
             if (tagIds && tagIds.length > 0) {
-                tags = (await EntityTag.GetListByIds({
-                    api,
-                    tagIds
-                })).tags;
+                for (let j = 0; j < tagIds.length; j++) {
+                    const tag = tagMap.get(tagIds[j]);
+                    if (tag) {
+                        tags.push(tag);
+                    }
+                }
             }
             const mStyle = (_b = style === null || style === void 0 ? void 0 : style.modelStyle) !== null && _b !== void 0 ? _b : {};
             let group = mStyle.lodGroup ? Calculator.GetString(mStyle.lodGroup, entity, tags) : null;
@@ -31766,18 +31842,21 @@ var EntityRenderEngineModel3d;
             const entity = params.entities[i];
             const zoomItem = params.zoomItems[entity.Bruce.ID];
             const style = zoomItem.StyleID != -1 ? (_c = (await getStyle$2(api, entity, zoomItem.StyleID))) === null || _c === void 0 ? void 0 : _c.Settings : zoomItem.Style;
-            const tagIds = entity.Bruce["Layer.ID"];
-            let tags = [];
-            if (tagIds && tagIds.length > 0) {
-                tags = (await EntityTag.GetListByIds({
-                    api,
-                    tagIds
-                })).tags;
-            }
             const lod = lodData.find(x => x.entityId == entity.Bruce.ID);
             if (!(lod === null || lod === void 0 ? void 0 : lod.clientFileId)) {
                 continue;
             }
+            // Pass through tags that may be needed for styling.
+            const tagIds = entity.Bruce["Layer.ID"];
+            const tags = [];
+            if (tagIds && tagIds.length > 0) {
+                for (let j = 0; j < tagIds.length; j++) {
+                    const tag = tagMap.get(tagIds[j]);
+                    if (tag) {
+                        tags.push(tag);
+                    }
+                }
+            }
             let rego = null;
             // Only used for historic tracks right now.
             // So won't bother getting it if we don't have historic data.
@@ -32208,17 +32287,45 @@ var EntityRenderEnginePolyline;
         var _a, _b, _c;
         const api = params.apiGetter.getApi();
         const cEntities = new Map();
+        // Gathering tags in case styling needs it.
+        // TODO: analyze styles before requesting tags.
+        const tagMap = new Map();
+        {
+            // Gather all tags from the Entities to minimize number of requests.
+            let tagIds = [];
+            for (let i = 0; i < params.entities.length; i++) {
+                const entity = params.entities[i];
+                const entityTagIds = entity.Bruce["Layer.ID"];
+                if (entityTagIds && entityTagIds.length > 0) {
+                    tagIds = tagIds.concat(entityTagIds);
+                }
+            }
+            // De-dupe the tag IDs.
+            tagIds = Array.from(new Set(tagIds));
+            // Request if at least one then create a quick lookup map for tags.
+            const tags = tagIds.length > 0 ? (await EntityTag.GetListByIds({
+                api,
+                tagIds
+            })).tags : [];
+            for (let i = 0; i < tags.length; i++) {
+                const tag = tags[i];
+                tagMap.set(tag.ID, tag);
+            }
+        }
         for (let i = 0; i < params.entities.length; i++) {
             const entity = params.entities[i];
             const zoomItem = params.zoomItems[entity.Bruce.ID];
             const style = zoomItem.StyleID != -1 ? (_a = (await getStyle$3(api, entity, zoomItem.StyleID))) === null || _a === void 0 ? void 0 : _a.Settings : zoomItem.Style;
+            // Pass through tags that may be needed for styling.
             const tagIds = entity.Bruce["Layer.ID"];
-            let tags = [];
+            const tags = [];
             if (tagIds && tagIds.length > 0) {
-                tags = (await EntityTag.GetListByIds({
-                    api,
-                    tagIds
-                })).tags;
+                for (let j = 0; j < tagIds.length; j++) {
+                    const tag = tagMap.get(tagIds[j]);
+                    if (tag) {
+                        tags.push(tag);
+                    }
+                }
             }
             const lStyle = (_b = style === null || style === void 0 ? void 0 : style.polylineStyle) !== null && _b !== void 0 ? _b : {};
             const cEntity = Render({
@@ -32674,17 +32781,45 @@ var EntityRenderEnginePolygon;
         var _a, _b, _c;
         const api = params.apiGetter.getApi();
         const cEntities = new Map();
+        // Gathering tags in case styling needs it.
+        // TODO: analyze styles before requesting tags.
+        const tagMap = new Map();
+        {
+            // Gather all tags from the Entities to minimize number of requests.
+            let tagIds = [];
+            for (let i = 0; i < params.entities.length; i++) {
+                const entity = params.entities[i];
+                const entityTagIds = entity.Bruce["Layer.ID"];
+                if (entityTagIds && entityTagIds.length > 0) {
+                    tagIds = tagIds.concat(entityTagIds);
+                }
+            }
+            // De-dupe the tag IDs.
+            tagIds = Array.from(new Set(tagIds));
+            // Request if at least one then create a quick lookup map for tags.
+            const tags = tagIds.length > 0 ? (await EntityTag.GetListByIds({
+                api,
+                tagIds
+            })).tags : [];
+            for (let i = 0; i < tags.length; i++) {
+                const tag = tags[i];
+                tagMap.set(tag.ID, tag);
+            }
+        }
         for (let i = 0; i < params.entities.length; i++) {
             const entity = params.entities[i];
             const zoomItem = params.zoomItems[entity.Bruce.ID];
             const style = zoomItem.StyleID != -1 ? (_a = (await getStyle$4(api, entity, zoomItem.StyleID))) === null || _a === void 0 ? void 0 : _a.Settings : zoomItem.Style;
+            // Pass through tags that may be needed for styling.
             const tagIds = entity.Bruce["Layer.ID"];
-            let tags = [];
+            const tags = [];
             if (tagIds && tagIds.length > 0) {
-                tags = (await EntityTag.GetListByIds({
-                    api,
-                    tagIds
-                })).tags;
+                for (let j = 0; j < tagIds.length; j++) {
+                    const tag = tagMap.get(tagIds[j]);
+                    if (tag) {
+                        tags.push(tag);
+                    }
+                }
             }
             const pStyle = (_b = style === null || style === void 0 ? void 0 : style.polygonStyle) !== null && _b !== void 0 ? _b : {};
             const cEntity = Render({
@@ -34815,7 +34950,7 @@ class WidgetViewBar extends Widget.AWidget {
     }
 }
 
-const VERSION = "6.4.2";
+const VERSION = "6.4.3";
 /**
  * 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.