bruce-cesium 4.7.0 → 4.7.2

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, AbstractApi, EntityAttribute, EntityAttachment, EntityAttachmentType, 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, EntityAttribute, EntityAttachment, EntityAttachmentType, Session, AbstractApi } from 'bruce-models';
 import * as Cesium from 'cesium';
-import { Cartographic, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, Entity, DistanceDisplayCondition, JulianDate, 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, EllipsoidTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, IonImageryProvider, CesiumTerrainProvider, CesiumInspector, defined, ClockRange, Cesium3DTileset, Matrix4, Matrix3, IonResource, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, Quaternion, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, BoundingSphere, GeometryInstance, ScreenSpaceEventHandler, ScreenSpaceEventType, CzmlDataSource, Intersect, Fullscreen } 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, GeoJsonDataSource, SceneMode, Cesium3DTileColorBlendMode, HeadingPitchRange, Cesium3DTileStyle, Ion, KmlDataSource, SceneTransforms, OrthographicFrustum, EasingFunction, NearFarScalar, EllipsoidTerrainProvider, CesiumInspector, defined, ClockRange, Cesium3DTileset, Matrix4, Matrix3, IonResource, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, IonImageryProvider, CesiumTerrainProvider, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, Quaternion, BoundingSphere, GeometryInstance, ScreenSpaceEventHandler, ScreenSpaceEventType, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, CzmlDataSource, Intersect, Fullscreen } from 'cesium';
 
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation. All rights reserved.
@@ -15029,6 +15029,11 @@ 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;
@@ -15061,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.
@@ -15103,6 +15115,8 @@ var TilesetRenderEngine;
             var regos = this.register.GetRegos({
                 menuItemId: this.menuItemId
             });
+            // Reset progress.
+            this.updateStyleProgress();
             this.styleMappingLoaded = false;
             this.styleMappingsLoaded = {};
             this.QueueEntities(regos);
@@ -15217,9 +15231,37 @@ var TilesetRenderEngine;
             });
         };
         Styler.prototype.getEntityIdsForQueue = function () {
-            var BATCH_SIZE = this.expandSources ? 200 : 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 progress = 100; // Done when idling.
+            if (this.recordCheckQueue.length || this.recordLoadQueue.length) {
+                var total = Object.keys(this.styledEntityIds).length;
+                // Done is the total minus the amount left.
+                // We have to ensure the same ID isn't counted within or across these arrays as well.
+                var uniqueSet = new Set(this.recordCheckQueue.concat(this.recordLoadQueue));
+                var done = total - uniqueSet.size;
+                progress = 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,
@@ -15457,8 +15499,8 @@ var TilesetRenderEngine;
                                         }
                                     }
                                     var _loop_3 = function (i) {
-                                        var hash = batch[i];
-                                        var index = _this.recordCheckQueue.findIndex(function (x) { return x == hash; });
+                                        var entityId = batch[i];
+                                        var index = _this.recordCheckQueue.findIndex(function (x) { return x == entityId; });
                                         if (index > -1) {
                                             _this.recordCheckQueue.splice(index, 1);
                                         }
@@ -15487,6 +15529,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) {
@@ -15532,6 +15579,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;
@@ -28232,7 +28280,7 @@ var WidgetViewBar = /** @class */ (function (_super) {
     return WidgetViewBar;
 }(Widget.AWidget));
 
-var VERSION = "4.7.0";
+var VERSION = "4.7.2";
 
 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