bruce-cesium 5.2.7 → 5.2.9

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, HorizontalOrigin, VerticalOrigin, ConstantProperty, ClassificationType, ConstantPositionProperty, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, ColorMaterialProperty, ColorBlendMode, HeadingPitchRoll, Transforms, Model, Primitive, Cesium3DTileFeature, SceneMode, GeoJsonDataSource, Cesium3DTileStyle, Cesium3DTileColorBlendMode, HeadingPitchRange, Ion, KmlDataSource, SceneTransforms, OrthographicFrustum, EasingFunction, NearFarScalar, EllipsoidTerrainProvider, CesiumInspector, defined, ClockRange, EllipsoidGeodesic, sampleTerrainMostDetailed, Cesium3DTileset, Matrix4, Matrix3, IonResource, PolygonPipeline, IonImageryProvider, createWorldImagery, createWorldImageryAsync, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, CesiumTerrainProvider, BoundingSphere, GeometryInstance, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, Quaternion, ScreenSpaceEventHandler, ScreenSpaceEventType, CzmlDataSource, Intersect, Fullscreen } from 'cesium';
+import { Cartographic, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, JulianDate, Entity, DistanceDisplayCondition, HorizontalOrigin, VerticalOrigin, ConstantProperty, ClassificationType, ConstantPositionProperty, ArcType, CornerType, ShadowMode, ColorBlendMode, HeadingPitchRoll, Transforms, Model, PolygonHierarchy, PolylineGraphics, ColorMaterialProperty, SceneMode, Primitive, Cesium3DTileFeature, GeoJsonDataSource, Cesium3DTileStyle, Cesium3DTileColorBlendMode, HeadingPitchRange, 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, PolygonPipeline, Cesium3DTileset, Matrix4, Matrix3, IonResource, EllipsoidGeodesic, sampleTerrainMostDetailed, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, Quaternion, BoundingSphere, GeometryInstance, ScreenSpaceEventHandler, ScreenSpaceEventType, CzmlDataSource, Intersect, Fullscreen } from 'cesium';
 
 const TIME_LAG = 300;
 const POSITION_CHECK_TIMER = 950;
@@ -16903,6 +16903,10 @@ var TilesetCadRenderManager;
             // It's pretty expensive so we save it for a few seconds inbetween checks.
             this.somethingIsolated = null;
             this.somethingIsolatedDateTime = null;
+            // Entity ID -> rego.
+            // We retain this information as a quick look-up on what has been registered.
+            // This lets us properly assign siblings to the same rego when hierarchy items are marked as collapsed.
+            this.loadedCesiumEntities = {};
             const { viewer, register: visualsManager, getters, item } = params;
             this.viewer = viewer;
             this.getters = getters;
