bruce-cesium 1.1.6 → 1.1.8

package/dist/bruce-cesium.es5.js

@@ -1,5 +1,5 @@
 import { BruceEvent, Cartes, Carto, Geometry, ZoomControl, Style, EntityTag, Calculator, EntityLod, EntityType, ClientFile, DelayQueue, Entity as Entity$1, BatchedDataGetter, EntityRelationType, ObjectUtils, Tileset, EntityCoords, EntityFilterGetter, EntitySource, EntityRelation, MenuItem, ProjectView, ProjectViewBookmark, ProjectViewTile, ProjectViewLegacyTile, ProgramKey, Camera } from 'bruce-models';
-import { Cartesian2, Cartographic, Math as Math$1, Cartesian3, Color, HeightReference, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, Cesium3DTileColorBlendMode, HeadingPitchRange, OrthographicFrustum, JulianDate, Matrix4, Cesium3DTileStyle, Cesium3DTileset, IonResource, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, PolygonPipeline, EllipsoidGeodesic, sampleTerrainMostDetailed, ColorMaterialProperty, Rectangle, Matrix3, EasingFunction, GeometryInstance, CallbackProperty, createOsmBuildings, KmlDataSource } from 'cesium';
+import { Cartesian2, Cartographic, Math as Math$1, Color, HeightReference, Cartesian3, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, OrthographicFrustum, JulianDate, Cesium3DTileColorBlendMode, HeadingPitchRange, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, Matrix4, Cesium3DTileStyle, Cesium3DTileset, IonResource, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, ColorMaterialProperty, Rectangle, Matrix3, EasingFunction, GeometryInstance, CallbackProperty, createOsmBuildings, KmlDataSource } from 'cesium';
 
 var TIME_LAG = 300;
 var POSITION_CHECK_TIMER = 950;
@@ -3934,11 +3934,54 @@ var TilesetRenderEngine;
         if (transform.scale <= 0) {
             transform.scale = 0.000001;
         }
