bruce-cesium 4.0.3 → 4.0.5

package/dist/bruce-cesium.es5.js

@@ -1,6 +1,6 @@
 import { BruceEvent, Cartes, Carto, Entity as Entity$1, Geometry, Tileset, MathUtils, LRUCache, ProjectViewTile, DelayQueue, ZoomControl, Style, EntityTag, Calculator, EntityLod, EntityType, ClientFile, ObjectUtils, Bounds, Api, EntityRelationType, ENVIRONMENT, EntityHistoricData, EntityCoords, EntitySource, MenuItem, EntityRelation, ProgramKey, AbstractApi, ProjectViewBookmark, EntityAttachment, EntityAttachmentType, EntityAttribute, ProjectView, ProjectViewLegacyTile, Camera } from 'bruce-models';
 import * as Cesium from 'cesium';
-import { Cartographic, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, JulianDate, SceneMode, DistanceDisplayCondition, NearFarScalar, Model, ColorMaterialProperty, Entity, HorizontalOrigin, VerticalOrigin, ConstantProperty, ConstantPositionProperty, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, ColorBlendMode, HeadingPitchRoll, Transforms, GeoJsonDataSource, Primitive, Cesium3DTileFeature, Cesium3DTileColorBlendMode, HeadingPitchRange, Ion, Cesium3DTileStyle, KmlDataSource, SceneTransforms, OrthographicFrustum, EasingFunction, EllipsoidTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, CesiumTerrainProvider, Cesium3DTileset, Matrix4, Matrix3, IonResource, EllipsoidGeodesic, sampleTerrainMostDetailed, defined, CesiumInspector, ClockRange, PolygonPipeline, BoundingSphere, GeometryInstance, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, ScreenSpaceEventHandler, ScreenSpaceEventType, CzmlDataSource, Quaternion, Intersect } from 'cesium';
+import { Cartographic, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, JulianDate, Entity, Primitive, Cesium3DTileFeature, DistanceDisplayCondition, NearFarScalar, Model, ColorMaterialProperty, HorizontalOrigin, VerticalOrigin, ConstantProperty, ConstantPositionProperty, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, ColorBlendMode, HeadingPitchRoll, Transforms, SceneMode, GeoJsonDataSource, Cesium3DTileColorBlendMode, HeadingPitchRange, Ion, Cesium3DTileStyle, KmlDataSource, SceneTransforms, OrthographicFrustum, EasingFunction, EllipsoidTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, CesiumTerrainProvider, Cesium3DTileset, Matrix4, Matrix3, IonResource, CesiumInspector, defined, ClockRange, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, BoundingSphere, GeometryInstance, ScreenSpaceEventHandler, ScreenSpaceEventType, CzmlDataSource, Quaternion, Intersect } from 'cesium';
 
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation. All rights reserved.
@@ -2675,7 +2675,8 @@ var EntityUtils;
                                                 api: api,
                                                 entityId: entityId,
                                                 // Not expanding relative positions at first to see if the entity has valid location just by itself.
-                                                expandLocation: false
+                                                expandLocation: false,
+                                                migrated: true
                                             })];
                                     case 4:
                                         entity = (_e.sent()).entity;
@@ -2703,7 +2704,8 @@ var EntityUtils;
                                                 api: api,
                                                 entityId: entityId,
                                                 // We'll be expanding relative positioning and related tilesets now.
-                                                expandLocation: true
+                                                expandLocation: true,
+                                                migrated: true
                                             })];
                                     case 9:
                                         entity = (_e.sent()).entity;
@@ -3103,7 +3105,8 @@ var EntityUtils;
                         return [4 /*yield*/, Entity$1.Get({
                                 api: api,
                                 entityId: entityId,
-                                expandLocation: false
+                                expandLocation: false,
+                                migrated: true
                             })];
                     case 2:
                         entity = (_e.sent()).entity;
@@ -3128,7 +3131,8 @@ var EntityUtils;
                         return [4 /*yield*/, Entity$1.Get({
                                 api: api,
                                 entityId: entityId,
-                                expandLocation: true
+                                expandLocation: true,
+                                migrated: true
                             })];
                     case 6:
                         entity = (_e.sent()).entity;
