bruce-cesium 5.2.6 → 5.2.8

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, HorizontalOrigin, VerticalOrigin, PolygonHierarchy, PolylineGraphics, ColorMaterialProperty, ColorBlendMode, HeadingPitchRoll, Transforms, Model, Primitive, Cesium3DTileFeature, SceneMode, GeoJsonDataSource, Cesium3DTileColorBlendMode, HeadingPitchRange, Cesium3DTileStyle, Ion, KmlDataSource, SceneTransforms, OrthographicFrustum, EasingFunction, NearFarScalar, EllipsoidTerrainProvider, CesiumInspector, defined, ClockRange, Cesium3DTileset, Matrix4, Matrix3, IonResource, IonImageryProvider, createWorldImagery, createWorldImageryAsync, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, CesiumTerrainProvider, PolygonPipeline, EllipsoidGeodesic, sampleTerrainMostDetailed, BoundingSphere, GeometryInstance, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, Quaternion, ScreenSpaceEventHandler, ScreenSpaceEventType, CzmlDataSource, Intersect, Fullscreen } from 'cesium';
+import { Cartographic, JulianDate, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, Entity, DistanceDisplayCondition, ClassificationType, ArcType, CornerType, ShadowMode, ConstantProperty, ConstantPositionProperty, PolygonHierarchy, PolylineGraphics, ColorMaterialProperty, ColorBlendMode, HeadingPitchRoll, Transforms, Model, HorizontalOrigin, VerticalOrigin, SceneMode, Primitive, Cesium3DTileFeature, GeoJsonDataSource, Cesium3DTileStyle, Cesium3DTileColorBlendMode, HeadingPitchRange, Ion, KmlDataSource, SceneTransforms, OrthographicFrustum, EasingFunction, NearFarScalar, EllipsoidTerrainProvider, CesiumInspector, defined, ClockRange, Cesium3DTileset, Matrix4, Matrix3, IonResource, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, IonImageryProvider, createWorldImagery, createWorldImageryAsync, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, CesiumTerrainProvider, 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;
@@ -16899,6 +16899,10 @@ var TilesetCadRenderManager;
             // This likely means poor data so we have to disable drilling otherwise lag would be too bad.
             // The result is no entity type IDs are known so most styles fail.
             this.hasHitDepthLimit = false;
+            // Cache of 'something isolated' that we detect and use to calculate a default show state.
+            // It's pretty expensive so we save it for a few seconds inbetween checks.
+            this.somethingIsolated = null;
+            this.somethingIsolatedDateTime = null;
             const { viewer, register: visualsManager, getters, item } = params;
             this.viewer = viewer;
             this.getters = getters;
@@ -16906,24 +16910,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;
                     }
@@ -16931,7 +16940,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
@@ -16944,14 +16953,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
@@ -16999,7 +17007,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"]
                 });
@@ -17014,10 +17022,18 @@ var TilesetCadRenderManager;
                         if (this.disposed || cTileset.isDestroyed()) {
                             return;
                         }
+                        // We style Entities to be hidden by default so that we can selectively-
+                        // do a default later.
+                        // This stops them flickering in/out as Bookmark settings get applied.
+                        this.cTileset.style = new Cesium3DTileStyle({
+                            show: "false"
+                        });
                         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,
@@ -17074,7 +17090,12 @@ var TilesetCadRenderManager;
             for (let i = 0; i < content.featuresLength; i++) {
                 const feature = content.getFeature(i);
                 let rego = this.mapTilesetFeature(feature, load);
-                if ((rego === null || rego === void 0 ? void 0 : rego.entityId) && this.styler) {
+                if (!(rego === null || rego === void 0 ? void 0 : rego.entityId)) {
+                    // Override the default hide state set by the style.
+                    feature.show = true;
+                    continue;
+                }
+                if (this.styler) {
                     this.styler.QueueEntities([rego]);
                 }
             }
@@ -17094,7 +17115,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,
@@ -17160,6 +17181,31 @@ var TilesetCadRenderManager;
                 return null;
             }
             if (add) {
+                // Get the initial hide/show state.
+                const state = this.visualsManager.GetState({
+                    entityId: rego.entityId,
+                    menuItemId: this.item.id,
+                });
+                if (this.somethingIsolated == null ||
+                    // 5s cache.
+                    (this.somethingIsolatedDateTime && this.somethingIsolatedDateTime.getTime() + 5000 < new Date().getTime())) {
+                    this.somethingIsolated = this.visualsManager.GetIsIsolatedAny();
+                    this.somethingIsolatedDateTime = new Date();
+                }
+                // Override the default hide state set by the style.
+                let hide = false;
+                if (state) {
+                    if (state.hidden) {
+                        hide = true;
+                    }
+                    else if (state.opacity === 0) {
+                        hide = true;
+                    }
+                    else if (!state.isolated && this.somethingIsolated) {
+                        hide = true;
+                    }
+                }
+                feature.show = !hide;
                 this.visualsManager.AddRego({
                     rego,
                     requestRender: false
@@ -29933,7 +29979,7 @@ class WidgetViewBar extends Widget.AWidget {
     }
 }
 
-const VERSION = "5.2.6";
+const VERSION = "5.2.8";
 
 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