bruce-cesium 3.5.4 → 3.5.6

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, 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, DistanceDisplayCondition, NearFarScalar, Model, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, SceneMode, GeoJsonDataSource, ColorMaterialProperty, Cesium3DTileColorBlendMode, HeadingPitchRange, Ion, Cesium3DTileStyle, KmlDataSource, SceneTransforms, EllipsoidTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, CesiumTerrainProvider, Cesium3DTileset, Matrix4, Matrix3, IonResource, OrthographicFrustum, EasingFunction, CesiumInspector, defined, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, BoundingSphere, GeometryInstance, ScreenSpaceEventHandler, ScreenSpaceEventType, Intersect, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics } from 'cesium';
+import { Cartographic, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, JulianDate, DistanceDisplayCondition, NearFarScalar, Model, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, SceneMode, GeoJsonDataSource, ColorMaterialProperty, Cesium3DTileColorBlendMode, HeadingPitchRange, Ion, Cesium3DTileStyle, KmlDataSource, SceneTransforms, EllipsoidTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, CesiumTerrainProvider, OrthographicFrustum, EasingFunction, Cesium3DTileset, Matrix4, Matrix3, IonResource, CesiumInspector, defined, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, BoundingSphere, GeometryInstance, ScreenSpaceEventHandler, ScreenSpaceEventType, Intersect } from 'cesium';
 
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1816,13 +1816,13 @@ var EntityUtils;
                             });
                         }); };
                         getEntityPositions = function (sample) { return __awaiter(_this, void 0, void 0, function () {
-                            var entityId, entity, tileset, tilesetId, evaluateRendered, evaluateRecord, renderedPosses, e_1, recordPosses, e_2, tSettings, pos3d, alt, alt, heading, pitch, roll, matrix4, offset, m1, hpr, transform, transformedOffset, sphere;
+                            var entityId, entity, tileset, tilesetId, disallowRendered, evaluateRendered, evaluateRecord, renderedPosses, e_1, recordPosses, e_2, tSettings, pos3d, alt, alt, heading, pitch, roll, matrix4, offset, m1, hpr, transform, transformedOffset, sphere;
                             var _this = this;
                             var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
                             return __generator(this, function (_l) {
                                 switch (_l.label) {
                                     case 0:
-                                        entityId = sample.entityId, entity = sample.entity, tileset = sample.tileset, tilesetId = sample.tilesetId;
+                                        entityId = sample.entityId, entity = sample.entity, tileset = sample.tileset, tilesetId = sample.tilesetId, disallowRendered = sample.disallowRendered;
                                         evaluateRendered = function () { return __awaiter(_this, void 0, void 0, function () {
                                             var rego, posses, parts, i, part, visualHeightRef, hierarchy, hPosses, hPossesSample, step, i_1, pPosses, pPossesSample, step, i_2, pPosses, pPossesSample, step, i_3, pos3d_1, toAdjust, modelExt, sphere, semiMajorAxis, semiMinorAxis, height, radius, sphere, data_1, pos3d_2, toAdjust, sphere;
                                             return __generator(this, function (_a) {
@@ -2044,45 +2044,48 @@ var EntityUtils;
                                                 }
                                             });
                                         }); };
+                                        if (!(disallowRendered != true)) return [3 /*break*/, 2];
                                         return [4 /*yield*/, evaluateRendered()];
                                     case 1:
                                         renderedPosses = _l.sent();
                                         if (renderedPosses === null || renderedPosses === void 0 ? void 0 : renderedPosses.length) {
                                             return [2 /*return*/, renderedPosses];
                                         }
-                                        if (!!entity) return [3 /*break*/, 5];
-                                        if (!(apiCalls < MAX_API_CALLS)) return [3 /*break*/, 5];
-                                        apiCalls += 1;
                                         _l.label = 2;
                                     case 2:
-                                        _l.trys.push([2, 4, , 5]);
+                                        if (!!entity) return [3 /*break*/, 6];
+                                        if (!(apiCalls < MAX_API_CALLS)) return [3 /*break*/, 6];
+                                        apiCalls += 1;
+                                        _l.label = 3;
+                                    case 3:
+                                        _l.trys.push([3, 5, , 6]);
                                         return [4 /*yield*/, Entity$1.Get({
                                                 api: api,
                                                 entityId: entityId,
                                                 // Not expanding relative positions at first to see if the entity has valid location just by itself.
                                                 expandLocation: false
                                             })];
-                                    case 3:
-                                        entity = (_l.sent()).entity;
-                                        return [3 /*break*/, 5];
                                     case 4:
+                                        entity = (_l.sent()).entity;
+                                        return [3 /*break*/, 6];
+                                    case 5:
                                         e_1 = _l.sent();
                                         console.error(e_1);
-                                        return [3 /*break*/, 5];
-                                    case 5:
+                                        return [3 /*break*/, 6];
+                                    case 6:
                                         if (!entity) {
                                             return [2 /*return*/, []];
                                         }
                                         return [4 /*yield*/, evaluateRecord()];
-                                    case 6:
+                                    case 7:
                                         recordPosses = _l.sent();
                                         if (recordPosses === null || recordPosses === void 0 ? void 0 : recordPosses.length) {
                                             return [2 /*return*/, recordPosses];
                                         }
-                                        if (!(apiCalls < MAX_API_CALLS)) return [3 /*break*/, 10];
-                                        _l.label = 7;
-                                    case 7:
-                                        _l.trys.push([7, 9, , 10]);
+                                        if (!(apiCalls < MAX_API_CALLS)) return [3 /*break*/, 11];
+                                        _l.label = 8;
+                                    case 8:
+                                        _l.trys.push([8, 10, , 11]);
                                         apiCalls += 1;
                                         return [4 /*yield*/, Entity$1.Get({
                                                 api: api,
@@ -2090,31 +2093,31 @@ var EntityUtils;
                                                 // We'll be expanding relative positioning and related tilesets now.
                                                 expandLocation: true
                                             })];
-                                    case 8:
-                                        entity = (_l.sent()).entity;
-                                        return [3 /*break*/, 10];
                                     case 9:
+                                        entity = (_l.sent()).entity;
+                                        return [3 /*break*/, 11];
+                                    case 10:
                                         e_2 = _l.sent();
                                         console.warn(e_2);
-                                        return [3 /*break*/, 10];
-                                    case 10:
+                                        return [3 /*break*/, 11];
+                                    case 11:
                                         if (!tilesetId) {
                                             tilesetId = ((_a = entity.tilesetID) === null || _a === void 0 ? void 0 : _a.length) ? entity.tilesetID[0] : tilesetId;
                                         }
-                                        if (!!tileset) return [3 /*break*/, 12];
-                                        if (!(tilesetId && apiCalls < MAX_API_CALLS)) return [3 /*break*/, 12];
+                                        if (!!tileset) return [3 /*break*/, 13];
+                                        if (!(tilesetId && apiCalls < MAX_API_CALLS)) return [3 /*break*/, 13];
                                         apiCalls += 1;
                                         return [4 /*yield*/, Tileset.Get({
                                                 api: api,
                                                 tilesetId: tilesetId
                                             })];
-                                    case 11:
-                                        tileset = (_l.sent()).tileset;
-                                        _l.label = 12;
                                     case 12:
+                                        tileset = (_l.sent()).tileset;
+                                        _l.label = 13;
+                                    case 13:
                                         tSettings = tileset === null || tileset === void 0 ? void 0 : tileset.settings;
                                         pos3d = null;
-                                        if (!(((_b = entity === null || entity === void 0 ? void 0 : entity.location) === null || _b === void 0 ? void 0 : _b.longitude) || ((_c = tSettings === null || tSettings === void 0 ? void 0 : tSettings.location) === null || _c === void 0 ? void 0 : _c.longitude))) return [3 /*break*/, 15];
+                                        if (!(((_b = entity === null || entity === void 0 ? void 0 : entity.location) === null || _b === void 0 ? void 0 : _b.longitude) || ((_c = tSettings === null || tSettings === void 0 ? void 0 : tSettings.location) === null || _c === void 0 ? void 0 : _c.longitude))) return [3 /*break*/, 16];
                                         if ((_d = entity === null || entity === void 0 ? void 0 : entity.location) === null || _d === void 0 ? void 0 : _d.longitude) {
                                             alt = +entity.location.altitude;
                                             if (isNaN(alt)) {
@@ -2129,7 +2132,7 @@ var EntityUtils;
                                             }
                                             pos3d = Cartesian3.fromDegrees(+tSettings.location.longitude, +tSettings.location.latitude, alt);
                                         }
-                                        if (!(entity === null || entity === void 0 ? void 0 : entity.worldPosition)) return [3 /*break*/, 15];
+                                        if (!(entity === null || entity === void 0 ? void 0 : entity.worldPosition)) return [3 /*break*/, 16];
                                         heading = 0;
                                         pitch = 0;
                                         roll = 0;
@@ -2174,12 +2177,12 @@ var EntityUtils;
                                         transform = Matrix3.fromHeadingPitchRoll(hpr);
                                         transformedOffset = Matrix3.multiplyByVector(transform, offset, new Cartesian3());
                                         pos3d = Matrix4.multiplyByPoint(m1, transformedOffset, new Cartesian3());
-                                        if (!(pos3d === null || pos3d === void 0 ? void 0 : pos3d.x)) return [3 /*break*/, 14];
+                                        if (!(pos3d === null || pos3d === void 0 ? void 0 : pos3d.x)) return [3 /*break*/, 15];
                                         return [4 /*yield*/, processPosHeight(pos3d, HeightReference.NONE)];
-                                    case 13:
-                                        pos3d = _l.sent();
-                                        _l.label = 14;
                                     case 14:
+                                        pos3d = _l.sent();
+                                        _l.label = 15;
+                                    case 15:
                                         if ((entity === null || entity === void 0 ? void 0 : entity.geometryRadius) && (pos3d === null || pos3d === void 0 ? void 0 : pos3d.x)) {
                                             sphere = BoundingSphere.fromPoints([pos3d]);
                                             // For now making sure it's less than x amount because we had a bug which made it huge.
@@ -2188,8 +2191,8 @@ var EntityUtils;
                                                 spheres.push(sphere);
                                             }
                                         }
-                                        _l.label = 15;
-                                    case 15:
+                                        _l.label = 16;
+                                    case 16:
                                         if (pos3d) {
                                             return [2 /*return*/, [pos3d]];
                                         }
@@ -6156,7 +6159,7 @@ var RelationRenderEngine;
                     toPos = null;
                     updatingPosses = false;
                     updatePosses = function () { return __awaiter(_this, void 0, void 0, function () {
-                        var e_4;
+                        var fromData, toData, e_4;
                         return __generator(this, function (_a) {
                             switch (_a.label) {
                                 case 0:
@@ -6167,30 +6170,34 @@ var RelationRenderEngine;
                                     _a.label = 1;
                                 case 1:
                                     _a.trys.push([1, 4, , 5]);
-                                    return [4 /*yield*/, EntityUtils.GetPosAsync({
-                                            // Not passing it so it requests entity with expanded tileset information instead.
-                                            //entity: params.fromEntity,
+                                    return [4 /*yield*/, EntityUtils.GetLocation({
+                                            samples: [{
+                                                    entity: params.fromEntity,
+                                                    entityId: params.fromEntity.Bruce.ID,
+                                                    heightRef: HeightReference.CLAMP_TO_GROUND,
+                                                    returnHeightRef: HeightReference.NONE
+                                                }],
                                             viewer: params.viewer,
                                             visualRegister: params.visualRegister,
-                                            returnHeightRef: HeightReference.NONE,
-                                            recordHeightRef: HeightReference.CLAMP_TO_GROUND,
-                                            api: params.apiGetter.getApi(),
-                                            entityId: params.fromEntity.Bruce.ID
+                                            api: params.apiGetter.getApi()
                                         })];
                                 case 2:
-                                    fromPos = _a.sent();
-                                    return [4 /*yield*/, EntityUtils.GetPosAsync({
-                                            // Not passing it so it requests entity with expanded tileset information instead.
-                                            //entity: params.toEntity,
+                                    fromData = _a.sent();
+                                    fromPos = fromData.pos3d;
+                                    return [4 /*yield*/, EntityUtils.GetLocation({
+                                            samples: [{
+                                                    entity: params.toEntity,
+                                                    entityId: params.toEntity.Bruce.ID,
+                                                    heightRef: HeightReference.CLAMP_TO_GROUND,
+                                                    returnHeightRef: HeightReference.NONE
+                                                }],
                                             viewer: params.viewer,
                                             visualRegister: params.visualRegister,
-                                            returnHeightRef: HeightReference.NONE,
-                                            recordHeightRef: HeightReference.CLAMP_TO_GROUND,
-                                            api: params.apiGetter.getApi(),
-                                            entityId: params.toEntity.Bruce.ID
+                                            api: params.apiGetter.getApi()
                                         })];
                                 case 3:
-                                    toPos = _a.sent();
+                                    toData = _a.sent();
+                                    toPos = toData.pos3d;
                                     return [3 /*break*/, 5];
                                 case 4:
                                     e_4 = _a.sent();
@@ -21639,7 +21646,7 @@ var ViewRenderEngine;
     ViewRenderEngine.Render = Render;
 })(ViewRenderEngine || (ViewRenderEngine = {}));
 
-var VERSION = "3.5.4";
+var VERSION = "3.5.6";
 
-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, ViewUtils, DrawingUtils, MeasureUtils, EntityUtils, Draw3dPolygon, Draw3dPolyline };
+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, ViewUtils, DrawingUtils, MeasureUtils, EntityUtils, CesiumEntityStyler, Draw3dPolygon, Draw3dPolyline };
 //# sourceMappingURL=bruce-cesium.es5.js.map