@@ -3139,7 +3143,8 @@ var EntityUtils;
                         return [4 /*yield*/, Entity$1.Get({
                                 api: api,
                                 entityId: entityId,
-                                expandLocation: false
+                                expandLocation: false,
+                                migrated: true
                             })];
                     case 8:
                         entity = (_e.sent()).entity;
@@ -7746,19 +7751,22 @@ var RelationRenderEngine;
                         return [4 /*yield*/, Entity$1.Get({
                                 api: api,
                                 entityId: relation["Principal.Entity.ID"],
+                                migrated: true
                             })];
                     case 3:
                         fromEntity = (_b.sent()).entity;
                         return [4 /*yield*/, Entity$1.Get({
                                 api: api,
                                 entityId: relation["Related.Entity.ID"],
+                                migrated: true
                             })];
                     case 4:
                         toEntity = (_b.sent()).entity;
                         if (!relation["Data.Entity.ID"]) return [3 /*break*/, 6];
                         return [4 /*yield*/, Entity$1.Get({
                                 api: api,
-                                entityId: relation["Data.Entity.ID"]
+                                entityId: relation["Data.Entity.ID"],
+                                migrated: true
                             })];
                     case 5:
                         _a = (_b.sent()).entity;
@@ -10798,7 +10806,8 @@ var EntitiesRenderManager;
                                     entityIds: entityIds,
                                     historicKey: (_a = this.item.BruceEntity) === null || _a === void 0 ? void 0 : _a.historicAttrKey,
                                     historicPoint: this.viewer.clock.currentTime.toString(),
-                                    schemaId: (_b = this.item.BruceEntity) === null || _b === void 0 ? void 0 : _b.schemaId
+                                    schemaId: (_b = this.item.BruceEntity) === null || _b === void 0 ? void 0 : _b.schemaId,
+                                    migrated: true
                                 })];
                         case 2:
                             data = _c.sent();
@@ -10882,7 +10891,8 @@ var EntitiesRenderManager;
                                                     entityIds: entityIds,
                                                     historicKey: (_a = this.item.BruceEntity) === null || _a === void 0 ? void 0 : _a.historicAttrKey,
                                                     historicPoint: this.viewer.clock.currentTime.toString(),
-                                                    schemaId: (_b = this.item.BruceEntity) === null || _b === void 0 ? void 0 : _b.schemaId
+                                                    schemaId: (_b = this.item.BruceEntity) === null || _b === void 0 ? void 0 : _b.schemaId,
+                                                    migrated: true
                                                 })];
                                         case 1:
                                             entities = (_c.sent()).entities;
@@ -11765,7 +11775,8 @@ var EntitiesLoadedRenderManager;
                                             entityIds = ids.splice(0, CHECK_BATCH_SIZE$1);
                                             return [4 /*yield*/, Entity$1.GetListByIds({
                                                     api: api,
-                                                    entityIds: entityIds
+                                                    entityIds: entityIds,
+                                                    migrated: true
                                                 })];
                                         case 1:
                                             entities = (_a.sent()).entities;
@@ -12406,7 +12417,8 @@ var EntitiesIdsRenderManager;
                             api = this.apiGetter.getApi();
                             return [4 /*yield*/, Entity$1.GetListByIds({
                                     api: api,
-                                    entityIds: entityIds
+                                    entityIds: entityIds,
+                                    migrated: true
                                 })];
                         case 2:
                             entities = (_a.sent()).entities;
@@ -12959,7 +12971,8 @@ var EntityRenderManager;
                             api = this.apiGetter.getApi();
                             return [4 /*yield*/, Entity$1.Get({
                                     api: api,
-                                    entityId: id
+                                    entityId: id,
+                                    migrated: true
                                 })];
                         case 1:
                             entity = (_a.sent()).entity;
@@ -13705,7 +13718,8 @@ var TilesetRenderEngine;
                             if (!(batch.length > 0)) return [3 /*break*/, 5];
                             return [4 /*yield*/, Entity$1.GetListByIds({
                                     api: this.api,
-                                    entityIds: batch
+                                    entityIds: batch,
+                                    migrated: true
                                 })];
                         case 2:
                             entities = (_c.sent()).entities;