+        /**
+         * Very cursed.
+         */
         if (position.isLegacy) {
             var legacy_1 = position.legacyProps;
             if (legacy_1.usingBoundingBox == null) {
                 legacy_1.usingBoundingBox = true;
             }
+            var offsetPoint_1 = function (pos, distance, bearing) {
+                // radius of earth
+                var radius = 6371e3;
+                var δ = distance / radius;
+                var θ = Math$1.toRadians(bearing);
+                var φ1 = Math$1.toRadians(pos.latitude);
+                var λ1 = Math$1.toRadians(pos.longitude);
+                var sinφ2 = Math.sin(φ1) * Math.cos(δ) + Math.cos(φ1) * Math.sin(δ) * Math.cos(θ);
+                var φ2 = Math.asin(sinφ2);
+                var y = Math.sin(θ) * Math.sin(δ) * Math.cos(φ1);
+                var x = Math.cos(δ) - Math.sin(φ1) * sinφ2;
+                var λ2 = λ1 + Math.atan2(y, x);
+                var finalPos = new Cartographic(λ2, φ2, pos.height);
+                finalPos.latitude = Math$1.toDegrees(finalPos.latitude);
+                finalPos.longitude = Math$1.toDegrees(finalPos.longitude);
+                return finalPos;
+            };
+            var getOffset = function (pos, n, e, alt) {
+                if (n == 0 && e == 0 && alt == 0) {
+                    return new Cartesian3(0, 0, 0);
+                }
+                var carto = Cartographic.fromCartesian(pos);
+                carto.latitude = Math$1.toDegrees(carto.latitude);
+                carto.longitude = Math$1.toDegrees(carto.longitude);
+                // North
+                if (n != 0) {
+                    carto = offsetPoint_1(carto, Number(n), 0);
+                }
+                // East
+                if (e != 0) {
+                    carto = offsetPoint_1(carto, Number(e), 90);
+                }
+                // Altitude
+                carto.height += Number(alt);
+                var finalOffset = Cartesian3.fromDegrees(carto.longitude, carto.latitude, carto.height);
+                finalOffset.x -= pos.x;
+                finalOffset.y -= pos.y;
+                finalOffset.z -= pos.z;
+                return finalOffset;
+            };
             var getCurPos3d = function () {
                 if (legacy_1.usingBoundingBox == false) {
                     return Matrix4.getTranslation(root.transform, new Cartesian3());
@@ -3954,6 +3997,12 @@ var TilesetRenderEngine;
             if (!pos3d) {
                 pos3d = getCurPos3d();
             }
+            var offset = getOffset(pos3d, transform.x, transform.y, transform.z);
+            if (Cartes.ValidateCartes3(offset)) {
+                pos3d.x += offset.x;
+                pos3d.y += offset.y;
+                pos3d.z += offset.z;
+            }
             if (legacy_1.rotate) {
                 var hpr = HeadingPitchRoll.fromDegrees(EnsureNumber(transform.heading), EnsureNumber(transform.pitch), EnsureNumber(transform.roll), new HeadingPitchRoll());
                 root.transform = Transforms.headingPitchRollToFixedFrame(pos3d, hpr);
@@ -4098,6 +4147,7 @@ var TilesetRenderEngine;
                 switch (_a.label) {
                     case 0:
                         apiGetter = params.apiGetter, viewer = params.viewer, tileset = params.tileset, ionId = params.ionId;
+                        console.log("RENDER LEGACY", JSON.parse(JSON.stringify(params.tileset)));
                         settings = tileset === null || tileset === void 0 ? void 0 : tileset.Settings;
                         settings = __assign({}, settings);
                         visual = settings.visual;
@@ -4139,6 +4189,8 @@ var TilesetRenderEngine;
                                     origin_1 = __assign({}, origin_1);
                                     var etc_1 = settings_1.etc;
                                     etc_1 = __assign({}, etc_1);
+                                    var positionOffset = settings_1.positionOffset;
+                                    positionOffset = __assign({}, positionOffset);
                                     var rotation = settings_1.rotation;
                                     ApplySettings({
                                         cTileset: cTileset,
@@ -4156,7 +4208,10 @@ var TilesetRenderEngine;
                                                 heading: rotation.z,
                                                 pitch: rotation.x,
                                                 roll: rotation.y,
-                                                scale: 1
+                                                scale: 1,
+                                                z: EnsureNumber(positionOffset === null || positionOffset === void 0 ? void 0 : positionOffset.altitude),
+                                                x: EnsureNumber(positionOffset === null || positionOffset === void 0 ? void 0 : positionOffset.latitude),
+                                                y: EnsureNumber(positionOffset === null || positionOffset === void 0 ? void 0 : positionOffset.longitude)
                                             } : null,
                                             location: (origin_1 === null || origin_1 === void 0 ? void 0 : origin_1.latitude) ? {
                                                 latitude: origin_1.latitude,
@@ -5428,7 +5483,7 @@ var DataSourceStaticKmlManager;
     var Manager = /** @class */ (function () {
         function Manager(params) {
             this.disposed = false;
-            this.dataSource = null;
+            this.dataSources = [];
             var viewer = params.viewer, apiGetter = params.apiGetter, item = params.item;
             this.viewer = viewer;
             this.apiGetter = apiGetter;
@@ -5442,22 +5497,33 @@ var DataSourceStaticKmlManager;
             configurable: true
         });
         Manager.prototype.Init = function () {
-            var _a, _b;
+            var _a;
             return __awaiter(this, void 0, void 0, function () {
-                var fileId, api, fileUrl;
-                return __generator(this, function (_c) {
-                    fileId = (_b = (_a = this.item.KML) === null || _a === void 0 ? void 0 : _a.ClientFile) === null || _b === void 0 ? void 0 : _b.ID;
-                    if (!fileId) {
+                var files, i, file, fileId, api, fileUrl, source;
+                return __generator(this, function (_b) {
+                    files = this.item.KML;
+                    if (!files) {
                         return [2 /*return*/];
                     }
-                    api = this.apiGetter.getApi();
-                    fileUrl = ClientFile.GetUrl({
-                        api: api,
-                        fileId: fileId
-                    });
-                    this.dataSource = new KmlDataSource();
-                    this.dataSource.load(fileUrl);
-                    this.viewer.dataSources.add(this.dataSource);
+                    if (!Array.isArray(files)) {
+                        files = [files];
+                    }
+                    for (i = 0; i < files.length; i++) {
+                        file = files[i];
+                        fileId = (_a = file === null || file === void 0 ? void 0 : file.ClientFile) === null || _a === void 0 ? void 0 : _a.ID;
+                        if (!fileId) {
+                            continue;
+                        }
+                        api = this.apiGetter.getApi();
+                        fileUrl = ClientFile.GetUrl({
+                            api: api,
+                            fileId: fileId
+                        });
+                        source = new KmlDataSource();
+                        source.load(fileUrl);
+                        this.viewer.dataSources.add(source);
+                        this.dataSources.push(source);
+                    }
                     return [2 /*return*/];
                 });
             });
@@ -5468,11 +5534,16 @@ var DataSourceStaticKmlManager;
                 return;
             }
             this.disposed = true;
-            if (this.dataSource &&
-                !((_a = this.viewer) === null || _a === void 0 ? void 0 : _a.isDestroyed()) &&
-                this.viewer.dataSources.contains(this.dataSource)) {
-                this.viewer.dataSources.remove(this.dataSource);
+            if (!((_a = this.viewer) === null || _a === void 0 ? void 0 : _a.isDestroyed())) {
+                for (var i = 0; i < this.dataSources.length; i++) {
+                    var source = this.dataSources[i];
+                    if (source &&
+                        this.viewer.dataSources.contains(source)) {
+                        this.viewer.dataSources.remove(source);
+                    }
+                }
             }
+            this.dataSources = [];
         };
         Manager.prototype.ReRender = function (entityIds) {
             return __awaiter(this, void 0, void 0, function () {
@@ -6038,6 +6109,7 @@ var MenuItemManager;
                                         item: params.item
                                     });
                                     break;
+                                case MenuItem.EType.IonTileset:
                                 case MenuItem.EType.ArbTileset:
                                     rItem.renderManager = new TilesetArbRenderManager.Manager({
                                         apiGetter: params.apiGetter,