bruce-cesium 1.2.1 → 1.2.3

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, Color, HeightReference, Cartesian3, 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, ColorMaterialProperty, Rectangle, Matrix3, EasingFunction, GeometryInstance, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, CallbackProperty, createOsmBuildings, KmlDataSource } from 'cesium';
+import { Cartesian2, Cartographic, Math as Math$1, Cartesian3, Entity, Primitive, Cesium3DTileFeature, Color, HeightReference, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Cesium3DTileColorBlendMode, HeadingPitchRange, createOsmBuildings, Cesium3DTileStyle, Rectangle, KmlDataSource, CallbackProperty, OrthographicFrustum, JulianDate, EllipsoidGeodesic, EllipsoidTerrainProvider, sampleTerrainMostDetailed, Matrix4, Cesium3DTileset, IonResource, createWorldTerrain, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, PolygonPipeline, ColorMaterialProperty, Matrix3, EasingFunction, GeometryInstance } from 'cesium';
 
 var TIME_LAG = 300;
 var POSITION_CHECK_TIMER = 950;
@@ -3942,79 +3942,81 @@ var TilesetRenderEngine;
             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);
+            if (legacy_1.transform) {
+                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());
+                    }
+                    else {
+                        return Cartesian3.clone(root.boundingSphere.center);
+                    }
+                };
+                var pos3d = void 0;
+                if (location.latitude != null && location.longitude != null) {
+                    pos3d = Cartesian3.fromDegrees(EnsureNumber(location.longitude), EnsureNumber(location.latitude), EnsureNumber(location.altitude));
                 }
-                // East
-                if (e != 0) {
-                    carto = offsetPoint_1(carto, Number(e), 90);
+                if (!pos3d) {
+                    pos3d = getCurPos3d();
                 }
-                // 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());
+                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;
                 }
-                else {
-                    return Cartesian3.clone(root.boundingSphere.center);
+                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);
+                    root.updateTransform();
                 }
-            };
-            var pos3d = void 0;
-            if (location.latitude != null && location.longitude != null) {
-                pos3d = Cartesian3.fromDegrees(EnsureNumber(location.longitude), EnsureNumber(location.latitude), EnsureNumber(location.altitude));
-            }
-            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);
+                var curPos3d = getCurPos3d();
+                var newTransform = Matrix4.pack(root.transform.clone(new Matrix4()), []);
+                newTransform[12] += pos3d.x - curPos3d.x;
+                newTransform[13] += pos3d.y - curPos3d.y;
+                newTransform[14] += pos3d.z - curPos3d.z;
+                root.transform = Matrix4.unpack(newTransform);
                 root.updateTransform();
             }
-            var curPos3d = getCurPos3d();
-            var newTransform = Matrix4.pack(root.transform.clone(new Matrix4()), []);
-            newTransform[12] += pos3d.x - curPos3d.x;
-            newTransform[13] += pos3d.y - curPos3d.y;
-            newTransform[14] += pos3d.z - curPos3d.z;
-            root.transform = Matrix4.unpack(newTransform);
-            root.updateTransform();
         }
         else {
             if (!(location === null || location === void 0 ? void 0 : location.latitude)) {
@@ -4398,7 +4400,7 @@ var TilesetRenderEngine;
                                     }
                                 }
                                 catch (e) {
-                                    console.log(e);
+                                    console.error(e);
                                 }
                             }
                             i = 0;
@@ -5571,7 +5573,7 @@ function getLegacyTileset(params) {
                     return [2 /*return*/, legacyTileset];
                 case 3:
                     e_1 = _a.sent();
-                    console.log(e_1);
+                    console.error(e_1);
                     return [3 /*break*/, 4];
                 case 4: return [2 /*return*/];
             }
@@ -5580,14 +5582,14 @@ function getLegacyTileset(params) {
 }
 function getTileset(params) {
     return __awaiter(this, void 0, void 0, function () {
-        var apiGetter, menuItem, api, tileset, e_2;
+        var apiGetter, menuItem, api, tileset, typeMapping, e_2;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     apiGetter = params.apiGetter, menuItem = params.menuItem;
                     _a.label = 1;
                 case 1:
-                    _a.trys.push([1, 3, , 4]);
+                    _a.trys.push([1, 4, , 5]);
                     api = apiGetter.getApi(menuItem.tileset.ClientAccountID);
                     return [4 /*yield*/, Tileset.Get({
                             api: api,
@@ -5595,12 +5597,21 @@ function getTileset(params) {
                         })];
                 case 2:
                     tileset = (_a.sent()).tileset;
-                    return [2 /*return*/, tileset];
+                    return [4 /*yield*/, Tileset.GetTypes({
+                            api: api,
+                            tilesetIds: [menuItem.tileset.TilesetID]
+                        })];
                 case 3:
+                    typeMapping = (_a.sent()).typeMapping;
+                    return [2 /*return*/, {
+                            tileset: tileset,
+                            type: typeMapping[menuItem.tileset.TilesetID]
+                        }];
+                case 4:
                     e_2 = _a.sent();
                     console.error(e_2);
-                    return [3 /*break*/, 4];
-                case 4: return [2 /*return*/];
+                    return [3 /*break*/, 5];
+                case 5: return [2 /*return*/];
             }
         });
     });
