bruce-cesium 5.8.6 → 5.8.8

package/dist/bruce-cesium.umd.js

@@ -4495,6 +4495,21 @@
         EntityUtils.GetOpacity = GetOpacity;
         async function FlyTo(params) {
             var _a, _b;
+            let { entityIds, entities, tileset } = params;
+            if (!entityIds && !entities && !tileset) {
+                return false;
+            }
+            let entityLookup = new Map();
+            if (!entityIds && entities) {
+                entityIds = entities.map(x => x.Bruce.ID);
+            }
+            if (entities) {
+                for (const entity of entities) {
+                    if (entity && entity.Bruce && entity.Bruce.ID) {
+                        entityLookup.set(entity.Bruce.ID, entity);
+                    }
+                }
+            }
             const is2d = exports.ViewUtils.Get2dStatus({
                 viewer: params.viewer
             });
@@ -4503,8 +4518,9 @@
                 createIfMissing: true
             });
             const location = await EntityUtils.GetLocation({
-                samples: params.entityIds.map((id) => ({
+                samples: entityIds.map((id) => ({
                     entityId: id,
+                    entity: entityLookup.get(id),
                     returnHeightRef: Cesium.HeightReference.NONE,
                     heightRef: Cesium.HeightReference.RELATIVE_TO_GROUND
                 })),
@@ -4656,8 +4672,8 @@
                 });
                 return true;
             }
-            if (params.tileset && !params.tileset.isDestroyed() && params.tileset["ready"] != false && params.tileset.boundingSphere) {
-                params.viewer.zoomTo(params.tileset, new Cesium.HeadingPitchRange(0.0, -0.5, params.tileset.boundingSphere.radius / 4.0));
+            if (tileset && !tileset.isDestroyed() && tileset["ready"] != false && tileset.boundingSphere) {
+                params.viewer.zoomTo(tileset, new Cesium.HeadingPitchRange(0.0, -0.5, tileset.boundingSphere.radius / 4.0));
                 return true;
             }
             return false;
@@ -14845,6 +14861,14 @@
             get Disposed() {
                 return this.disposed;
             }
+            get EntityIds() {
+                var _a, _b;
+                return ((_b = (_a = this.item) === null || _a === void 0 ? void 0 : _a.BruceEntity) === null || _b === void 0 ? void 0 : _b.EntityIds) || [];
+            }
+            get ZoomControl() {
+                var _a;
+                return ((_a = this.item) === null || _a === void 0 ? void 0 : _a.CameraZoomSettings) || [];
+            }
             constructor(params) {
                 var _a;
                 this.getter = null;
@@ -14870,11 +14894,14 @@
                     this.clustering = new PointClustering(visualsManager, this.item.id, (_a = this.item) === null || _a === void 0 ? void 0 : _a.clustering);
                 }
             }
-            Init() {
+            Init(params) {
                 var _a, _b, _c;
                 if (this.disposed) {
                     throw (new Error("This item is disposed."));
                 }
+                if (params === null || params === void 0 ? void 0 : params.item) {
+                    this.item = params.item;
+                }
                 if (!((_a = this.item.CameraZoomSettings) === null || _a === void 0 ? void 0 : _a.length)) {
                     this.item.CameraZoomSettings = [
                         {
@@ -14891,19 +14918,19 @@
                 if (this.renderPriority == null) {
                     this.renderPriority = 2;
                 }
-                this.getter = new BatchedDataGetter.Getter(this.item.BruceEntity.EntityIds, this.monitor, BATCH_SIZE$2, 
-                // Don't emit the same Entity multiple times.
-                true);
-                this.getterSub = this.getter.OnUpdate.Subscribe((ids) => {
-                    this.onGetterUpdate(ids);
-                });
-                this.getter.Start();
+                if (!this.getter) {
+                    this.getter = new BatchedDataGetter.Getter(this.item.BruceEntity.EntityIds, this.monitor, BATCH_SIZE$2, 
+                    // Don't emit the same Entity multiple times.
+                    true);
+                    this.getterSub = this.getter.OnUpdate.Subscribe((ids) => {
+                        this.onGetterUpdate(ids);
+                    });
+                    this.getter.Start();
+                }
+                this.viewerDateTimeDispose();
                 if (((_b = this.item.BruceEntity) === null || _b === void 0 ? void 0 : _b.historic) || ((_c = this.item.BruceEntity) === null || _c === void 0 ? void 0 : _c.historicAttrKey)) {
                     this.viewerDateTimeSub();
                 }
-                else {
-                    this.viewerDateTimeDispose();
-                }
             }
             Dispose() {
                 if (this.disposed) {
@@ -19184,8 +19211,7 @@
     })(exports.DataLabRenderManager || (exports.DataLabRenderManager = {}));
 
     const MAX_BATCHES = 2;
-    const BATCH_SIZE_OLD_API = 30;
-    const BATCH_SIZE_NEW_API = 1000;
+    const BATCH_SIZE$3 = 1000;
     const BATCH_DELAY = 200;
     const MAX_RANGE = 3000;
     (function (TilesetOsmRenderManager) {
@@ -19199,6 +19225,12 @@
             get count() {
                 return ++this.counter;
             }
+            get SourceId() {
+                return this.sourceId;
+            }
+            get EntityTypeId() {
+                return this.entityTypeId;
+            }
             constructor(params) {
                 this.disposed = false;
                 this.cTileset = null;
@@ -19211,7 +19243,6 @@
                 this.queueCheckInterval = null;
                 this.processingQueue = 0;
                 this._osmIdToBruceId = {};
-                this.batchSize = BATCH_SIZE_OLD_API;
                 const { viewer, register: visualsManager, getters: apiGetter, monitor, item } = params;
                 this.viewer = viewer;
                 this.getters = apiGetter;
@@ -19243,12 +19274,22 @@
                 });
                 this.featureQueue = [];
             }
-            Init() {
+            Init(params) {
                 var _a, _b;
+                if (params === null || params === void 0 ? void 0 : params.item) {
+                    this.item = params.item;
+                }
                 const menuItem = this.item;
                 this.sourceId = EnsureNumber((_a = menuItem.BruceEntity) === null || _a === void 0 ? void 0 : _a.SourceId, 0);
                 this.entityTypeId = (_b = menuItem.BruceEntity) === null || _b === void 0 ? void 0 : _b["EntityType.ID"];
                 (async () => {
+                    if (this.disposed) {
+                        return;
+                    }
+                    else if (this.cTileset) {
+                        // Already exists, no need to re-initialize.
+                        return;
+                    }
                     const validToken = await exports.ViewerUtils.AssertIonToken(Cesium.Ion.defaultAccessToken);
                     if (!validToken) {
                         console.warn("'tileset-osm-render-manager.ts' could not locate a valid Cesium Ion token.");
@@ -19268,12 +19309,13 @@
                         console.warn("'tileset-osm-render-manager.ts' could not locate a create function for OSM buildings.");
                         return;
                     }
-                    // New API versions are way better at processing this request.
-                    const api = this.getters.GetBruceApi();
-                    await api.Loading;
-                    if (api.IsVersionAtLeast("1.0.5244")) {
-                        this.batchSize = BATCH_SIZE_NEW_API;
+                    // See if we already have a cTileset set.
+                    // Happens if we re-initialized in quick succession.
+                    if (this.cTileset) {
+                        cTileset.destroy();
+                        return;
                     }
+                    this.cTileset = cTileset;
                     if (this.disposed) {
                         if (this.cTileset && !this.cTileset.isDestroyed()) {
                             this.cTileset.destroy();
@@ -19281,7 +19323,6 @@
                         }
                         return;
                     }
-                    this.cTileset = cTileset;
                     if (this.sourceId) {
                         if (menuItem.ghostLoading == true) {
                             this.cTileset.style = new Cesium.Cesium3DTileStyle({
@@ -19385,7 +19426,7 @@
                                     const isClose = this.getIsVisualWithinRange(feature, MAX_RANGE);
                                     if (isClose) {
                                         batch.push(feature);
-                                        if (batch.length >= this.batchSize) {
+                                        if (batch.length >= BATCH_SIZE$3) {
                                             return batch;
                                         }
                                     }
@@ -19535,7 +19576,7 @@
                             delete this._loadedCesiumEntities[key];
                             this.totalLoaded -= 1;
                             removed += 1;
-                            if (removed >= this.batchSize) {
+                            if (removed >= BATCH_SIZE$3) {
                                 return true;
                             }
                         }
@@ -20807,9 +20848,33 @@
                     this.cTileset = null;
                 }
             }
-            Init() {
+            Init(params) {
+                if (this.disposed) {
+                    return;
+                }
+                if (params === null || params === void 0 ? void 0 : params.item) {
+                    this.item = params.item;
+                }
                 (async () => {
                     var _a;
+                    // If the tileset already exists then we just need to update the style.
+                    if (this.cTileset) {
+                        const colorCss = this.item.colorMask;
+                        if (colorCss) {
+                            this.cTileset.style = new Cesium.Cesium3DTileStyle({
+                                color: {
+                                    conditions: [
+                                        ["true", `color("${colorCss}")`]
+                                    ]
+                                }
+                            });
+                        }
+                        else {
+                            this.cTileset.style = undefined;
+                        }
+                        this.viewer.scene.requestRender();
+                        return;
+                    }
                     const CESIUM = Cesium;
                     if (!CESIUM.createGooglePhotorealistic3DTileset) {
                         console.warn("Cesium version does not support 'createGooglePhotorealistic3DTileset' so Google Photos tileset will not be rendered.");
@@ -22711,7 +22776,7 @@
              * @returns
              */
             RenderItem(params) {
-                var _a, _b, _c, _d, _e;
+                var _a, _b, _c, _d, _e, _f, _g, _h;
                 if (this.viewer.isDestroyed()) {
                     return null;
                 }
@@ -22733,6 +22798,7 @@
                 }
                 let rItem = this.items.find(x => x.id == params.item.id);
                 let create = true;
+                // Item already exists so we'll check if we should re-create it.
                 if (rItem) {
                     // This means we're updating a tag menu item.
                     // Tag menu items have alternative states based on bookmark settings.
@@ -22781,18 +22847,76 @@
                             create = false;
                         }
                     }
+                    else if (rItem.type == BModels.MenuItem.EType.PointCloud && params.item.Type == BModels.MenuItem.EType.PointCloud) {
+                        if (rItem.renderManager) {
+                            create = false;
+                        }
+                    }
+                    else if (rItem.type == BModels.MenuItem.EType.ArbTileset && params.item.Type == BModels.MenuItem.EType.ArbTileset) {
+                        if (rItem.renderManager) {
+                            create = false;
+                        }
+                    }
+                    else if (rItem.type == BModels.MenuItem.EType.I3sTileset && params.item.Type == BModels.MenuItem.EType.I3sTileset) {
+                        if (rItem.renderManager) {
+                            create = false;
+                        }
+                    }
                     // Re-init in case model-space changed to geo-spatial or vice-versa.
                     else if (rItem.type == BModels.MenuItem.EType.Assembly && params.item.Type == BModels.MenuItem.EType.Assembly) {
                         if (rItem.renderManager && rItem.renderManager.ModelSpace == params.modelSpace) {
                             create = false;
                         }
                     }
+                    // Updating an existing Google photos tileset.
+                    // Eg: different color mask (opacity).
+                    else if (rItem.type == BModels.MenuItem.EType.GooglePhotoTileset && params.item.Type == BModels.MenuItem.EType.GooglePhotoTileset) {
+                        if (rItem.renderManager) {
+                            rItem.renderManager.Init({
+                                item: params.item
+                            });
+                            rItem.item = params.item;
+                            create = false;
+                        }
+                    }
+                    else if (rItem.type == BModels.MenuItem.EType.Osm && params.item.Type == BModels.MenuItem.EType.Osm) {
+                        // If the source is the same then we can re-use the render manager.
+                        const oRenderManager = rItem.renderManager;
+                        const oItem = params.item;
+                        if (oRenderManager && oItem) {
+                            if (+oRenderManager.SourceId == +((_b = oItem.BruceEntity) === null || _b === void 0 ? void 0 : _b.SourceId) && oRenderManager.EntityTypeId == ((_c = oItem.BruceEntity) === null || _c === void 0 ? void 0 : _c["EntityType.ID"])) {
+                                oRenderManager.Init({
+                                    item: oItem
+                                });
+                                rItem.item = params.item;
+                                create = false;
+                            }
+                        }
+                    }
+                    else if (rItem.type == BModels.MenuItem.EType.EntitiesIds && params.item.Type == BModels.MenuItem.EType.EntitiesIds) {
+                        // Checking for Entity IDs.
+                        const eIdsRenderManager = rItem.renderManager;
+                        const eIdsItem = params.item;
+                        if (eIdsRenderManager && eIdsItem) {
+                            const eEntityIds = eIdsRenderManager.EntityIds;
+                            const mEntityIds = (_d = eIdsItem.BruceEntity) === null || _d === void 0 ? void 0 : _d.EntityIds;
+                            const eEntityIdsStr = eEntityIds ? eEntityIds.join(",") : "";
+                            const mEntityIdsStr = mEntityIds ? mEntityIds.join(",") : "";
+                            if (eEntityIdsStr == mEntityIdsStr) {
+                                eIdsRenderManager.Init({
+                                    item: eIdsItem
+                                });
+                                rItem.item = params.item;
+                                create = false;
+                            }
+                        }
+                    }
                     else if (rItem.type != params.item.Type) {
                         create = true;
                     }
                     if (create) {
                         try {
-                            (_b = rItem.renderManager) === null || _b === void 0 ? void 0 : _b.Dispose();
+                            (_e = rItem.renderManager) === null || _e === void 0 ? void 0 : _e.Dispose();
                         }
                         catch (e) {
                             console.error(e);
@@ -22803,7 +22927,7 @@
                 if (create) {
                     if (!rItem) {
                         rItem = {
-                            id: (_c = params.item.id) !== null && _c !== void 0 ? _c : BModels.ObjectUtils.UId(),
+                            id: (_f = params.item.id) !== null && _f !== void 0 ? _f : BModels.ObjectUtils.UId(),
                             childIds: [],
                             item: params.item,
                             renderManager: null,
@@ -23002,8 +23126,8 @@
                         rItem.childIds.push(childId);
                     }
                 }
-                if (rItem.renderManager && !((_d = rItem.renderManager) === null || _d === void 0 ? void 0 : _d.Disposed)) {
-                    (_e = this.onUpdate) === null || _e === void 0 ? void 0 : _e.Trigger({ isEnabling: true, itemId: rItem.id });
+                if (rItem.renderManager && !((_g = rItem.renderManager) === null || _g === void 0 ? void 0 : _g.Disposed)) {
+                    (_h = this.onUpdate) === null || _h === void 0 ? void 0 : _h.Trigger({ isEnabling: true, itemId: rItem.id });
                 }
                 return rItem.id;
             }
@@ -32758,7 +32882,7 @@
         }
     }
 
-    const VERSION = "5.8.6";
+    const VERSION = "5.8.8";
 
     exports.VERSION = VERSION;
     exports.isOutlineChanged = isOutlineChanged;