bruce-cesium 5.6.2 → 5.6.3

package/dist/bruce-cesium.es5.js

@@ -12723,8 +12723,7 @@ var EntitiesRenderManager;
             // Scenario for retrieving Entities.
             this.scenario = null;
             // Type IDs that we'll allow to be rendered when receiving Entities.
-            // This is a band-aid for that fact that locally sourced Entities across Types are trickier to filter out.
-            // So we request source info and use that to figure the situation out.
+            // This might be exactly the Menu Item Type ID because of local data sources.
             this.allowedTypeIDs = [];
             const { viewer, apiGetter, monitor, item, register: visualsManager, sharedGetters } = params;
             this.viewer = viewer;
@@ -12746,37 +12745,23 @@ var EntitiesRenderManager;
                 this.item = params.item;
             }
             (async () => {
-                var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+                var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
                 if (this.disposed) {
                     return;
                 }
                 try {
-                    // Get type sources to look for locally sourced entity types.
-                    if ((_a = this.item.BruceEntity) === null || _a === void 0 ? void 0 : _a["EntityType.ID"]) {
+                    // Reset allowed list if there's change.
+                    if (((_a = this.item.BruceEntity) === null || _a === void 0 ? void 0 : _a["EntityType.ID"]) && !this.allowedTypeIDs.includes((_b = this.item.BruceEntity) === null || _b === void 0 ? void 0 : _b["EntityType.ID"])) {
                         this.allowedTypeIDs = [];
-                        this.allowedTypeIDs.push((_b = this.item.BruceEntity) === null || _b === void 0 ? void 0 : _b["EntityType.ID"]);
-                        try {
-                            const api = this.apiGetter.getApi();
-                            const typeId = (_c = this.item.BruceEntity) === null || _c === void 0 ? void 0 : _c["EntityType.ID"];
-                            const { Items: items } = await api.GET(`entitytype/${typeId}/sources`);
-                            for (const item of items) {
-                                if (item.Type == 0 && item["Source.EntityType.ID"] && (item.Kind == "ENTITY" || item.Kind == "UNSET")) {
-                                    const typeId = item["Source.EntityType.ID"];
-                                    if (typeId && !this.allowedTypeIDs.includes(typeId)) {
-                                        this.allowedTypeIDs.push(typeId);
-                                    }
-                                }
-                            }
-                        }
-                        catch (e) {
-                            console.error(e);
+                        if ((_c = this.item.BruceEntity) === null || _c === void 0 ? void 0 : _c["EntityType.ID"]) {
+                            this.allowedTypeIDs.push((_d = this.item.BruceEntity) === null || _d === void 0 ? void 0 : _d["EntityType.ID"]);
                         }
                     }
                     if (this.disposed) {
                         return;
                     }
                     this.zoomControl = this.item.CameraZoomSettings;
-                    if (!((_d = this.zoomControl) === null || _d === void 0 ? void 0 : _d.length)) {
+                    if (!((_e = this.zoomControl) === null || _e === void 0 ? void 0 : _e.length)) {
                         this.zoomControl = [
                             {
                                 MinZoom: 0,
@@ -12796,7 +12781,7 @@ var EntitiesRenderManager;
                         console.warn("Geojson rendering does not support multiple zoom controls. Only the first one will be used.");
                         this.zoomControl = [this.zoomControl[0]];
                     }
-                    this.scenario = (_e = this.item.BruceEntity) === null || _e === void 0 ? void 0 : _e.Scenario;
+                    this.scenario = (_f = this.item.BruceEntity) === null || _f === void 0 ? void 0 : _f.Scenario;
                     const isTagItem = Boolean(this.item.BruceEntity.ExpandLayers);
                     let tagsToRender = isTagItem ? this.item.BruceEntity.SelectedExpandLayers : null;
                     if (!tagsToRender) {
@@ -12805,9 +12790,9 @@ var EntitiesRenderManager;
                     tagsToRender = [].concat(tagsToRender);
                     const shouldRender = !isTagItem || tagsToRender.length > 0;
                     this.unsetGetter();
-                    (_f = this.viewMonitorRemoval) === null || _f === void 0 ? void 0 : _f.call(this);
+                    (_g = this.viewMonitorRemoval) === null || _g === void 0 ? void 0 : _g.call(this);
                     this.viewMonitorRemoval = null;
-                    (_g = this.entityCheckQueue) === null || _g === void 0 ? void 0 : _g.Dispose();
+                    (_h = this.entityCheckQueue) === null || _h === void 0 ? void 0 : _h.Dispose();
                     this.entityCheckQueue = null;
                     clearInterval(this.renderQueueInterval);
                     this.renderQueueInterval = null;
@@ -12819,17 +12804,17 @@ var EntitiesRenderManager;
                             menuItemId: this.item.id,
                             retainTagIds: tagsToRender
                         });
-                        (_h = this.clustering) === null || _h === void 0 ? void 0 : _h.Dispose();
+                        (_j = this.clustering) === null || _j === void 0 ? void 0 : _j.Dispose();
                     }
                     else {
                         this.visualsManager.RemoveRegos({
                             menuItemId: this.item.id
                         });
-                        (_j = this.clustering) === null || _j === void 0 ? void 0 : _j.Dispose();
+                        (_k = this.clustering) === null || _k === void 0 ? void 0 : _k.Dispose();
                         return;
                     }
                     if (this.item.enableClustering) {
-                        this.clustering = new PointClustering(this.visualsManager, this.item.id, (_k = this.item) === null || _k === void 0 ? void 0 : _k.clustering);
+                        this.clustering = new PointClustering(this.visualsManager, this.item.id, (_l = this.item) === null || _l === void 0 ? void 0 : _l.clustering);
                     }
                     this.setGetter();
                     this.viewMonitorRemoval = this.monitor.Updated().Subscribe(() => {
@@ -12849,6 +12834,50 @@ var EntitiesRenderManager;
                 }
             })();
         }
+        /**
+         * Updates allowedTypeIDs values based in incoming data.
+         * We might request 'x' Entity Type, but get 'y' Entities due to local Data Sources.
+         * So we'll dynamically construct allowed type IDs to help filter out unwanted Entities from further ReRender calls.
+         * @param typeSources
+         * @param entities
+         */
+        updateAllowedTypeIDs(typeSources, entities) {
+            var _a, _b;
+            const sourceLookup = new Map();
+            if (typeSources) {
+                for (const source of typeSources) {
+                    sourceLookup.set(source.ID, source);
+                }
+            }
+            for (let i = 0; i < entities.length; i++) {
+                const entity = entities[i];
+                const typeId = (_a = entity.Bruce) === null || _a === void 0 ? void 0 : _a["EntityType.ID"];
+                if (!typeId || this.allowedTypeIDs.includes(typeId)) {
+                    continue;
+                }
+                // If an Entity is not from the allowed Entity Type, but has a source matching it, then it's allowed.
+                // Therefor we will add it to the allowedTypeIDs list.
+                if (!((_b = entity.Bruce["Sources"]) === null || _b === void 0 ? void 0 : _b.length)) {
+                    continue;
+                }
+                const sources = entity.Bruce["Sources"];
+                for (const source of sources) {
+                    if (!source["EntityType.Source.ID"]) {
+                        continue;
+                    }
+                    const sRecord = sourceLookup.get(source["EntityType.Source.ID"]);
+                    if (!sRecord) {
+                        continue;
+                    }
+                    if (sRecord["EntityType.ID"] && this.allowedTypeIDs.includes(sRecord["EntityType.ID"])) {
+                        const toAddTypeId = sRecord["Source.EntityType.ID"];
+                        if (toAddTypeId && !this.allowedTypeIDs.includes(toAddTypeId)) {
+                            this.allowedTypeIDs.push(toAddTypeId);
+                        }
+                    }
+                }
+            }
+        }
         setGetter() {
             var _a, _b, _c;
             this.unsetGetter();
@@ -12880,9 +12909,14 @@ var EntitiesRenderManager;
                 zoomControl: this.zoomControl
             });
             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) => {
+            this.getterSub = this.getter.OnUpdate.Subscribe((data) => {
+                var _a;
+                if (!((_a = data === null || data === void 0 ? void 0 : data.entities) === null || _a === void 0 ? void 0 : _a.length)) {
+                    return;
+                }
+                this.updateAllowedTypeIDs(data.entityTypeSources, data.entities);
                 if (isTagItem) {
-                    this.distributeForRender(entities.filter((entity) => {
+                    this.distributeForRender(data.entities.filter((entity) => {
                         let entityTags = entity.Bruce["Layer.ID"];
                         if (!entityTags) {
                             entityTags = [];
@@ -12893,7 +12927,7 @@ var EntitiesRenderManager;
                     }));
                 }
                 else {
-                    this.distributeForRender(entities);
+                    this.distributeForRender(data.entities);
                 }
             });
         }
@@ -17059,7 +17093,9 @@ var EntityFilterGetter;
                                 response = {
                                     entities: tmpResponse.Items ? tmpResponse.Items : [],
                                     nextPage: tmpResponse.NextPage,
-                                    nextPageUrl: tmpResponse.NextPageURL
+                                    nextPageUrl: tmpResponse.NextPageURL,
+                                    sources: tmpResponse.Source,
+                                    entityTypeSources: tmpResponse["EntityType.Source"]
                                 };
                             }
                             else {
@@ -17098,7 +17134,11 @@ var EntityFilterGetter;
                         const entities = response.entities;
                         const integrity = this.getIntegrityId();
                         if (loopIntegrity == integrity && entities) {
-                            (_c = this.onUpdate) === null || _c === void 0 ? void 0 : _c.Trigger(entities);
+                            (_c = this.onUpdate) === null || _c === void 0 ? void 0 : _c.Trigger({
+                                entities: entities,
+                                sources: response.sources,
+                                entityTypeSources: response.entityTypeSources
+                            });
                         }
                         if (this.gatheredIntegrity != integrity) {
                             this.gatheredIntegrity = integrity;
@@ -17221,12 +17261,14 @@ var EntityFilterGetter;
                         // Controller we can use to abort the request when a new loop starts.
                         const controller = this.historicRefreshAbortController = new AbortController();
                         let entities = [];
+                        let sources = [];
+                        let entityTypeSources = [];
                         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;
                             }
-                            entities = (await Entity$1.GetList({
+                            const data = await Entity$1.GetList({
                                 api: this.api,
                                 scenario: this.scenario,
                                 historicKey: this.historicAttrKey,
@@ -17257,7 +17299,10 @@ var EntityFilterGetter;
                                     noCache: true,
                                     abortSignal: controller.signal
                                 }
-                            })).entities;
+                            });
+                            entities = data.entities;
+                            sources = data.sources;
+                            entityTypeSources = data.entityTypeSources;
                         });
                         // Date changed.
                         if (this.historicAttrDateTime != historicAttrDateTime) {
@@ -17271,7 +17316,11 @@ var EntityFilterGetter;
                         if (!this.GetMenuItems().length) {
                             break;
                         }
-                        (_a = this.onUpdate) === null || _a === void 0 ? void 0 : _a.Trigger(entities);
+                        (_a = this.onUpdate) === null || _a === void 0 ? void 0 : _a.Trigger({
+                            entities: entities,
+                            sources: sources,
+                            entityTypeSources: entityTypeSources
+                        });
                     }
                 }
                 catch (e) {
@@ -31661,7 +31710,7 @@ class WidgetViewBar extends Widget.AWidget {
     }
 }
 
-const VERSION = "5.6.2";
+const VERSION = "5.6.3";
 
 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, AssemblyRenderManager, RelationsRenderManager, SharedGetters, CesiumParabola, EntityLabel, ViewRenderEngine, TileRenderEngine, TilesetRenderEngine, CESIUM_INSPECTOR_KEY, CESIUM_TIMELINE_KEY, CESIUM_TIMELINE_LIVE_KEY, CESIUM_TIMELINE_LIVE_PADDING_KEY, CESIUM_TIMELINE_INTERVAL_KEY, DEFAULT_LIVE_PADDING_SECONDS, 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