bruce-cesium 4.7.0 → 4.7.2

package/dist/bruce-cesium.umd.js

@@ -14974,6 +14974,11 @@
                 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 BModels.BruceEvent();
                 this.viewer = viewer;
                 this.api = api;
                 this.cTileset = cTileset;
@@ -15006,6 +15011,13 @@
                 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.
@@ -15048,6 +15060,8 @@
                 var regos = this.register.GetRegos({
                     menuItemId: this.menuItemId
                 });
+                // Reset progress.
+                this.updateStyleProgress();
                 this.styleMappingLoaded = false;
                 this.styleMappingsLoaded = {};
                 this.QueueEntities(regos);
@@ -15162,9 +15176,37 @@
                 });
             };
             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,
@@ -15402,8 +15444,8 @@
                                             }
                                         }
                                         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);
                                             }
@@ -15432,6 +15474,11 @@
                 });
             };
             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) {
@@ -15477,6 +15524,7 @@
                     override: this.styledEntityIds[entity.entityId] == true
                 });
                 this.styledEntityIds[entity.entityId] = true;
+                this.updateStyleProgress();
             };
             Styler.prototype.getTilesetFeatureStyle = function (entityId, entityTypeId) {
                 var _a, _b, _c, _d;
@@ -28136,7 +28184,7 @@
         return WidgetViewBar;
     }(exports.Widget.AWidget));
 
-    var VERSION = "4.7.0";
+    var VERSION = "4.7.2";
 
     exports.VERSION = VERSION;
     exports.CesiumParabola = CesiumParabola;