bruce-cesium 4.6.9 → 4.7.1

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, EntitySource, MenuItem, EntityRelation, ProgramKey, ProjectView, ProjectViewBookmark, Camera, ProjectViewLegacyTile, EntityAttribute, EntityAttachment, EntityAttachmentType, AbstractApi, Session } from 'bruce-models';
+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, EntitySource, MenuItem, EntityRelation, ProgramKey, ProjectView, ProjectViewBookmark, Camera, ProjectViewLegacyTile, AbstractApi, Session, EntityAttribute, EntityAttachment, EntityAttachmentType } 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, SceneMode, ColorBlendMode, HeadingPitchRoll, Transforms, Model, Primitive, Cesium3DTileFeature, GeoJsonDataSource, Cesium3DTileColorBlendMode, HeadingPitchRange, Cesium3DTileStyle, Ion, KmlDataSource, SceneTransforms, OrthographicFrustum, EasingFunction, NearFarScalar, EllipsoidTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, IonImageryProvider, CesiumTerrainProvider, CesiumInspector, defined, ClockRange, Cesium3DTileset, Matrix4, Matrix3, IonResource, 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, HorizontalOrigin, VerticalOrigin, PolygonHierarchy, PolylineGraphics, ColorMaterialProperty, ColorBlendMode, HeadingPitchRoll, Transforms, Model, SceneMode, Primitive, Cesium3DTileFeature, GeoJsonDataSource, Cesium3DTileColorBlendMode, HeadingPitchRange, Cesium3DTileStyle, Ion, KmlDataSource, SceneTransforms, OrthographicFrustum, EasingFunction, NearFarScalar, Cesium3DTileset, Matrix4, Matrix3, IonResource, EllipsoidTerrainProvider, CesiumInspector, defined, ClockRange, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, IonImageryProvider, CesiumTerrainProvider, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, BoundingSphere, GeometryInstance, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, Quaternion, ScreenSpaceEventHandler, ScreenSpaceEventType, CzmlDataSource, Intersect, Fullscreen } from 'cesium';
 
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation. All rights reserved.
@@ -15015,12 +15015,13 @@ var TilesetRenderEngine;
     }
     TilesetRenderEngine.RenderLegacy = RenderLegacy;
     var Styler = /** @class */ (function () {
-        function Styler(viewer, api, cTileset, fallbackStyleId, styleMapping, menuItemId, register) {
+        function Styler(viewer, api, cTileset, fallbackStyleId, styleMapping, expandSources, menuItemId, register) {
             var _a;
             this.disposed = false;
             this.styleMappingLoaded = false;
             this.styleMappingsLoaded = {};
             this.fallbackStyle = null;
+            this.expandSources = false;
             this.loadingCounter = 0;
             // Dictionary of Entity ID -> boolean to indicate which Entities have been styled.
             // This is used to determine if the Style colour needs to be overriden or not.
@@ -15028,9 +15029,15 @@ var TilesetRenderEngine;
             this.runningQueues = 0;
             this.recordLoadQueue = [];
             this.recordCheckQueue = [];
+            // % progress for how many Entities have been styled so far.
+            // This can change as Tiles load in and more queue.
+            this._styleProgress = 0;
+            // Event for when the style progress changes.
+            this.OnStyleProgress = new BruceEvent();
             this.viewer = viewer;
             this.api = api;
             this.cTileset = cTileset;
+            this.expandSources = expandSources;
             this.fallbackStyleId = fallbackStyleId;
             this.styleMapping = styleMapping;
             if (styleMapping) {
@@ -15059,6 +15066,13 @@ var TilesetRenderEngine;
             enumerable: false,
             configurable: true
         });
+        Object.defineProperty(Styler.prototype, "StyleProgress", {
+            get: function () {
+                return this._styleProgress;
+            },
+            enumerable: false,
+            configurable: true
+        });
         /**
          * Updates style mapping and fallback style.
          * This will trigger a re-style of all entities, and will stop existing style loads.
@@ -15091,6 +15105,9 @@ var TilesetRenderEngine;
             else {
                 this.fallbackStyle = null;
             }
+            if (params.expandSources != null) {
+                this.expandSources = params.expandSources;
+            }
             // Empty queues.
             // Requeue all.
             this.recordLoadQueue = [];
@@ -15150,7 +15167,8 @@ var TilesetRenderEngine;
                             return [4 /*yield*/, Entity$1.GetListByIds({
                                     api: this.api,
                                     entityIds: batch,
-                                    migrated: true
+                                    migrated: true,
+                                    expandSources: this.expandSources
                                 })];
                         case 2:
                             entities = (_c.sent()).entities;
@@ -15211,9 +15229,35 @@ var TilesetRenderEngine;
             });
         };
         Styler.prototype.getEntityIdsForQueue = function () {
-            var BATCH_SIZE = 500;
+            var BATCH_SIZE = this.expandSources ? 100 : 500;
             return this.recordLoadQueue.splice(0, BATCH_SIZE);
         };
