bruce-cesium 1.3.1 → 1.3.3

package/dist/bruce-cesium.es5.js

@@ -1,5 +1,5 @@
 import { BruceEvent, Cartes, Carto, Geometry, ZoomControl, Style, EntityTag, Calculator, EntityLod, EntityType, ClientFile, ObjectUtils, DelayQueue, Entity as Entity$1, BatchedDataGetter, EntityRelationType, Tileset, EntityCoords, EntityFilterGetter, EntitySource, EntityRelation, MenuItem, ProjectView, ProjectViewBookmark, ProjectViewTile, ProjectViewLegacyTile, ProgramKey, Camera } from 'bruce-models';
-import { Cartesian2, Cartographic, Math as Math$1, Color, HeightReference, Cartesian3, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, Cesium3DTileColorBlendMode, HeadingPitchRange, createOsmBuildings, Cesium3DTileStyle, Rectangle, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, Matrix4, Cesium3DTileset, IonResource, KmlDataSource, OrthographicFrustum, JulianDate, CallbackProperty, PolygonPipeline, ColorMaterialProperty, Matrix3, EasingFunction, GeometryInstance, EllipsoidGeodesic, sampleTerrainMostDetailed } from 'cesium';
+import { Cartesian2, Cartographic, Math as Math$1, Cartesian3, Entity, Primitive, Cesium3DTileFeature, Color, HeightReference, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, HeadingPitchRange, Cesium3DTileColorBlendMode, createOsmBuildings, Cesium3DTileStyle, Rectangle, KmlDataSource, OrthographicFrustum, JulianDate, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, Matrix4, Cesium3DTileset, IonResource, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, ColorMaterialProperty, Matrix3, EasingFunction, GeometryInstance, CallbackProperty } from 'cesium';
 
 var TIME_LAG = 300;
 var POSITION_CHECK_TIMER = 950;
@@ -1218,6 +1218,8 @@ var EntityRenderEngine;
                             else if (displayType == "polygon") {
                                 displayType = ZoomControl.EDisplayType.Geometry;
                             }
