bruce-cesium 1.6.0 → 1.6.2

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, MenuItem, EntityRelation, ProjectView, ProjectViewBookmark, ProjectViewTile, ProjectViewLegacyTile, ProgramKey, Camera } from 'bruce-models';
-import { Cartesian2, Cartographic, Math as Math$1, SceneMode, Cartesian3, Entity, Primitive, Cesium3DTileFeature, Color, HeightReference, EllipsoidTerrainProvider, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Cesium3DTileColorBlendMode, HeadingPitchRange, createOsmBuildings, Cesium3DTileStyle, Rectangle, KmlDataSource, OrthographicFrustum, JulianDate, CallbackProperty, createWorldTerrain, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, Cesium3DTileset, Matrix4, IonResource, ColorMaterialProperty, Matrix3, EasingFunction, GeometryInstance } from 'cesium';
+import { BruceEvent, Cartes, Carto, Entity as Entity$1, Geometry, Tileset, 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 { Cartesian2, Cartographic, Math as Math$1, Color, HeightReference, Cartesian3, EllipsoidTerrainProvider, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, Cesium3DTileColorBlendMode, HeadingPitchRange, createOsmBuildings, Cesium3DTileStyle, Rectangle, SceneMode, OrthographicFrustum, JulianDate, CallbackProperty, KmlDataSource, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, ColorMaterialProperty, Matrix3, Matrix4, EasingFunction, GeometryInstance, Cesium3DTileset, IonResource, createWorldTerrain, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider } from 'cesium';
 
 var TIME_LAG = 300;
 var POSITION_CHECK_TIMER = 950;
@@ -836,6 +836,119 @@ var EntityUtils;
         });
     }
     EntityUtils.GetPos = GetPos;
