bruce-cesium 1.3.2 → 1.3.3

package/dist/bruce-cesium.umd.js

@@ -1215,6 +1215,8 @@
                                 else if (displayType == "polygon") {
                                     displayType = bruceModels.ZoomControl.EDisplayType.Geometry;
                                 }
+                                displayType = bruceModels.ZoomControl.EDisplayType.Geometry;
+                                // @ts-ignore
                                 if (displayType != bruceModels.ZoomControl.EDisplayType.Hidden) {
                                     newRenderId = getRenderGroupId(zoomItem);
                                     existingRego = params.visualRegister.GetRego({
@@ -1226,6 +1228,7 @@
                                         cEntities[id] = existingRego.visual;
                                     }
                                     else {
+                                        // @ts-ignore
                                         if (displayType == bruceModels.ZoomControl.EDisplayType.Model3D) {
                                             models.push(entity);
                                         }
@@ -1729,7 +1732,6 @@
                     show: false
                 });
                 cEntity._siblingGraphics = [];
-                console.count("POLYGON WIDTH = " + width + ", COLOR = " + (cLineColor === null || cLineColor === void 0 ? void 0 : cLineColor.toCssColorString()));
                 if (width > 0 && cLineColor) {
                     var cEntityBorder = new Cesium.Entity({
                         polyline: new Cesium.PolylineGraphics({
@@ -2032,6 +2034,8 @@
                 this.entityCheckRemoval = null;
                 this.isRunningCheck = false;
                 this.viewMonitorRemoval = null;
+                this.renderQueue = [];
+                this.renderQueueInterval = null;
                 var viewer = params.viewer, apiGetter = params.apiGetter, monitor = params.monitor, item = params.item, visualsManager = params.register, sharedGetters = params.sharedGetters;
                 this.viewer = viewer;
                 this.sharedGetters = sharedGetters;
@@ -2064,6 +2068,7 @@
                         if (!tagsToRender) {
                             tagsToRender = [];
                         }
+                        tagsToRender = [].concat(tagsToRender);
                         shouldRender = !isTagItem || tagsToRender.length > 0;
                         (_a = this.getter) === null || _a === void 0 ? void 0 : _a.ExcludeMenuItem(this.item.id);
                         this.getter = null;
@@ -2073,6 +2078,9 @@
                         this.viewMonitorRemoval = null;
                         (_d = this.entityCheckQueue) === null || _d === void 0 ? void 0 : _d.Dispose();
                         this.entityCheckQueue = null;
+                        clearInterval(this.renderQueueInterval);
+                        this.renderQueueInterval = null;
+                        this.renderQueue = [];
                         this.visualsManager.RemoveRegos({
                             menuItemId: this.item.id
                         });
@@ -2085,15 +2093,17 @@
                             attrFilter: (_e = this.item.BruceEntity.Filter) !== null && _e !== void 0 ? _e : {},
                             batchSize: 500,
                             typeId: this.item.BruceEntity["EntityType.ID"],
-                            monitor: this.monitor
+                            monitor: this.monitor,
+                            viewer: this.viewer,
+                            debugShowBounds: false
                         });
                         minMax = exports.RenderManager.GetZoomMinMax({
                             zoomControl: this.item.CameraZoomSettings
                         });
-                        this.getter.IncludeMenuItem(this.item.id, isTagItem ? tagsToRender : [], minMax[0], minMax[1]);
+                        this.getter.IncludeMenuItem(this.item.id, [], minMax[0], minMax[1]);
                         this.getterSub = this.getter.OnUpdate.Subscribe(function (entities) {
                             if (isTagItem) {
-                                _this.onGetterUpdate(entities.filter(function (entity) {
+                                _this.distributeForRender(entities.filter(function (entity) {
                                     var entityTags = entity.Bruce["Layer.ID"];
                                     if (!entityTags) {
                                         entityTags = [];
@@ -2104,7 +2114,7 @@
                                 }));
                             }
                             else {
-                                _this.onGetterUpdate(entities);
+                                _this.distributeForRender(entities);
                             }
                         });
                         this.viewMonitorRemoval = this.monitor.Updated().Subscribe(function () {
@@ -2133,6 +2143,8 @@
                 });
                 (_b = this.entityCheckRemoval) === null || _b === void 0 ? void 0 : _b.call(this);
                 (_c = this.viewMonitorRemoval) === null || _c === void 0 ? void 0 : _c.call(this);
+                clearInterval(this.renderQueueInterval);
+                this.renderQueue = [];
             };
             Manager.prototype.ReRender = function (entityIds) {
                 return __awaiter(this, void 0, void 0, function () {
@@ -2196,7 +2208,7 @@
                                                 if (this.disposed) {
                                                     return [2 /*return*/];
                                                 }
-                                                this.distributeGenerateBatches(entities);
+                                                this.distributeForRender(entities);
                                                 return [2 /*return*/];
                                         }
                                     });
@@ -2220,14 +2232,22 @@
                     });
                 });
             };
-            Manager.prototype.distributeGenerateBatches = function (entities) {
-                var BATCH_SIZE = 50;
-                while (entities.length > 0) {
-                    var batch = entities.splice(0, BATCH_SIZE);
-                    this.onGetterUpdate(batch);
+            Manager.prototype.distributeForRender = function (entities) {
+                var _this = this;
+                var BATCH_SIZE = 300;
+                this.renderQueue = this.renderQueue.concat(entities);
+                if (!this.renderQueueInterval && this.renderQueue.length) {
+                    this.renderQueueInterval = setInterval(function () {
+                        var batch = _this.renderQueue.splice(0, BATCH_SIZE);
+                        _this.renderEntities(batch);
+                        if (_this.renderQueue.length <= 0) {
+                            clearInterval(_this.renderQueueInterval);
+                            _this.renderQueueInterval = null;
+                        }
+                    }, 50);
                 }
             };
-            Manager.prototype.onGetterUpdate = function (entities) {
+            Manager.prototype.renderEntities = function (entities) {
                 var _a, _b, _c;
                 return __awaiter(this, void 0, void 0, function () {
                     var typeId_1, cEntities, i, entity, id, cEntity, visual, tagIds, e_2;
@@ -2272,7 +2292,7 @@
                                                     priority: 0,
                                                     entityTypeId: entity.Bruce["EntityType.ID"],
                                                     accountId: this.apiGetter.accountId,
-                                                    tagIds: tagIds ? tagIds : []
+                                                    tagIds: tagIds ? [].concat(tagIds) : []
                                                 }
                                             });
                                         }
@@ -5037,6 +5057,26 @@
                 if (!getter) {
                     getter = new bruceModels.EntityFilterGetter.Getter(params.api, params.monitor, params.typeId, params.batchSize, params.attrFilter, true);
                     this.data[cacheKey] = getter;
+                    if (params.viewer && params.debugShowBounds) {
+                        getter.OnScanUpdate.Subscribe(function (cells) {
+                            cells.forEach(function (cell) {
+                                var bounds = cell.GetBounds();
+                                var id = bounds.east + "_" + bounds.north + "_" + bounds.south + "_" + bounds.west;
+                                if (params.viewer.entities.getById(id)) {
+                                    return;
+                                }
+                                var rect = new Cesium.Rectangle(Cesium.Math.toRadians(bounds.west), Cesium.Math.toRadians(bounds.south), Cesium.Math.toRadians(bounds.east), Cesium.Math.toRadians(bounds.north));
+                                params.viewer.entities.add(new Cesium.Entity({
+                                    id: id,
+                                    rectangle: {
+                                        coordinates: rect,
+                                        fill: true,
+                                        material: Cesium.Color.fromRandom().withAlpha(0.3)
+                                    }
+                                }));
+                            });
+                        });
+                    }
                 }
                 return getter;
             };