+                            displayType = ZoomControl.EDisplayType.Geometry;
+                            // @ts-ignore
                             if (displayType != ZoomControl.EDisplayType.Hidden) {
                                 newRenderId = getRenderGroupId(zoomItem);
                                 existingRego = params.visualRegister.GetRego({
@@ -1229,6 +1231,7 @@ var EntityRenderEngine;
                                     cEntities[id] = existingRego.visual;
                                 }
                                 else {
+                                    // @ts-ignore
                                     if (displayType == ZoomControl.EDisplayType.Model3D) {
                                         models.push(entity);
                                     }
@@ -1267,7 +1270,7 @@ var EntityRenderEngine;
                     case 2:
                         if (!(multiGeometry.length > 0)) return [3 /*break*/, 6];
                         _loop_1 = function (i) {
-                            var entity, pParams, zoomItem, j, subEntity, cPoly, rendered, cLines, cPoints, rootEntity, firstEntity;
+                            var entity, pParams, zoomItem, j, subEntity, cPoly, rendered, cLines, cPoints, rootEntity_1, firstEntity;
                             return __generator(this, function (_a) {
                                 switch (_a.label) {
                                     case 0:
@@ -1303,16 +1306,19 @@ var EntityRenderEngine;
                                         rendered = rendered.concat(Object.values(cPoints));
                                         rendered = rendered.filter(function (x) { return x != null; });
                                         if (rendered.length) {
-                                            rootEntity = new Entity({});
-                                            params.viewer.entities.add(rootEntity);
-                                            rootEntity._siblingGraphics = [];
-                                            rootEntity._renderGroup = getRenderGroupId(zoomItem);
-                                            rootEntity._siblingGraphics = rootEntity._siblingGraphics.concat(rendered);
-                                            cEntities[entity.Bruce.ID] = rootEntity;
+                                            rootEntity_1 = new Entity({});
+                                            params.viewer.entities.add(rootEntity_1);
+                                            rootEntity_1._siblingGraphics = [];
+                                            rootEntity_1._renderGroup = getRenderGroupId(zoomItem);
+                                            rootEntity_1._siblingGraphics = rootEntity_1._siblingGraphics.concat(rendered);
+                                            cEntities[entity.Bruce.ID] = rootEntity_1;
                                             firstEntity = rendered[0];
                                             if (firstEntity) {
-                                                rootEntity.position = getValue(params.viewer, firstEntity.position.getValue);
+                                                rootEntity_1.position = getValue(params.viewer, firstEntity.position.getValue);
                                             }
+                                            rendered.forEach(function (child) {
+                                                child._parentEntity = rootEntity_1;
+                                            });
                                         }
                                         else {
                                             polygons.push(entity);
@@ -1729,7 +1735,7 @@ var EntityRenderEngine;
                 show: false
             });
             cEntity._siblingGraphics = [];
-            if (width > 0 && bLineColor) {
+            if (width > 0 && cLineColor) {
                 var cEntityBorder = new Entity({
                     polyline: new PolylineGraphics({
                         positions: posses,
@@ -1742,26 +1748,28 @@ var EntityRenderEngine;
                     }),
                     show: false
                 });
+                params.viewer.entities.add(cEntityBorder);
+                cEntityBorder._parentEntity = cEntity;
                 cEntity._siblingGraphics.push(cEntityBorder);
-            }
-            for (var i = 0; i < holePosses.length; i++) {
-                var posses_1 = holePosses[i];
-                Cartes.CloseRing3(posses_1);
-                var cEntityHole = new Entity({
-                    polyline: new PolylineGraphics({
-                        positions: posses_1,
-                        material: cLineColor,
-                        width: width,
-                        clampToGround: heightRef == HeightReference.CLAMP_TO_GROUND,
-                        classificationType: ClassificationType.TERRAIN,
-                        arcType: ArcType.GEODESIC,
-                        zIndex: zIndex
-                    }),
-                    show: false
-                });
-                cEntity._siblingGraphics.push(cEntityHole);
-                cEntityHole._parentEntity = cEntity;
-                params.viewer.entities.add(cEntityHole);
+                for (var i = 0; i < holePosses.length; i++) {
+                    var posses_1 = holePosses[i];
+                    Cartes.CloseRing3(posses_1);
+                    var cEntityHole = new Entity({
+                        polyline: new PolylineGraphics({
+                            positions: posses_1,
+                            material: cLineColor,
+                            width: width,
+                            clampToGround: heightRef == HeightReference.CLAMP_TO_GROUND,
+                            classificationType: ClassificationType.TERRAIN,
+                            arcType: ArcType.GEODESIC,
+                            zIndex: zIndex
+                        }),
+                        show: false
+                    });
+                    cEntity._siblingGraphics.push(cEntityHole);
+                    cEntityHole._parentEntity = cEntity;
+                    params.viewer.entities.add(cEntityHole);
+                }
             }
             params.viewer.entities.add(cEntity);
             return cEntity;
@@ -2034,6 +2042,8 @@ var EntitiesRenderManager;
             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;
@@ -2066,6 +2076,7 @@ var EntitiesRenderManager;
                     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;
@@ -2075,6 +2086,9 @@ var EntitiesRenderManager;
                     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
                     });
@@ -2087,15 +2101,17 @@ var EntitiesRenderManager;
                         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 = 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 = [];
@@ -2106,7 +2122,7 @@ var EntitiesRenderManager;
                             }));
                         }
                         else {
-                            _this.onGetterUpdate(entities);
+                            _this.distributeForRender(entities);
                         }
                     });
                     this.viewMonitorRemoval = this.monitor.Updated().Subscribe(function () {
@@ -2135,6 +2151,8 @@ var EntitiesRenderManager;
             });
             (_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 () {
@@ -2198,7 +2216,7 @@ var EntitiesRenderManager;
                                             if (this.disposed) {
                                                 return [2 /*return*/];
                                             }
-                                            this.distributeGenerateBatches(entities);
+                                            this.distributeForRender(entities);
                                             return [2 /*return*/];
                                     }
                                 });
@@ -2222,14 +2240,22 @@ var EntitiesRenderManager;
                 });
             });
         };
-        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;
@@ -2274,7 +2300,7 @@ var EntitiesRenderManager;
                                                 priority: 0,
                                                 entityTypeId: entity.Bruce["EntityType.ID"],
                                                 accountId: this.apiGetter.accountId,
-                                                tagIds: tagIds ? tagIds : []
+                                                tagIds: tagIds ? [].concat(tagIds) : []
                                             }
                                         });
                                     }
@@ -5066,6 +5092,26 @@ var SharedGetters;
             if (!getter) {
                 getter = new 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 Rectangle(Math$1.toRadians(bounds.west), Math$1.toRadians(bounds.south), Math$1.toRadians(bounds.east), Math$1.toRadians(bounds.north));
+                            params.viewer.entities.add(new Entity({
+                                id: id,
+                                rectangle: {
+                                    coordinates: rect,
+                                    fill: true,
+                                    material: Color.fromRandom().withAlpha(0.3)
+                                }
+                            }));
+                        });
+                    });
+                }
             }
             return getter;
         };