bruce-cesium 1.1.8 → 1.2.0

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, Cartesian3, Entity, Primitive, Cesium3DTileFeature, Color, HeightReference, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Cesium3DTileColorBlendMode, HeadingPitchRange, OrthographicFrustum, JulianDate, Matrix4, Cesium3DTileStyle, Cesium3DTileset, IonResource, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, PolygonPipeline, CallbackProperty, ColorMaterialProperty, Rectangle, Matrix3, EasingFunction, GeometryInstance, EllipsoidGeodesic, sampleTerrainMostDetailed, KmlDataSource, createOsmBuildings } from 'cesium';
 
 var TIME_LAG = 300;
 var POSITION_CHECK_TIMER = 950;
@@ -4050,9 +4050,10 @@ var TilesetRenderEngine;
     TilesetRenderEngine.ApplySettings = ApplySettings;
     function Render(params) {
         var api = params.apiGetter.getApi(params.apiGetter.accountId);
+        var loadUrl = params.tileset.loadUrl;
         if (params.tileset.type == Tileset.EType.Cad) {
             var cTileset_1 = new Cesium3DTileset({
-                url: Tileset.GetPublicFileUrl({
+                url: loadUrl ? loadUrl : Tileset.GetPublicFileUrl({
                     api: api,
                     tilesetId: params.tileset.id,
                     file: "tileset.json"
@@ -4089,7 +4090,7 @@ var TilesetRenderEngine;
         }
         else if (params.tileset.type === Tileset.EType.EntitiesSet) {
             var cTileset = new Cesium3DTileset({
-                url: Tileset.GetPublicFileUrl({
+                url: loadUrl ? loadUrl : Tileset.GetPublicFileUrl({
                     api: api,
                     tilesetId: params.tileset.id,
                     file: "tileset.json"
@@ -4100,7 +4101,7 @@ var TilesetRenderEngine;
         }
         else if (params.tileset.type == Tileset.EType.PointCloud) {
             var cTileset_2 = new Cesium3DTileset({
-                url: Tileset.GetPublicFileUrl({
+                url: loadUrl ? loadUrl : Tileset.GetPublicFileUrl({
                     api: api,
                     tilesetId: params.tileset.id,
                     file: "tileset.json"
@@ -4142,37 +4143,33 @@ var TilesetRenderEngine;
     TilesetRenderEngine.Render = Render;
     function RenderLegacy(params) {
         return __awaiter(this, void 0, void 0, function () {
-            var apiGetter, viewer, tileset, ionId, settings, visual, etc, loadUrl, api, cTileset;
+            var apiGetter, viewer, tileset, ionId, loadUrl, settings, visual, etc, api, cTileset;
             return __generator(this, function (_a) {
                 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)));
+                        apiGetter = params.apiGetter, viewer = params.viewer, tileset = params.tileset, ionId = params.ionId, loadUrl = params.loadUrl;
                         settings = tileset === null || tileset === void 0 ? void 0 : tileset.Settings;
                         settings = __assign({}, settings);
                         visual = settings.visual;
                         visual = __assign({}, visual);
                         etc = settings.etc;
                         etc = __assign({}, etc);
-                        loadUrl = null;
                         if (!ionId) return [3 /*break*/, 2];
                         return [4 /*yield*/, IonResource.fromAssetId(EnsureNumber(ionId))];
                     case 1:
                         // TODO: Can cause issues with menu-item dispose race conditions.
-                        loadUrl = _a.sent();
+                        loadUrl = (_a.sent());
                         return [3 /*break*/, 3];
                     case 2:
-                        if (tileset) {
-                            if (etc === null || etc === void 0 ? void 0 : etc.ExternalTilesetURL) {
-                                loadUrl = etc.ExternalTilesetURL;
-                            }
-                            else {
-                                api = apiGetter.getApi(apiGetter.accountId);
-                                loadUrl = api.GetBaseUrl() + ("ui.tileset/" + tileset.ID + "/file/tileset.json");
-                            }
+                        if (etc === null || etc === void 0 ? void 0 : etc.ExternalTilesetURL) {
+                            loadUrl = etc.ExternalTilesetURL;
                         }
                         _a.label = 3;
                     case 3:
+                        if (!loadUrl && tileset) {
+                            api = apiGetter.getApi(apiGetter.accountId);
+                            loadUrl = api.GetBaseUrl() + ("ui.tileset/" + tileset.ID + "/file/tileset.json");
+                        }
                         cTileset = new Cesium3DTileset({
                             url: loadUrl
                         });
@@ -5618,6 +5615,7 @@ var TilesetArbRenderManager;
             this.viewer = params.viewer;
             this.apiGetter = params.apiGetter;
             this.item = params.item;
+            this.visualsManager = params.register;
         }
         Object.defineProperty(Manager.prototype, "Disposed", {
             get: function () {
@@ -5636,24 +5634,43 @@ var TilesetArbRenderManager;
         Manager.prototype.Init = function () {
             var _a, _b, _c;
             return __awaiter(this, void 0, void 0, function () {
-                var itemUrl, tileset, legacyTileset, _d;
+                var loadUrlOverride, itemUrl, url, urlParts, tilesetId, accountId, 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";
+                            loadUrlOverride = null;
+                            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";
+                                }
+                                // Try fix a legacy record.
+                                // Eg: https://my3dcity.api.nextspace-uat-us.net/ui.tileset/0838d707-38af-4592-a2d4-5028997cab85/file/tileset.json
+                                if (!this.item.tileset.TilesetID && this.item.tileset.TilesetURL) {
+                                    loadUrlOverride = this.item.tileset.TilesetURL;
+                                    url = this.item.tileset.TilesetURL;
+                                    urlParts = url.split("/");
+                                    if (urlParts.length > 5) {
+                                        tilesetId = urlParts[urlParts.length - 3];
+                                        accountId = urlParts[urlParts.length - 5].split(".")[0];
+                                        this.item.tileset.TilesetID = tilesetId;
+                                        this.item.tileset.ClientAccountID = accountId;
+                                    }
+                                }
                             }
                             return [4 /*yield*/, getTileset({
                                     apiGetter: this.apiGetter,
                                     menuItem: this.item
                                 })];
                         case 1:
-                            tileset = _e.sent();
+                            tileset = _f.sent();
+                            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,
@@ -5661,25 +5678,35 @@ 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
+                                    ionId: (_c = this.item.IonResource) === null || _c === void 0 ? void 0 : _c.AssetID,
+                                    loadUrl: loadUrlOverride
                                 })];
-                        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) {