+    /**
+     * Returns the position of the entity.
+     * This is an async variant that checks for related tilesets.
+     * @param params
+     * @returns
+     */
+    function GetPosAsync(params) {
+        var _a, _b, _c, _d, _e, _f;
+        return __awaiter(this, void 0, void 0, function () {
+            var viewer, entityId, entity, tileset, tilesetId, visualRegister, returnHeightRef, recordHeightRef, api, pos3d, e_1, tSettings, ALT_INCREASE, alt, alt, heading, matrix4, offset, m1, hpr, transform, transformedOffset;
+            return __generator(this, function (_g) {
+                switch (_g.label) {
+                    case 0:
+                        viewer = params.viewer, entityId = params.entityId, entity = params.entity, tileset = params.tileset, tilesetId = params.tilesetId, visualRegister = params.visualRegister, returnHeightRef = params.returnHeightRef, recordHeightRef = params.recordHeightRef, api = params.api;
+                        pos3d = GetPos({
+                            viewer: viewer,
+                            entity: entity,
+                            visualRegister: visualRegister,
+                            returnHeightRef: returnHeightRef,
+                            recordHeightRef: recordHeightRef
+                        });
+                        if (Cartes.ValidateCartes3(pos3d)) {
+                            return [2 /*return*/, pos3d];
+                        }
+                        if (!!entity) return [3 /*break*/, 5];
+                        _g.label = 1;
+                    case 1:
+                        _g.trys.push([1, 3, , 5]);
+                        return [4 /*yield*/, Entity$1.Get({
+                                api: api,
+                                entityId: entityId,
+                                expandLocation: true
+                            })];
+                    case 2:
+                        entity = (_g.sent()).entity;
+                        return [3 /*break*/, 5];
+                    case 3:
+                        e_1 = _g.sent();
+                        console.warn(e_1);
+                        return [4 /*yield*/, Entity$1.Get({
+                                api: api,
+                                entityId: entityId,
+                                expandLocation: false
+                            })];
+                    case 4:
+                        entity = (_g.sent()).entity;
+                        return [3 /*break*/, 5];
+                    case 5:
+                        if (!!tileset) return [3 /*break*/, 7];
+                        if (!tilesetId) {
+                            tilesetId = ((_a = entity.tilesetID) === null || _a === void 0 ? void 0 : _a.length) ? entity.tilesetID[0] : tilesetId;
+                        }
+                        if (!tilesetId) return [3 /*break*/, 7];
+                        return [4 /*yield*/, Tileset.Get({
+                                api: api,
+                                tilesetId: tilesetId
+                            })];
+                    case 6:
+                        tileset = (_g.sent()).tileset;
+                        _g.label = 7;
+                    case 7:
+                        tSettings = tileset === null || tileset === void 0 ? void 0 : tileset.settings;
+                        if (((_b = 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)) {
+                            ALT_INCREASE = 30;
+                            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)) {
+                                    alt = 0;
+                                }
+                                alt += ALT_INCREASE;
+                                pos3d = Cartesian3.fromDegrees(+entity.location.longitude, +entity.location.latitude, alt);
+                            }
+                            else {
+                                alt = +tSettings.location.altitude;
+                                if (isNaN(alt)) {
+                                    alt = 0;
+                                }
+                                alt += ALT_INCREASE;
+                                pos3d = Cartesian3.fromDegrees(+tSettings.location.longitude, +tSettings.location.latitude, alt);
+                            }
+                            // World position = we got lat/lon/alt from the tileset, now we need to apply relative movement.
+                            if (entity === null || entity === void 0 ? void 0 : entity.worldPosition) {
+                                heading = 0;
+                                if ((_e = entity === null || entity === void 0 ? void 0 : entity.transform) === null || _e === void 0 ? void 0 : _e.heading) {
+                                    heading = entity.transform.heading;
+                                }
+                                else if ((_f = tSettings === null || tSettings === void 0 ? void 0 : tSettings.transform) === null || _f === void 0 ? void 0 : _f.heading) {
+                                    heading = tSettings.transform.heading;
+                                }
+                                heading = +heading;
+                                if (isNaN(heading)) {
+                                    heading = 0;
+                                }
+                                matrix4 = entity.worldPosition;
+                                offset = new Cartesian3(matrix4[0][3], matrix4[1][3], matrix4[2][3]);
+                                m1 = Transforms.eastNorthUpToFixedFrame(pos3d);
+                                hpr = HeadingPitchRoll.fromDegrees(heading, 0, 0, new HeadingPitchRoll());
+                                transform = Matrix3.fromHeadingPitchRoll(hpr);
+                                transformedOffset = Matrix3.multiplyByVector(transform, offset, new Cartesian3());
+                                pos3d = Matrix4.multiplyByPoint(m1, transformedOffset, new Cartesian3());
+                            }
+                        }
+                        return [2 /*return*/, DrawingUtils.EnsurePosHeight({
+                                desiredHeightRef: params.returnHeightRef,
+                                heightRef: params.recordHeightRef,
+                                pos3d: pos3d,
+                                viewer: viewer
+                            })];
+                }
+            });
+        });
+    }
+    EntityUtils.GetPosAsync = GetPosAsync;
     /**
      * Returns entity and any associated parent/sibling entities as a flat array.
      * @param entity
@@ -2265,7 +2378,8 @@ var EntitiesRenderManager;
                         typeId: this.item.BruceEntity["EntityType.ID"],
                         monitor: this.monitor,
                         viewer: this.viewer,
-                        debugShowBounds: false
+                        debugShowBounds: false,
+                        cdn: this.item.cdnEnabled
                     });
                     minMax = RenderManager.GetZoomMinMax({
                         zoomControl: this.item.CameraZoomSettings
@@ -3028,7 +3142,7 @@ var RelationRenderEngine;
                         i = 0;
                         _d.label = 1;
                     case 1:
-                        if (!(i < relations.length)) return [3 /*break*/, 16];
+                        if (!(i < relations.length)) return [3 /*break*/, 17];
                         relation = relations[i];
                         return [4 /*yield*/, Entity$1.Get({
                                 api: api,
@@ -3093,22 +3207,25 @@ var RelationRenderEngine;
                         _d.label = 14;
                     case 14:
                         style = _c;
-                        cEntity = Parabola.Render({
-                            dataEntity: dataEntity,
-                            fromEntity: fromEntity,
-                            relation: relation,
-                            style: style,
-                            toEntity: toEntity,
-                            viewer: viewer,
-                            visualRegister: visualRegister
-                        });
+                        return [4 /*yield*/, Parabola.Render({
+                                dataEntity: dataEntity,
+                                fromEntity: fromEntity,
+                                relation: relation,
+                                style: style,
+                                toEntity: toEntity,
+                                viewer: viewer,
+                                visualRegister: visualRegister,
+                                apiGetter: apiGetter
+                            })];
+                    case 15:
+                        cEntity = _d.sent();
                         cEntity._renderGroup = GetRenderGroupId(relation);
                         rendered[GetRenderGroupId(relation)] = cEntity;
-                        _d.label = 15;
-                    case 15:
+                        _d.label = 16;
+                    case 16:
                         i++;
                         return [3 /*break*/, 1];
-                    case 16: return [2 /*return*/, rendered];
+                    case 17: return [2 /*return*/, rendered];
                 }
             });
         });
