bruce-cesium 1.1.8 → 1.1.9

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, 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';
+import { Cartesian2, Cartographic, Math as Math$1, Color, HeightReference, Cartesian3, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, OrthographicFrustum, JulianDate, Cesium3DTileColorBlendMode, HeadingPitchRange, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, Matrix4, Cesium3DTileStyle, Cesium3DTileset, IonResource, ColorMaterialProperty, Rectangle, Matrix3, EasingFunction, GeometryInstance, CallbackProperty, createOsmBuildings, KmlDataSource } from 'cesium';
 
 var TIME_LAG = 300;
 var POSITION_CHECK_TIMER = 950;
@@ -4147,7 +4147,6 @@ 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;
@@ -5636,24 +5635,27 @@ var TilesetArbRenderManager;
         Manager.prototype.Init = function () {
             var _a, _b, _c;
             return __awaiter(this, void 0, void 0, function () {
-                var itemUrl, tileset, legacyTileset, _d;
+                var itemUrl, tileset, legacyTileset, _d, _e;
                 var _this = this;
-                return __generator(this, function (_e) {
-                    switch (_e.label) {
+                return __generator(this, function (_f) {
+                    switch (_f.label) {
                         case 0:
-                            itemUrl = (_a = this.item.tileset) === null || _a === void 0 ? void 0 : _a.TilesetURL;
-                            if (itemUrl && itemUrl.includes("cc3d.api")) {
-                                this.item.tileset.ClientAccountID = "cc3d";
-                            }
-                            else if ((_b = this.item.IonResource) === null || _b === void 0 ? void 0 : _b.AssetID) {
-                                this.item.tileset.ClientAccountID = "cc3d";
+                            // Horrid backwards compatibility.
+                            if (this.item.tileset) {
+                                itemUrl = (_a = this.item.tileset) === null || _a === void 0 ? void 0 : _a.TilesetURL;
+                                if (itemUrl && itemUrl.includes("cc3d.api")) {
+                                    this.item.tileset.ClientAccountID = "cc3d";
+                                }
+                                else if ((_b = this.item.IonResource) === null || _b === void 0 ? void 0 : _b.AssetID) {
+                                    this.item.tileset.ClientAccountID = "cc3d";
+                                }
                             }
                             return [4 /*yield*/, getTileset({
                                     apiGetter: this.apiGetter,
                                     menuItem: this.item
                                 })];
                         case 1:
-                            tileset = _e.sent();
+                            tileset = _f.sent();
                             if (!(tileset === null || tileset === void 0 ? void 0 : tileset.type)) return [3 /*break*/, 2];
                             this.cTileset = TilesetRenderEngine.Render({
                                 apiGetter: this.apiGetter,
@@ -5661,25 +5663,34 @@ var TilesetArbRenderManager;
                                 viewer: this.viewer,
                                 coords: null
                             });
-                            return [3 /*break*/, 5];
-                        case 2: return [4 /*yield*/, getLegacyTileset({
-                                apiGetter: this.apiGetter,
-                                menuItem: this.item,
-                                tileset: tileset
-                            })];
+                            return [3 /*break*/, 7];
+                        case 2:
+                            if (!tileset) return [3 /*break*/, 7];
+                            if (!tileset) return [3 /*break*/, 4];
+                            return [4 /*yield*/, getLegacyTileset({
+                                    apiGetter: this.apiGetter,
+                                    menuItem: this.item,
+                                    tileset: tileset
+                                })];
                         case 3:
-                            legacyTileset = _e.sent();
-                            _d = this;
+                            _d = _f.sent();
+                            return [3 /*break*/, 5];
+                        case 4:
+                            _d = null;
+                            _f.label = 5;
+                        case 5:
+                            legacyTileset = _d;
+                            _e = this;
                             return [4 /*yield*/, TilesetRenderEngine.RenderLegacy({
                                     apiGetter: this.apiGetter,
                                     tileset: legacyTileset,
                                     viewer: this.viewer,
                                     ionId: (_c = this.item.IonResource) === null || _c === void 0 ? void 0 : _c.AssetID
                                 })];
-                        case 4:
-                            _d.cTileset = _e.sent();
-                            _e.label = 5;
-                        case 5:
+                        case 6:
+                            _e.cTileset = _f.sent();
+                            _f.label = 7;
+                        case 7:
                             this.cTileset.readyPromise.then(function () {
                                 try {
                                     if (_this.item.ApplyStyles) {