@@ -16910,24 +16914,29 @@ var TilesetCadRenderManager;
             this.visualsManager = visualsManager;
         }
         Init() {
-            var _a;
+            var _a, _b;
             const tilesetId = (_a = this.item.tileset) === null || _a === void 0 ? void 0 : _a.TilesetID;
             if (!tilesetId) {
                 return;
             }
+            let accountId = (_b = this.item.tileset) === null || _b === void 0 ? void 0 : _b.ClientAccountID;
+            if (!accountId) {
+                accountId = this.getters.GetAccountId();
+            }
             this.renderPriority = this.item.renderPriority;
             if (this.renderPriority == null) {
                 this.renderPriority = 0;
             }
             (async () => {
-                var _a, _b, _c;
-                let api = this.getters.GetBruceApi();
+                var _a;
+                const api = this.getters.GetBruceApi({
+                    accountId: accountId
+                });
                 let coords = null;
                 let tileset = null;
                 // Single shared getter to avoid multiple assemblies fighting to render.
                 // This lets one complete, then the next start.
                 await SharedGetters.Queue.Run("Rendering assembly.", async () => {
-                    var _a, _b;
                     if (this.disposed) {
                         return;
                     }
@@ -16935,7 +16944,7 @@ var TilesetCadRenderManager;
                         let canAccess = false;
                         try {
                             canAccess = await Tileset.Publish.IsAccessAllowed({
-                                sourceAccountId: (_a = this.item.tileset) === null || _a === void 0 ? void 0 : _a.ClientAccountID,
+                                sourceAccountId: accountId,
                                 tilesetId: tilesetId,
                                 forAccountId: this.getters.GetAccountId(),
                                 getters: this.getters
@@ -16948,14 +16957,13 @@ var TilesetCadRenderManager;
                             console.error(e);
                         }
                         if (!canAccess) {
-                            console.warn(`Cannot access tileset: ${tilesetId}, from account: ${(_b = this.item.tileset) === null || _b === void 0 ? void 0 : _b.ClientAccountID}.`);
+                            console.warn(`Cannot access tileset: ${tilesetId}, from account: ${accountId}.`);
                             return;
                         }
                     }
                     else {
                         console.warn("No tileset id found. Skipping access check.");
                     }
-                    api = this.getters.GetBruceApi();
                     tileset = (await Tileset.Get({
                         api,
                         tilesetId
@@ -17003,7 +17011,7 @@ var TilesetCadRenderManager;
                     tileset: tileset,
                     viewer: this.viewer,
                     coords: coords,
-                    accountId: (_c = (_b = this.item.tileset) === null || _b === void 0 ? void 0 : _b.ClientAccountID) !== null && _c !== void 0 ? _c : this.getters.GetAccountId(),
+                    accountId: accountId,
                     viaCdn: Boolean(this.item.cdnEnabled == null ? true : this.item.cdnEnabled),
                     noMemoryLimit: this.item["noMaximumMemory"]
                 });
@@ -17027,7 +17035,9 @@ var TilesetCadRenderManager;
                         this.onCTilesetLoad();
                         this.styler.Init({
                             viewer: this.viewer,
-                            api,
+                            // Default API instead of the account one.
+                            // Records are driven by the account loading it instead of the source account.
+                            api: this.getters.GetBruceApi(),
                             cTileset: this.cTileset,
                             fallbackStyleId: this.item.styleId,
                             styleMapping: this.item.StyleMapping,
@@ -17109,7 +17119,7 @@ var TilesetCadRenderManager;
                 menuItemType: this.item.Type,
                 priority: this.renderPriority,
                 visual: feature,
-                accountId: (_b = (_a = this.item.tileset) === null || _a === void 0 ? void 0 : _a.ClientAccountID) !== null && _b !== void 0 ? _b : this.getters.GetAccountId(),
+                accountId: (_b = ((_a = this.item.tileset) === null || _a === void 0 ? void 0 : _a.ClientAccountID)) !== null && _b !== void 0 ? _b : this.getters.GetAccountId(),
                 tilesetId: (_c = this.item.tileset) === null || _c === void 0 ? void 0 : _c.TilesetID,
                 tilesetType: Tileset.EType.Cad,
                 rootId: this.rootId,
@@ -17200,6 +17210,26 @@ var TilesetCadRenderManager;
                     }
                 }
                 feature.show = !hide;
+                // Already exists, so we add this graphic as a sibling.
+                if (this.loadedCesiumEntities[rego.entityId]) {
+                    rego = this.loadedCesiumEntities[rego.entityId];
+                    if (!rego.visual) {
+                        // No parent graphic.
+                        rego.visual = feature;
+                    }
+                    else if (rego.visual == feature) ;
+                    else {
+                        const visual = rego.visual;
+                        // Sibling graphic.
+                        if (!visual._siblingGraphics) {
+                            visual._siblingGraphics = [];
+                        }
+                        if (visual._siblingGraphics.indexOf(feature) < 0) {
+                            visual._siblingGraphics.push(feature);
+                        }
+                    }
+                }
+                this.loadedCesiumEntities[rego.entityId] = rego;
                 this.visualsManager.AddRego({
                     rego,
                     requestRender: false
@@ -17213,6 +17243,9 @@ var TilesetCadRenderManager;
                     menuItemId: this.item.id,
                     doRemove: false
                 });
+                // Might have to do something smarter since siblings could still be OK.
+                this.loadedCesiumEntities[rego.entityId] = null;
+                delete this.loadedCesiumEntities[rego.entityId];
             }
         }
         getMetaByGeomId(geomId, tileset) {
@@ -17225,9 +17258,9 @@ var TilesetCadRenderManager;
             if (!modelTree) {
                 return null;
             }
-            return this.digMetaByGeomId(geomId, modelTree, [], 0);
+            return this.digMetaByGeomId(geomId, modelTree, [], 0, null);
         }
-        digMetaByGeomId(geomId, branch, path, depth) {
+        digMetaByGeomId(geomId, branch, path, depth, firstFoundCollapsedBranch) {
             if (this.hasHitDepthLimit || depth > 10) {
                 if (!this.hasHitDepthLimit) {
                     console.error("digMetaByGeomId: depth > 10. Disabling further attempts.");
@@ -17237,12 +17270,19 @@ var TilesetCadRenderManager;
             }
             path = [].concat(path);
             path.push(branch.id);
+            if (!firstFoundCollapsedBranch && branch.collapsed) {
+                firstFoundCollapsedBranch = branch;
+            }
             if (branch.geomId == geomId) {
-                return { id: path[path.length - 1], typeId: branch.typeId, name: branch.name };
+                // If we collapsed on a higher branch then we return it instead.
+                if (firstFoundCollapsedBranch) {
+                    branch = firstFoundCollapsedBranch;
+                }
+                return { id: branch.id, typeId: branch.typeId, name: branch.name };
             }
             else if (branch.children) {
                 for (let i = 0; i < branch.children.length; i++) {
-                    let meta = this.digMetaByGeomId(geomId, branch.children[i], path, depth + 1);
+                    let meta = this.digMetaByGeomId(geomId, branch.children[i], path, depth + 1, firstFoundCollapsedBranch);
                     if (meta) {
                         return meta;
                     }
@@ -29973,7 +30013,7 @@ class WidgetViewBar extends Widget.AWidget {
     }
 }
 
-const VERSION = "5.2.7";
+const VERSION = "5.2.9";
 
 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