@@ -3118,74 +3235,101 @@ var RelationRenderEngine;
     (function (Parabola) {
         function Render(params) {
             var _a;
-            var style = (_a = params.style) === null || _a === void 0 ? void 0 : _a.Settings;
-            var entity = params.dataEntity;
-            var bColor = (style === null || style === void 0 ? void 0 : style.lineColor) ? Calculator.GetColor(style === null || style === void 0 ? void 0 : style.lineColor, entity, []) : null;
-            var cColor = bColor ? colorToCColor$1(bColor) : Color.WHITE;
-            var width = EnsureNumber((style === null || style === void 0 ? void 0 : style.lineWidth) ? Calculator.GetNumber(style === null || style === void 0 ? void 0 : style.lineWidth, entity, []) : 4, 4);
-            if (width < 1) {
-                width = 1;
-            }
-            var duration = EnsureNumber((style === null || style === void 0 ? void 0 : style.duration) ? Calculator.GetNumber(style === null || style === void 0 ? void 0 : style.duration, entity, []) : 2, 2);
-            var hDistanceRatio = EnsureNumber((style === null || style === void 0 ? void 0 : style.heightDistanceRatio) ? Calculator.GetNumber(style === null || style === void 0 ? void 0 : style.heightDistanceRatio, entity, []) : 0.25, 0.25);
-            var fromPos = null;
-            var toPos = null;
-            var updatingPosses = false;
-            var updatePosses = function () {
-                if (updatingPosses) {
-                    return;
-                }
-                updatingPosses = true;
-                try {
-                    fromPos = EntityUtils.GetPos({
-                        entity: params.fromEntity,
-                        viewer: params.viewer,
-                        visualRegister: params.visualRegister,
-                        returnHeightRef: HeightReference.NONE,
-                        recordHeightRef: HeightReference.CLAMP_TO_GROUND
-                    });
-                    toPos = EntityUtils.GetPos({
-                        entity: params.toEntity,
+            return __awaiter(this, void 0, void 0, function () {
+                var style, entity, bColor, cColor, width, duration, hDistanceRatio, fromPos, toPos, updatingPosses, updatePosses, parabola, cEntities, cEntity, i, sibling, updateInterval;
+                var _this = this;
+                return __generator(this, function (_b) {
+                    style = (_a = params.style) === null || _a === void 0 ? void 0 : _a.Settings;
+                    entity = params.dataEntity;
+                    bColor = (style === null || style === void 0 ? void 0 : style.lineColor) ? Calculator.GetColor(style === null || style === void 0 ? void 0 : style.lineColor, entity, []) : null;
+                    cColor = bColor ? colorToCColor$1(bColor) : Color.WHITE;
+                    width = EnsureNumber((style === null || style === void 0 ? void 0 : style.lineWidth) ? Calculator.GetNumber(style === null || style === void 0 ? void 0 : style.lineWidth, entity, []) : 4, 4);
+                    if (width < 1) {
+                        width = 1;
+                    }
+                    duration = EnsureNumber((style === null || style === void 0 ? void 0 : style.duration) ? Calculator.GetNumber(style === null || style === void 0 ? void 0 : style.duration, entity, []) : 2, 2);
+                    hDistanceRatio = EnsureNumber((style === null || style === void 0 ? void 0 : style.heightDistanceRatio) ? Calculator.GetNumber(style === null || style === void 0 ? void 0 : style.heightDistanceRatio, entity, []) : 0.25, 0.25);
+                    fromPos = null;
+                    toPos = null;
+                    updatingPosses = false;
+                    updatePosses = function () { return __awaiter(_this, void 0, void 0, function () {
+                        var e_1;
+                        return __generator(this, function (_a) {
+                            switch (_a.label) {
+                                case 0:
+                                    if (updatingPosses) {
+                                        return [2 /*return*/];
+                                    }
+                                    updatingPosses = true;
+                                    _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,
+                                            viewer: params.viewer,
+                                            visualRegister: params.visualRegister,
+                                            returnHeightRef: HeightReference.NONE,
+                                            recordHeightRef: HeightReference.CLAMP_TO_GROUND,
+                                            api: params.apiGetter.getApi(),
+                                            entityId: params.fromEntity.Bruce.ID
+                                        })];
+                                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,
+                                            viewer: params.viewer,
+                                            visualRegister: params.visualRegister,
+                                            returnHeightRef: HeightReference.NONE,
+                                            recordHeightRef: HeightReference.CLAMP_TO_GROUND,
+                                            api: params.apiGetter.getApi(),
+                                            entityId: params.toEntity.Bruce.ID
+                                        })];
+                                case 3:
+                                    toPos = _a.sent();
+                                    return [3 /*break*/, 5];
+                                case 4:
+                                    e_1 = _a.sent();
+                                    console.error(e_1);
+                                    return [3 /*break*/, 5];
+                                case 5:
+                                    updatingPosses = false;
+                                    return [2 /*return*/];
+                            }
+                        });
+                    }); };
+                    updatePosses();
+                    parabola = new CesiumParabola({
                         viewer: params.viewer,
-                        visualRegister: params.visualRegister,
-                        returnHeightRef: HeightReference.NONE,
-                        recordHeightRef: HeightReference.CLAMP_TO_GROUND
+                        pos1: function () { return fromPos; },
+                        pos2: function () { return toPos; },
+                        color: cColor.toCssColorString(),
+                        width: width,
+                        duration: duration,
+                        heightDistanceRatio: hDistanceRatio
                     });
-                }
-                catch (e) {
-                    console.error(e);
-                }
-                updatingPosses = false;
-            };
-            updatePosses();
-            var parabola = new CesiumParabola({
-                viewer: params.viewer,
-                pos1: function () { return fromPos; },
-                pos2: function () { return toPos; },
-                color: cColor.toCssColorString(),
-                width: width,
-                duration: duration,
-                heightDistanceRatio: hDistanceRatio
+                    cEntities = parabola.Animate();
+                    cEntity = cEntities.parabola;
+                    cEntity._siblingGraphics = [];
+                    for (i = 0; i < cEntities.siblings.length; i++) {
+                        sibling = cEntities.siblings[i];
+                        cEntity._siblingGraphics.push(sibling);
+                    }
+                    updateInterval = setInterval(function () {
+                        var _a;
+                        if (!((_a = params.viewer) === null || _a === void 0 ? void 0 : _a.scene) ||
+                            params.viewer.isDestroyed() ||
+                            !params.viewer.entities.contains(cEntity)) {
+                            clearInterval(updateInterval);
+                            parabola.Dispose();
+                            return;
+                        }
+                        updatePosses();
+                    }, 1000);
+                    return [2 /*return*/, cEntity];
+                });
             });
-            var cEntities = parabola.Animate();
-            var cEntity = cEntities.parabola;
-            cEntity._siblingGraphics = [];
-            for (var i = 0; i < cEntities.siblings.length; i++) {
-                var sibling = cEntities.siblings[i];
-                cEntity._siblingGraphics.push(sibling);
-            }
-            var updateInterval = setInterval(function () {
-                var _a;
-                if (!((_a = params.viewer) === null || _a === void 0 ? void 0 : _a.scene) ||
-                    params.viewer.isDestroyed() ||
-                    !params.viewer.entities.contains(cEntity)) {
-                    clearInterval(updateInterval);
-                    parabola.Dispose();
-                    return;
-                }
-                updatePosses();
-            }, 1000);
-            return cEntity;
         }
         Parabola.Render = Render;
     })(Parabola = RelationRenderEngine.Parabola || (RelationRenderEngine.Parabola = {}));