bruce-cesium 1.9.3 → 1.9.4

package/dist/bruce-cesium.es5.js

@@ -1,6 +1,6 @@
 import { BruceEvent, Cartes, Carto, Entity as Entity$1, Geometry, Tileset, MathUtils, LRUCache, ZoomControl, Style, EntityTag, Calculator, EntityLod, EntityType, ClientFile, ObjectUtils, DelayQueue, BatchedDataGetter, EntityRelationType, EntityCoords, EntityFilterGetter, EntitySource, MenuItem, EntityRelation, ProjectView, ProjectViewBookmark, ProjectViewTile, ProjectViewLegacyTile, ProgramKey, Camera } from 'bruce-models';
 import * as Cesium from 'cesium';
-import { Cartesian2, Cartographic, CallbackProperty, Cartesian3, Color, Rectangle, Math as Math$1, Entity, Primitive, Cesium3DTileFeature, HeightReference, EllipsoidTerrainProvider, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, SceneMode, Cesium3DTileColorBlendMode, HeadingPitchRange, createOsmBuildings, Cesium3DTileStyle, KmlDataSource, createWorldTerrain, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, OrthographicFrustum, JulianDate, NearFarScalar, EllipsoidGeodesic, sampleTerrainMostDetailed, Cesium3DTileset, Matrix4, Matrix3, IonResource, PolygonPipeline, ColorMaterialProperty, EasingFunction, GeometryInstance } from 'cesium';
+import { Cartesian2, Cartographic, CallbackProperty, Cartesian3, Color, Rectangle, Math as Math$1, Entity, Primitive, Cesium3DTileFeature, HeightReference, EllipsoidTerrainProvider, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, SceneMode, HeadingPitchRange, Cesium3DTileColorBlendMode, Cesium3DTileStyle, createOsmBuildings, KmlDataSource, createWorldTerrain, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, Cesium3DTileset, Matrix4, Matrix3, IonResource, PolygonPipeline, OrthographicFrustum, JulianDate, NearFarScalar, ColorMaterialProperty, EasingFunction, GeometryInstance, EllipsoidGeodesic, sampleTerrainMostDetailed } from 'cesium';
 
 var TIME_LAG = 300;
 var POSITION_CHECK_TIMER = 950;
@@ -1535,12 +1535,14 @@ function getStyle(api, entity, styleId) {
         });
     });
 }
+function shouldApplyFlatFix(terrain) {
+    return terrain instanceof EllipsoidTerrainProvider;
+}
 function getRenderGroupId(zoomItem, terrain) {
-    var isFlatTerrain = terrain instanceof EllipsoidTerrainProvider;
     if (!zoomItem) {
         return null;
     }
-    return zoomItem.MinZoom + "-" + zoomItem.MaxZoom + "-" + isFlatTerrain;
+    return zoomItem.MinZoom + "-" + zoomItem.MaxZoom + "-" + shouldApplyFlatFix(terrain);
 }
 var _fileValidationCache = {};
 var EntityRenderEngine;
@@ -2070,8 +2072,7 @@ var EntityRenderEngine;
             var flattenPoints = false;
             // We gain a lot of performance when not clamping.
             // If there is no terrain we can safely not clamp.