@@ -5634,10 +5645,10 @@ var TilesetArbRenderManager;
         Manager.prototype.Init = function () {
             var _a, _b, _c;
             return __awaiter(this, void 0, void 0, function () {
-                var loadUrlOverride, itemUrl, url, urlParts, tilesetId, accountId, tileset, legacyTileset, _d, _e;
+                var loadUrlOverride, itemUrl, url, urlParts, tilesetId, accountId, _d, tileset, type, LEGACY_TYPES, legacyTileset, _e, _f;
                 var _this = this;
-                return __generator(this, function (_f) {
-                    switch (_f.label) {
+                return __generator(this, function (_g) {
+                    switch (_g.label) {
                         case 0:
                             loadUrlOverride = null;
                             if (this.item.tileset) {
@@ -5667,35 +5678,31 @@ var TilesetArbRenderManager;
                                     menuItem: this.item
                                 })];
                         case 1:
-                            tileset = _f.sent();
+                            _d = _g.sent(), tileset = _d.tileset, type = _d.type;
                             if (tileset && loadUrlOverride) {
                                 tileset.loadUrl = loadUrlOverride;
                             }
-                            if (!(tileset === null || tileset === void 0 ? void 0 : tileset.type)) return [3 /*break*/, 2];
-                            this.cTileset = TilesetRenderEngine.Render({
-                                apiGetter: this.apiGetter,
-                                tileset: tileset,
-                                viewer: this.viewer,
-                                coords: null
-                            });
-                            return [3 /*break*/, 7];
-                        case 2:
-                            if (!tileset) return [3 /*break*/, 7];
-                            if (!tileset) return [3 /*break*/, 4];
+                            LEGACY_TYPES = [
+                                Tileset.EType.LegacyEntitiesSet,
+                                Tileset.EType.LegacyExternal,
+                                Tileset.EType.LegacyStatic
+                            ];
+                            if (!LEGACY_TYPES.includes(type)) return [3 /*break*/, 6];
+                            if (!tileset) return [3 /*break*/, 3];
                             return [4 /*yield*/, getLegacyTileset({
                                     apiGetter: this.apiGetter,
                                     menuItem: this.item,
                                     tileset: tileset
                                 })];
+                        case 2:
+                            _e = _g.sent();
+                            return [3 /*break*/, 4];
                         case 3:
-                            _d = _f.sent();
-                            return [3 /*break*/, 5];
+                            _e = null;
+                            _g.label = 4;
                         case 4:
-                            _d = null;
-                            _f.label = 5;
-                        case 5:
-                            legacyTileset = _d;
-                            _e = this;
+                            legacyTileset = _e;
+                            _f = this;
                             return [4 /*yield*/, TilesetRenderEngine.RenderLegacy({
                                     apiGetter: this.apiGetter,
                                     tileset: legacyTileset,
@@ -5703,17 +5710,27 @@ var TilesetArbRenderManager;
                                     ionId: (_c = this.item.IonResource) === null || _c === void 0 ? void 0 : _c.AssetID,
                                     loadUrl: loadUrlOverride
                                 })];
+                        case 5:
+                            _f.cTileset = _g.sent();
+                            return [3 /*break*/, 7];
                         case 6:
-                            _e.cTileset = _f.sent();
-                            _f.label = 7;
+                            if (tileset) {
+                                this.cTileset = TilesetRenderEngine.Render({
+                                    apiGetter: this.apiGetter,
+                                    tileset: tileset,
+                                    viewer: this.viewer,
+                                    coords: null
+                                });
+                            }
+                            _g.label = 7;
                         case 7:
                             this.cTileset.readyPromise.then(function () {
                                 try {
                                     if (_this.item.ApplyStyles) {
                                         var api = _this.apiGetter.getApi();
                                         _this.styler = new TilesetRenderEngine.CadStyler(api, _this.cTileset, _this.item.styleId, _this.item.StyleMapping);
-                                        _this.onCTilesetLoad();
                                     }
+                                    _this.onCTilesetLoad();
                                 }
                                 catch (e) {
                                     console.error(e);
@@ -5733,7 +5750,7 @@ var TilesetArbRenderManager;
             });
         };
         Manager.prototype.onCTilesetLoad = function () {
-            if (this.item.FlyTo) {
+            {
                 this.viewer.zoomTo(this.cTileset, new HeadingPitchRange(0.0, -0.5, this.cTileset.boundingSphere.radius / 4.0));
             }
         };
@@ -8197,5 +8214,5 @@ var ViewUtils;
     ViewUtils.GatherTerrainTile = GatherTerrainTile;
 })(ViewUtils || (ViewUtils = {}));
 
-export { CesiumViewMonitor, ViewerUtils, MenuItemManager, EntityRenderEngine, MenuItemCreator, VisualsRegister, RenderManager, EntitiesIdsRenderManager, EntitiesLoadedRenderManager, EntitiesRenderManager, EntityRenderManager, TilesetCadRenderManager, ViewRenderEngine, TileRenderEngine, TilesetRenderEngine, SharedGetters, ViewUtils, DrawingUtils, MeasureUtils, EntityUtils, CesiumParabola };
+export { CesiumViewMonitor, ViewerUtils, MenuItemManager, EntityRenderEngine, MenuItemCreator, VisualsRegister, RenderManager, EntitiesIdsRenderManager, EntitiesLoadedRenderManager, EntitiesRenderManager, EntityRenderManager, TilesetCadRenderManager, TilesetArbRenderManager, TilesetEntitiesRenderManager, TilesetOsmRenderManager, TilesetPointcloudRenderManager, DataSourceStaticKmlManager, RelationsRenderManager, SharedGetters, CesiumParabola, ViewRenderEngine, TileRenderEngine, TilesetRenderEngine, ViewUtils, DrawingUtils, MeasureUtils, EntityUtils };
 //# sourceMappingURL=bruce-cesium.es5.js.map