@@ -13786,7 +13800,7 @@ var TilesetRenderEngine;
         Styler.prototype.loadStyles = function () {
             var _a, _b;
             return __awaiter(this, void 0, void 0, function () {
-                var counter, fallbackStyleId, data, e_1, styleMapping, modelTree, entityTypeIds, _loop_2, this_2, i, i, styleMap, styleId, entityType, e_2, data, e_3;
+                var counter, fallbackStyleId, data, e_1, styleMapping, modelTree, entityTypeIds, _loop_2, this_2, i, typeMap, typeIds, splits, batchSize, i, batch, entityTypes, i_1, entityType, i, styleMap, styleId, entityType, e_2, data, e_3;
                 return __generator(this, function (_c) {
                     switch (_c.label) {
                         case 0:
@@ -13845,80 +13859,109 @@ var TilesetRenderEngine;
                             catch (e) {
                                 console.error(e);
                             }
+                            typeMap = new Map();
+                            typeIds = styleMapping.map(function (x) { return x.StyleID == -1 || Boolean(x.style) ? null : x.EntityTypeID; }).filter(function (x) { return !!x; });
+                            if (!typeIds.length) return [3 /*break*/, 8];
+                            splits = Math.ceil(typeIds.length / 50);
+                            batchSize = 50;
                             i = 0;
                             _c.label = 5;
                         case 5:
-                            if (!(i < styleMapping.length)) return [3 /*break*/, 16];
+                            if (!(i < splits)) return [3 /*break*/, 8];
+                            batch = typeIds.slice(i * batchSize, (i + 1) * batchSize);
+                            return [4 /*yield*/, EntityType.GetList({
+                                    api: this.api,
+                                    entityTypeIds: batch
+                                })];
+                        case 6:
+                            entityTypes = (_c.sent()).entityTypes;
+                            for (i_1 = 0; i_1 < entityTypes.length; i_1++) {
+                                entityType = entityTypes[i_1];
+                                typeMap.set(entityType.ID, entityType);
+                            }
+                            _c.label = 7;
+                        case 7:
+                            i++;
+                            return [3 /*break*/, 5];
+                        case 8:
+                            i = 0;
+                            _c.label = 9;
+                        case 9:
+                            if (!(i < styleMapping.length)) return [3 /*break*/, 21];
                             if (this.disposed) {
-                                return [3 /*break*/, 16];
+                                return [3 /*break*/, 21];
                             }
                             styleMap = styleMapping[i];
-                            if (!(!styleMap.style && styleMap.StyleID != -1)) return [3 /*break*/, 14];
+                            if (!(!styleMap.style && styleMap.StyleID != -1)) return [3 /*break*/, 19];
                             styleId = styleMap.StyleID;
-                            if (!!styleId) return [3 /*break*/, 9];
-                            _c.label = 6;
-                        case 6:
-                            _c.trys.push([6, 8, , 9]);
+                            if (!(!styleId && !this.fallbackStyle)) return [3 /*break*/, 14];
+                            _c.label = 10;
+                        case 10:
+                            _c.trys.push([10, 13, , 14]);
+                            entityType = typeMap.get(styleMap.EntityTypeID);
+                            if (!!entityType) return [3 /*break*/, 12];
                             return [4 /*yield*/, EntityType.Get({
                                     api: this.api,
                                     entityTypeId: styleMap.EntityTypeID
                                 })];
-                        case 7:
+                        case 11:
                             entityType = (_c.sent()).entityType;
+                            _c.label = 12;
+                        case 12:
                             styleId = entityType === null || entityType === void 0 ? void 0 : entityType["DisplaySetting.ID"];
-                            return [3 /*break*/, 9];
-                        case 8:
+                            return [3 /*break*/, 14];
+                        case 13:
                             e_2 = _c.sent();
                             console.error(e_2);
-                            return [3 /*break*/, 9];
-                        case 9:
-                            if (!styleId) return [3 /*break*/, 13];
-                            _c.label = 10;
-                        case 10:
-                            _c.trys.push([10, 12, , 13]);
+                            return [3 /*break*/, 14];
+                        case 14:
+                            if (!styleId) return [3 /*break*/, 18];
+                            _c.label = 15;
+                        case 15:
+                            _c.trys.push([15, 17, , 18]);
                             return [4 /*yield*/, Style.Get({
                                     api: this.api,
                                     styleId: styleId
                                 })];
-                        case 11:
+                        case 16:
                             data = (_c.sent()).style;
                             if (data) {
                                 styleMap.style = data;
                                 styleMap.StyleID = styleId;
                             }
-                            return [3 /*break*/, 13];
-                        case 12:
+                            return [3 /*break*/, 18];
+                        case 17:
                             e_3 = _c.sent();
                             console.error(e_3);
-                            return [3 /*break*/, 13];
-                        case 13:
+                            return [3 /*break*/, 18];
+                        case 18:
                             if (this.loadingCounter != counter) {
                                 return [2 /*return*/];
                             }
-                            _c.label = 14;
-                        case 14:
+                            _c.label = 19;
+                        case 19:
                             this.styleMappingsLoaded[styleMap.EntityTypeID] = true;
                             this.processTilesetFeatureCheckQueue();
                             this.processQueue();
-                            _c.label = 15;
-                        case 15:
+                            _c.label = 20;
+                        case 20:
                             i++;
-                            return [3 /*break*/, 5];
-                        case 16:
+                            return [3 /*break*/, 9];
+                        case 21:
                             if (this.loadingCounter != counter) {
                                 return [2 /*return*/];
                             }
                             this.styleMappingLoaded = true;
-                            if (!!this.disposed) return [3 /*break*/, 18];
+                            if (!!this.disposed) return [3 /*break*/, 23];
                             return [4 /*yield*/, this.processTilesetFeatureCheckQueue()];
-                        case 17:
+                        case 22:
                             _c.sent();
                             if (this.loadingCounter != counter) {
                                 return [2 /*return*/];
                             }
                             this.processQueue();
-                            _c.label = 18;
-                        case 18: return [2 /*return*/];
+                            _c.label = 23;
+                        case 23: return [2 /*return*/];
                     }
                 });
             });
@@ -15027,6 +15070,7 @@ var EntityFilterGetter;
                                         entityTypeConditions: this.attrFilter
                                     },
                                     viaCdn: this.viaCdn,