-            if (heightRef == HeightReference.CLAMP_TO_GROUND &&
-                ((_b = params.viewer) === null || _b === void 0 ? void 0 : _b.terrainProvider) instanceof EllipsoidTerrainProvider) {
+            if (heightRef == HeightReference.CLAMP_TO_GROUND && shouldApplyFlatFix((_b = params.viewer) === null || _b === void 0 ? void 0 : _b.terrainProvider)) {
                 heightRef = HeightReference.NONE;
                 flattenPoints = true;
             }
@@ -2207,8 +2208,7 @@ var EntityRenderEngine;
             var extrusion = getPolygonExtrusion(entity, params.tags, outerRing, posses, heightRef, style);
             posses = extrusion.posses;
             var flattenPoints = false;
-            if (heightRef == HeightReference.CLAMP_TO_GROUND &&
-                ((_b = params.viewer) === null || _b === void 0 ? void 0 : _b.terrainProvider) instanceof EllipsoidTerrainProvider) {
+            if (heightRef == HeightReference.CLAMP_TO_GROUND && shouldApplyFlatFix((_b = params.viewer) === null || _b === void 0 ? void 0 : _b.terrainProvider)) {
                 heightRef = HeightReference.NONE;
                 flattenPoints = true;
             }
@@ -2670,11 +2670,14 @@ var EntitiesRenderManager;
         };
         Manager.prototype.ReRender = function (params) {
             return __awaiter(this, void 0, void 0, function () {
-                var entityIds, force, data, e_1;
+                var entityIds, force, entities, data, e_1;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
-                            entityIds = params.entityIds, force = params.force;
+                            entityIds = params.entityIds, force = params.force, entities = params.entities;
+                            if (entities && !entityIds) {
+                                entityIds = entities.map(function (x) { var _a; return (_a = x.Bruce) === null || _a === void 0 ? void 0 : _a.ID; });
+                            }
                             if (entityIds == null) {
                                 entityIds = Object.keys(this.renderedEntities);
                             }
@@ -2682,8 +2685,13 @@ var EntitiesRenderManager;
                                 entityIds: entityIds,
                                 menuItemIds: [this.item.id]
                             });
+                            if (entities === null || entities === void 0 ? void 0 : entities.length) {
+                                entities = [].concat(entities).filter(function (x) { var _a; return entityIds.includes((_a = x.Bruce) === null || _a === void 0 ? void 0 : _a.ID); });
+                            }
                             if (!force) return [3 /*break*/, 5];
-                            _a.label = 1;
+                            if (!(entities === null || entities === void 0 ? void 0 : entities.length)) return [3 /*break*/, 1];
+                            this.renderEntities(entities, true);
+                            return [3 /*break*/, 4];
                         case 1:
                             _a.trys.push([1, 3, , 4]);
                             return [4 /*yield*/, Entity$1.GetListByIds({
@@ -2698,12 +2706,16 @@ var EntitiesRenderManager;
                             e_1 = _a.sent();
                             console.error(e_1);
                             return [3 /*break*/, 4];
-                        case 4: return [3 /*break*/, 7];
-                        case 5: return [4 /*yield*/, this.doEntityCheck(entityIds)];
-                        case 6:
+                        case 4: return [3 /*break*/, 8];
+                        case 5:
+                            if (!(entities === null || entities === void 0 ? void 0 : entities.length)) return [3 /*break*/, 6];
+                            this.distributeForRender(entities);
+                            return [3 /*break*/, 8];
+                        case 6: return [4 /*yield*/, this.doEntityCheck(entityIds)];
+                        case 7:
                             _a.sent();
-                            _a.label = 7;
-                        case 7: return [2 /*return*/];
+                            _a.label = 8;
+                        case 8: return [2 /*return*/];
                     }
                 });
             });
@@ -2920,10 +2932,13 @@ var EntitiesLoadedRenderManager;
         };
         Manager.prototype.ReRender = function (params) {
             return __awaiter(this, void 0, void 0, function () {
-                var entityIds, force;
+                var entityIds, force, entities;
                 var _this = this;
                 return __generator(this, function (_a) {
-                    entityIds = params.entityIds, force = params.force;
+                    entityIds = params.entityIds, force = params.force, entities = params.entities;
+                    if (entities && !entityIds) {
+                        entityIds = entities.map(function (x) { var _a; return (_a = x.Bruce) === null || _a === void 0 ? void 0 : _a.ID; });
+                    }
                     if (entityIds == null) {
                         entityIds = Object.keys(this.renderedEntities);
                     }
@@ -2938,7 +2953,12 @@ var EntitiesLoadedRenderManager;
                         entityIds: entityIds,
                         menuItemIds: [this.item.id]
                     });
-                    this.doEntityCheck(entityIds, force);
+                    if (entities === null || entities === void 0 ? void 0 : entities.length) {
+                        this.onGetterUpdate([].concat(entities).filter(function (x) { var _a; return entityIds.includes((_a = x.Bruce) === null || _a === void 0 ? void 0 : _a.ID); }), force);
+                    }
+                    else {
+                        this.doEntityCheck(entityIds, force);
+                    }
                     return [2 /*return*/];
                 });
             });