+        /**
+         * Calculates the current progress % and updates the progress if there is a change.
+         */
+        Styler.prototype.updateStyleProgress = function () {
+            var _this = this;
+            var progress = 100; // Done when idling.
+            if (this.recordCheckQueue.length || this.recordLoadQueue.length) {
+                var total = Object.keys(this.styledEntityIds).length;
+                var done = Object.keys(this.styledEntityIds).filter(function (x) { return _this.styledEntityIds[x]; }).length;
+                progress = Math.round((done / total) * 100);
+                // Round to 2dp, 0, or 100.
+                if (progress < 0) {
+                    progress = 0;
+                }
+                else if (progress < 100) {
+                    progress = Math.round(progress * 100) / 100;
+                }
+                else if (progress > 100) {
+                    progress = 100;
+                }
+            }
+            if (this._styleProgress != progress) {
+                this._styleProgress = progress;
+                this.OnStyleProgress.Trigger(progress);
+            }
+        };
         Styler.prototype.getEntityRego = function (entityId) {
             return this.register.GetRego({
                 entityId: entityId,
@@ -15481,6 +15525,11 @@ var TilesetRenderEngine;
             });
         };
         Styler.prototype.queueTilesetFeatureStyle = function (entity, highPriority) {
+            // Add to the style dict if not already there.
+            // This helps us know the styling progress for things that have loaded in so far.
+            if (!this.styledEntityIds[entity.entityId]) {
+                this.styledEntityIds[entity.entityId] = null;
+            }
             if (this.styleMappingLoaded || this.styleMappingsLoaded[entity.entityTypeId] == true) {
                 var needsData = this.getTilesetFeatureNeedsFullData(entity.entityId, entity.entityTypeId);
                 if (needsData) {
@@ -15526,6 +15575,7 @@ var TilesetRenderEngine;
                 override: this.styledEntityIds[entity.entityId] == true
             });
             this.styledEntityIds[entity.entityId] = true;
+            this.updateStyleProgress();
         };
         Styler.prototype.getTilesetFeatureStyle = function (entityId, entityTypeId) {
             var _a, _b, _c, _d;
@@ -15740,12 +15790,13 @@ var TilesetCadRenderManager;
                             }
                             this.viewer.scene.requestRender();
                             TilesetRenderEngine.OnTilesetReady(this.cTileset).then(function () {
+                                var _a;
                                 try {
                                     if (_this.disposed || cTileset.isDestroyed()) {
                                         return;
                                     }
                                     _this.onCTilesetLoad();
-                                    _this.styler = new TilesetRenderEngine.Styler(_this.viewer, api, _this.cTileset, _this.item.styleId, _this.item.StyleMapping, _this.item.id, _this.visualsManager);
+                                    _this.styler = new TilesetRenderEngine.Styler(_this.viewer, api, _this.cTileset, _this.item.styleId, _this.item.StyleMapping, (_a = _this.item.BruceEntity) === null || _a === void 0 ? void 0 : _a.ExpandSources, _this.item.id, _this.visualsManager);
                                     _this.viewer.scene.requestRender();
                                 }
                                 catch (e) {
@@ -17604,7 +17655,7 @@ var TilesetEntitiesRenderManager;
                                     }
                                     if (_this.item.ApplyStyles) {
                                         var api_1 = _this.getters.GetBruceApi();
-                                        _this.styler = new TilesetRenderEngine.Styler(_this.viewer, api_1, _this.cTileset, +_this.item.styleId, [], _this.item.id, _this.visualsManager);
+                                        _this.styler = new TilesetRenderEngine.Styler(_this.viewer, api_1, _this.cTileset, +_this.item.styleId, [], false, _this.item.id, _this.visualsManager);
                                     }
                                     _this.onCTilesetLoad();
                                     _this.viewer.scene.requestRender();
@@ -18273,7 +18324,7 @@ var TilesetArbRenderManager;
                                     if (_this.item.ApplyStyles ||
                                         _this.item.Type == MenuItem.EType.IonTileset) {
                                         var api = _this.getters.GetBruceApi();
-                                        _this.styler = new TilesetRenderEngine.Styler(_this.viewer, api, _this.cTileset, _this.item.styleId, _this.item.StyleMapping, _this.item.id, _this.visualsManager);
+                                        _this.styler = new TilesetRenderEngine.Styler(_this.viewer, api, _this.cTileset, _this.item.styleId, _this.item.StyleMapping, false, _this.item.id, _this.visualsManager);
                                     }
                                     _this.onCTilesetLoad();
                                     _this.viewer.scene.requestRender();
@@ -25964,7 +26015,7 @@ var MARKER_ICON_SVG = "\n    <svg width=\"20\" height=\"20\" viewBox=\"0 0 24 24
 var CLOSE_ICON_SVG = "\n    <svg width=\"15\" height=\"15\" viewBox=\"0 0 24 24\" fill=\"none\" xmlns=\"http://www.w3.org/2000/svg\">\n        <path d=\"M15.7909 12L21.4767 6.3142C22.1744 5.61648 22.1744 4.48523 21.4767 3.78693L20.2131 2.5233C19.5153 1.82557 18.3841 1.82557 17.6858 2.5233L12 8.20909L6.3142 2.5233C5.61648 1.82557 4.48523 1.82557 3.78693 2.5233L2.5233 3.78693C1.82557 4.48466 1.82557 5.61591 2.5233 6.3142L8.20909 12L2.5233 17.6858C1.82557 18.3835 1.82557 19.5148 2.5233 20.2131L3.78693 21.4767C4.48466 22.1744 5.61648 22.1744 6.3142 21.4767L12 15.7909L17.6858 21.4767C18.3835 22.1744 19.5153 22.1744 20.2131 21.4767L21.4767 20.2131C22.1744 19.5153 22.1744 18.3841 21.4767 17.6858L15.7909 12Z\" fill=\"black\"/>\n    </svg>\n";
 function generateEle() {
     var ele = document.createElement("div");
-    ele.setAttribute("style", "\n        left: 0px;\n        top: 0px;\n        position: absolute;\n        z-index: 3;\n        border-radius: 18px;\n        background-color: white;\n        display: flex;\n        align-items: center;\n        padding: 3px 4px;\n        padding-right: 10px;\n        font-size: 15px;\n        pointer-events: none;\n        box-shadow: 0px 0px 1px rgba(18, 22, 25, 0.24), 0px 18px 36px -4px rgba(18, 22, 25, 0.6);\n    ");
+    ele.setAttribute("style", "\n        left: 0px;\n        top: 0px;\n        position: absolute;\n        z-index: 3;\n        border-radius: 18px;\n        background-color: white;\n        display: flex;\n        align-items: center;\n        padding: 3px 4px;\n        padding-right: 10px;\n        font-size: 15px;\n        pointer-events: none;\n        box-shadow: 0px 0px 1px rgba(18, 22, 25, 0.24), 0px 18px 36px -4px rgba(18, 22, 25, 0.6);\n        color: black;\n    ");
     var icon = document.createElement("div");
     icon.innerHTML = MARKER_ICON_SVG;
     icon.setAttribute("style", "\n        margin-right: 2px;\n        height: 30px;\n        width: 30px;\n        display: flex;\n        align-items: center;\n        justify-content: center;\n    ");
@@ -28225,7 +28276,7 @@ var WidgetViewBar = /** @class */ (function (_super) {
     return WidgetViewBar;
 }(Widget.AWidget));
 
-var VERSION = "4.6.9";
+var VERSION = "4.7.1";
 
 export { VERSION, CesiumViewMonitor, ViewerUtils, ViewerEventTracker, MenuItemManager, EntityRenderEngine, EntityRenderEnginePoint, EntityRenderEnginePolyline, EntityRenderEnginePolygon, EntityRenderEngineModel3d, MenuItemCreator, VisualsRegister, RenderManager, EntitiesIdsRenderManager, 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, 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