+                                    migrated: true,
                                     req: {
                                         noCache: true
                                     }
@@ -21408,7 +21452,8 @@ var WidgetInfoView = /** @class */ (function (_super) {
                         api = this._apiGetters.GetBruceApi();
                         return [4 /*yield*/, Entity$1.Get({
                                 entityId: firstId,
-                                api: api
+                                api: api,
+                                migrated: true
                             })];
                     case 2:
                         entity = (_d.sent()).entity;
@@ -24584,7 +24629,7 @@ var ViewRenderEngine;
     ViewRenderEngine.Render = Render;
 })(ViewRenderEngine || (ViewRenderEngine = {}));
 
-var VERSION = "4.0.3";
+var VERSION = "4.0.5";
 
 export { VERSION, CesiumViewMonitor, ViewerUtils, MenuItemManager, EntityRenderEngine, MenuItemCreator, VisualsRegister, RenderManager, EntitiesIdsRenderManager, EntitiesLoadedRenderManager, EntitiesRenderManager, EntityRenderManager, TilesetCadRenderManager, TilesetArbRenderManager, TilesetEntitiesRenderManager, TilesetOsmRenderManager, TilesetPointcloudRenderManager, TilesetGooglePhotosRenderManager, DataSourceStaticKmlManager, RelationsRenderManager, SharedGetters, CesiumParabola, EntityLabel, ViewRenderEngine, TileRenderEngine, TilesetRenderEngine, CESIUM_INSPECTOR_KEY, CESIUM_TIMELINE_KEY, ViewUtils, DrawingUtils, MeasureUtils, EntityUtils, CesiumEntityStyler, CesiumAnimatedProperty, CesiumAnimatedInOut, Draw3dPolygon, Draw3dPolyline };
 //# sourceMappingURL=bruce-cesium.es5.js.map