@@ -4423,10 +4443,13 @@ var EntitiesIdsRenderManager;
         };
         Manager.prototype.ReRender = function (params) {
             return __awaiter(this, void 0, void 0, function () {
-                var entityIds, force;
+                var entityIds, force, entities;
                 var _this = this;
                 return __generator(this, function (_a) {
-                    entityIds = params.entityIds, force = params.force;
+                    entityIds = params.entityIds, force = params.force, entities = params.entities;
+                    if (entities && !entityIds) {
+                        entityIds = entities.map(function (x) { var _a; return (_a = x.Bruce) === null || _a === void 0 ? void 0 : _a.ID; });
+                    }
                     if (entityIds == null) {
                         entityIds = Object.keys(this.renderedEntities);
                     }
@@ -4441,32 +4464,63 @@ var EntitiesIdsRenderManager;
                         entityIds: entityIds,
                         menuItemIds: [this.item.id]
                     });
-                    this.onGetterUpdate(entityIds, force);
+                    if (entities === null || entities === void 0 ? void 0 : entities.length) {
+                        this.renderEntities([].concat(entities).filter(function (x) { var _a; return entityIds.includes((_a = x.Bruce) === null || _a === void 0 ? void 0 : _a.ID); }), force);
+                    }
+                    else {
+                        this.onGetterUpdate(entityIds, force);
+                    }
                     return [2 /*return*/];
                 });
             });
         };
         Manager.prototype.onGetterUpdate = function (entityIds, force) {
-            var _a;
             if (force === void 0) { force = false; }
             return __awaiter(this, void 0, void 0, function () {
-                var api, entities, cEntities, i, entity, id, cEntity, visual, e_1;
-                return __generator(this, function (_b) {
-                    switch (_b.label) {
+                var api, entities, e_1;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
                         case 0:
                             if (this.disposed || this.viewer.isDestroyed()) {
                                 return [2 /*return*/];
                             }
-                            _b.label = 1;
+                            _a.label = 1;
                         case 1:
-                            _b.trys.push([1, 4, , 5]);
+                            _a.trys.push([1, 4, , 5]);
                             api = this.apiGetter.getApi();
                             return [4 /*yield*/, Entity$1.GetListByIds({
                                     api: api,
                                     entityIds: entityIds
                                 })];
                         case 2:
-                            entities = (_b.sent()).entities;
+                            entities = (_a.sent()).entities;
+                            return [4 /*yield*/, this.renderEntities(entities, force)];
+                        case 3:
+                            _a.sent();
+                            return [3 /*break*/, 5];
+                        case 4:
+                            e_1 = _a.sent();
+                            console.error(e_1);
+                            return [3 /*break*/, 5];
+                        case 5: return [2 /*return*/];
+                    }
+                });
+            });
+        };
+        Manager.prototype.renderEntities = function (entities, force) {
+            var _a;
+            if (force === void 0) { force = false; }
+            return __awaiter(this, void 0, void 0, function () {
+                var cEntities, i, entity, id, cEntity, visual, e_2;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0:
+                            if (this.disposed || this.viewer.isDestroyed()) {
+                                return [2 /*return*/];
+                            }
+                            _b.label = 1;
+                        case 1:
+                            _b.trys.push([1, 3, , 4]);
                             return [4 /*yield*/, EntityRenderEngine.Render({
                                     viewer: this.viewer,
                                     apiGetter: this.apiGetter,
@@ -4476,7 +4530,7 @@ var EntitiesIdsRenderManager;
                                     zoomControl: this.item.CameraZoomSettings,
                                     force: force
                                 })];
-                        case 3:
+                        case 2:
                             cEntities = _b.sent();
                             for (i = 0; i < entities.length; i++) {
                                 entity = entities[i];
@@ -4509,12 +4563,12 @@ var EntitiesIdsRenderManager;
                                 }
                             }
                             this.viewer.scene.requestRender();
-                            return [3 /*break*/, 5];
-                        case 4:
-                            e_1 = _b.sent();
-                            console.error(e_1);
-                            return [3 /*break*/, 5];
-                        case 5: return [2 /*return*/];
+                            return [3 /*break*/, 4];
+                        case 3:
+                            e_2 = _b.sent();
+                            console.error(e_2);
+                            return [3 /*break*/, 4];
+                        case 4: return [2 /*return*/];
                     }
                 });
             });
@@ -4573,11 +4627,15 @@ var EntityRenderManager;
         };
         Manager.prototype.ReRender = function (params) {
             return __awaiter(this, void 0, void 0, function () {
-                var entityIds, force;
+                var entityIds, force, entities;
+                var _this = this;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
-                            entityIds = params.entityIds, force = params.force;
+                            entityIds = params.entityIds, force = params.force, entities = params.entities;
+                            if (entities && !entityIds) {
+                                entityIds = entities.map(function (x) { var _a; return (_a = x.Bruce) === null || _a === void 0 ? void 0 : _a.ID; });
+                            }
                             if (entityIds && !entityIds.includes(this.item.BruceEntity.EntityId)) {
                                 return [2 /*return*/];
                             }
@@ -4585,23 +4643,28 @@ var EntityRenderManager;
                                 entityIds: entityIds,
                                 menuItemIds: [this.item.id]
                             });
-                            return [4 /*yield*/, this.onGetterUpdate(this.item.BruceEntity.EntityId, force)];
+                            if (!(entities === null || entities === void 0 ? void 0 : entities.length)) return [3 /*break*/, 2];
+                            return [4 /*yield*/, this.renderEntity(entities.find(function (x) { var _a; return ((_a = x.Bruce) === null || _a === void 0 ? void 0 : _a.ID) == _this.item.BruceEntity.EntityId; }), force)];
                         case 1:
                             _a.sent();
-                            return [2 /*return*/];
+                            return [3 /*break*/, 4];
+                        case 2: return [4 /*yield*/, this.onGetterUpdate(this.item.BruceEntity.EntityId, force)];
+                        case 3:
+                            _a.sent();
+                            _a.label = 4;
+                        case 4: return [2 /*return*/];
                     }
                 });
             });
         };
         Manager.prototype.onGetterUpdate = function (id, force) {
-            var _a;
             if (force === void 0) { force = false; }
             return __awaiter(this, void 0, void 0, function () {
-                var api, entity, cEntities, cEntity, visual, e_1;
-                return __generator(this, function (_b) {
-                    switch (_b.label) {
+                var api, entity, e_1;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
                         case 0:
-                            _b.trys.push([0, 3, , 4]);
+                            _a.trys.push([0, 2, , 3]);
                             if (this.disposed || this.viewer.isDestroyed()) {
                                 return [2 /*return*/];
                             }
@@ -4611,7 +4674,31 @@ var EntityRenderManager;
                                     entityId: id
                                 })];
                         case 1:
-                            entity = (_b.sent()).entity;
+                            entity = (_a.sent()).entity;
+                            this.renderEntity(entity, force);
+                            return [3 /*break*/, 3];
+                        case 2:
+                            e_1 = _a.sent();
+                            console.error(e_1);
+                            return [3 /*break*/, 3];
+                        case 3: return [2 /*return*/];
+                    }
+                });
+            });
+        };
+        Manager.prototype.renderEntity = function (entity, force) {
+            var _a;
+            if (force === void 0) { force = false; }
+            return __awaiter(this, void 0, void 0, function () {
+                var id, cEntities, cEntity, visual, e_2;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0:
+                            _b.trys.push([0, 2, , 3]);
+                            if (this.disposed || this.viewer.isDestroyed()) {
+                                return [2 /*return*/];
+                            }
+                            id = entity.Bruce.ID;
                             return [4 /*yield*/, EntityRenderEngine.Render({
                                     viewer: this.viewer,
                                     apiGetter: this.apiGetter,
@@ -4621,7 +4708,7 @@ var EntityRenderManager;
                                     zoomControl: this.item.CameraZoomSettings,
                                     force: force
                                 })];
-                        case 2:
+                        case 1:
                             cEntities = _b.sent();
                             cEntity = cEntities[id];
                             if (cEntity) {
@@ -4649,12 +4736,12 @@ var EntityRenderManager;
                                 });
                             }
                             this.viewer.scene.requestRender();
-                            return [3 /*break*/, 4];
-                        case 3:
-                            e_1 = _b.sent();
-                            console.error(e_1);
-                            return [3 /*break*/, 4];
-                        case 4: return [2 /*return*/];
+                            return [3 /*break*/, 3];
+                        case 2:
+                            e_2 = _b.sent();
+                            console.error(e_2);
+                            return [3 /*break*/, 3];
+                        case 3: return [2 /*return*/];
                     }
                 });
             });
@@ -7379,14 +7466,17 @@ var MenuItemManager;
          */
         Manager.prototype.ReRender = function (params) {
             return __awaiter(this, void 0, void 0, function () {
-                var entityIds, menuItemIds, force, items, i, item;
+                var entityIds, entities, menuItemIds, force, items, i, item;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
-                            entityIds = params.entityIds, menuItemIds = params.menuItemIds, force = params.force;
-                            if (!(entityIds === null || entityIds === void 0 ? void 0 : entityIds.length)) {
+                            entityIds = params.entityIds, entities = params.entities, menuItemIds = params.menuItemIds, force = params.force;
+                            if (!(entityIds === null || entityIds === void 0 ? void 0 : entityIds.length) && !(entities === null || entities === void 0 ? void 0 : entities.length)) {
                                 return [2 /*return*/];
                             }
+                            if (!entityIds && entities) {
+                                entityIds = entities.map(function (x) { var _a; return (_a = x.Bruce) === null || _a === void 0 ? void 0 : _a.ID; });
+                            }
                             items = (menuItemIds === null || menuItemIds === void 0 ? void 0 : menuItemIds.length) ? this.items.filter(function (x) { return menuItemIds.includes(x.id); }) : this.items;
                             i = 0;
                             _a.label = 1;
@@ -7396,6 +7486,7 @@ var MenuItemManager;
                             if (!item.renderManager) return [3 /*break*/, 3];
                             return [4 /*yield*/, item.renderManager.ReRender({
                                     entityIds: entityIds,
+                                    entities: entities,
                                     force: force
                                 })];
                         case 2: