bruce-cesium 1.5.7 → 1.5.8

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, Color, HeightReference, Cartesian3, EllipsoidTerrainProvider, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, SceneMode, Cesium3DTileColorBlendMode, HeadingPitchRange, createOsmBuildings, Cesium3DTileStyle, Rectangle, KmlDataSource, CallbackProperty, createWorldTerrain, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, OrthographicFrustum, JulianDate, Matrix4, Cesium3DTileset, IonResource, EllipsoidGeodesic, sampleTerrainMostDetailed, ColorMaterialProperty, Matrix3, EasingFunction, GeometryInstance, PolygonPipeline } from 'cesium';
+import { Cartesian2, Cartographic, Math as Math$1, SceneMode, Cartesian3, Color, HeightReference, EllipsoidTerrainProvider, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, HeadingPitchRange, Cesium3DTileColorBlendMode, createOsmBuildings, Cesium3DTileStyle, Rectangle, KmlDataSource, CallbackProperty, Cesium3DTileset, Matrix4, IonResource, createWorldTerrain, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, ColorMaterialProperty, Matrix3, EasingFunction, GeometryInstance, JulianDate, OrthographicFrustum } from 'cesium';
 
 var TIME_LAG = 300;
 var POSITION_CHECK_TIMER = 950;
@@ -4276,6 +4276,28 @@ function correctStyle(style) {
     }
     return style;
 }
+/**
+ * Creates and returns a tileset instance from a given url.
+ * This is made to handle the difference between old and new cesium versions.
+ * New versions use fromUrl whereas old versions pass the url as a property.
+ * @param url
+ * @param props
+ * @returns
+ */
+function createTileset(url, props) {
+    return __awaiter(this, void 0, void 0, function () {
+        var C3DT;
+        return __generator(this, function (_a) {
+            C3DT = Cesium3DTileset;
+            if (C3DT.fromUrl) {
+                // New cesium is running.
+                return [2 /*return*/, C3DT.fromUrl(url, __assign({}, props))];
+            }
+            // Old cesium is running.
+            return [2 /*return*/, new C3DT(__assign({ url: url }, props))];
+        });
+    });
+}
 var TilesetRenderEngine;
 (function (TilesetRenderEngine) {
     function ApplyPosition(params) {
@@ -4407,96 +4429,101 @@ 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: loadUrl ? loadUrl : Tileset.GetPublicFileUrl({
-                    api: api,
-                    tilesetId: params.tileset.id,
-                    file: "tileset.json"
-                }) + "?generation=" + params.tileset.generateVersion
-            });
-            params.viewer.scene.primitives.add(cTileset_1);
-            cTileset_1.readyPromise.then(function () {
-                var _a, _b, _c;
-                try {
-                    if (!isAlive(params.viewer, cTileset_1)) {
-                        return;
-                    }
-                    var settings = params.tileset.settings;
-                    ApplySettings({
-                        cTileset: cTileset_1,
-                        settings: {
-                            maxScreenSpaceError: settings.maximumScreenSpaceError
-                        }
-                    });
-                    ApplyPosition({
-                        cTileset: cTileset_1,
-                        position: {
-                            ucs: (_a = params.coords) === null || _a === void 0 ? void 0 : _a.ucs,
-                            location: ((_b = params.coords) === null || _b === void 0 ? void 0 : _b.location) == null ? settings.location : params.coords.location,
-                            transform: ((_c = params.coords) === null || _c === void 0 ? void 0 : _c.transform) == null ? settings.transform : params.coords.transform
-                        }
-                    });
-                }
-                catch (e) {
-                    console.error(e);
-                }
-            });
-            return cTileset_1;
-        }
-        else if (params.tileset.type === Tileset.EType.EntitiesSet) {
-            var cTileset = new Cesium3DTileset({
-                url: loadUrl ? loadUrl : Tileset.GetPublicFileUrl({
-                    api: api,
-                    tilesetId: params.tileset.id,
-                    file: "tileset.json"
-                }) + "?generation=" + params.tileset.generateVersion
-            });
-            params.viewer.scene.primitives.add(cTileset);
-            return cTileset;
-        }
-        else if (params.tileset.type == Tileset.EType.PointCloud) {
-            var cTileset_2 = new Cesium3DTileset({
-                url: loadUrl ? loadUrl : Tileset.GetPublicFileUrl({
-                    api: api,
-                    tilesetId: params.tileset.id,
-                    file: "tileset.json"
-                }) + "?generation=" + params.tileset.generateVersion
-            });
-            params.viewer.scene.primitives.add(cTileset_2);
-            cTileset_2.readyPromise.then(function () {
-                try {
-                    if (!isAlive(params.viewer, cTileset_2)) {
-                        return;
-                    }
-                    var settings = params.tileset.settings;
-                    ApplySettings({
-                        cTileset: cTileset_2,
-                        settings: {
-                            attenuation: settings.attenuation,
-                            maximumAttenuation: settings.attenuationMax,
-                            maxScreenSpaceError: settings.maximumScreenSpaceError
-                        }
-                    });
-                    ApplyPosition({
-                        cTileset: cTileset_2,
-                        position: {
-                            location: settings.location,
-                            transform: settings.transform
-                        }
-                    });
-                }
-                catch (e) {
-                    console.error(e);
+        return __awaiter(this, void 0, void 0, function () {
+            var api, loadUrl, cTileset_1, cTileset, cTileset_2;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        api = params.apiGetter.getApi(params.apiGetter.accountId);
+                        loadUrl = params.tileset.loadUrl;
+                        if (!(params.tileset.type == Tileset.EType.Cad)) return [3 /*break*/, 2];
+                        return [4 /*yield*/, createTileset(loadUrl ? loadUrl : Tileset.GetPublicFileUrl({
+                                api: api,
+                                tilesetId: params.tileset.id,
+                                file: "tileset.json"
+                            }) + "?generation=" + params.tileset.generateVersion, null)];
+                    case 1:
+                        cTileset_1 = _a.sent();
+                        params.viewer.scene.primitives.add(cTileset_1);
+                        cTileset_1.readyPromise.then(function () {
+                            var _a, _b, _c;
+                            try {
+                                if (!isAlive(params.viewer, cTileset_1)) {
+                                    return;
+                                }
+                                var settings = params.tileset.settings;
+                                ApplySettings({
+                                    cTileset: cTileset_1,
+                                    settings: {
+                                        maxScreenSpaceError: settings.maximumScreenSpaceError
+                                    }
+                                });
+                                ApplyPosition({
+                                    cTileset: cTileset_1,
+                                    position: {
+                                        ucs: (_a = params.coords) === null || _a === void 0 ? void 0 : _a.ucs,
+                                        location: ((_b = params.coords) === null || _b === void 0 ? void 0 : _b.location) == null ? settings.location : params.coords.location,
+                                        transform: ((_c = params.coords) === null || _c === void 0 ? void 0 : _c.transform) == null ? settings.transform : params.coords.transform
+                                    }
+                                });
+                            }
+                            catch (e) {
+                                console.error(e);
+                            }
+                        });
+                        return [2 /*return*/, cTileset_1];
+                    case 2:
+                        if (!(params.tileset.type === Tileset.EType.EntitiesSet)) return [3 /*break*/, 4];
+                        return [4 /*yield*/, createTileset(loadUrl ? loadUrl : Tileset.GetPublicFileUrl({
+                                api: api,
+                                tilesetId: params.tileset.id,
+                                file: "tileset.json"
+                            }) + "?generation=" + params.tileset.generateVersion, null)];
+                    case 3:
+                        cTileset = _a.sent();
+                        params.viewer.scene.primitives.add(cTileset);
+                        return [2 /*return*/, cTileset];
+                    case 4:
+                        if (!(params.tileset.type == Tileset.EType.PointCloud)) return [3 /*break*/, 6];
+                        return [4 /*yield*/, createTileset(loadUrl ? loadUrl : Tileset.GetPublicFileUrl({
+                                api: api,
+                                tilesetId: params.tileset.id,
+                                file: "tileset.json"
+                            }) + "?generation=" + params.tileset.generateVersion, null)];
+                    case 5:
+                        cTileset_2 = _a.sent();
+                        params.viewer.scene.primitives.add(cTileset_2);
+                        cTileset_2.readyPromise.then(function () {
+                            try {
+                                if (!isAlive(params.viewer, cTileset_2)) {
+                                    return;
+                                }
+                                var settings = params.tileset.settings;
+                                ApplySettings({
+                                    cTileset: cTileset_2,
+                                    settings: {
+                                        attenuation: settings.attenuation,
+                                        maximumAttenuation: settings.attenuationMax,
+                                        maxScreenSpaceError: settings.maximumScreenSpaceError
+                                    }
+                                });
+                                ApplyPosition({
+                                    cTileset: cTileset_2,
+                                    position: {
+                                        location: settings.location,
+                                        transform: settings.transform
+                                    }
+                                });
+                            }
+                            catch (e) {
+                                console.error(e);
+                            }
+                        });
+                        return [2 /*return*/, cTileset_2];
+                    case 6: throw ("Not implemented.");
                 }
             });
-            return cTileset_2;
-        }
-        else {
-            throw ("Not implemented.");
-        }
+        });
     }
     TilesetRenderEngine.Render = Render;
     function RenderLegacy(params) {
@@ -4539,9 +4566,9 @@ var TilesetRenderEngine;
                                     .replace("<ACCOUNT>", accountId);
                             }
                         }
-                        cTileset = new Cesium3DTileset({
-                            url: loadUrl
-                        });
+                        return [4 /*yield*/, createTileset(loadUrl, null)];
+                    case 4:
+                        cTileset = _a.sent();
                         viewer.scene.primitives.add(cTileset);
                         cTileset.readyPromise.then(function () {
                             try {
@@ -5030,10 +5057,10 @@ var TilesetCadRenderManager;
         Manager.prototype.Init = function () {
             var _a;
             return __awaiter(this, void 0, void 0, function () {
-                var tilesetId, api, tileset, settings, rootId, coords, cTileset;
+                var tilesetId, api, tileset, settings, rootId, coords, cTileset, _b;
                 var _this = this;
-                return __generator(this, function (_b) {
-                    switch (_b.label) {
+                return __generator(this, function (_c) {
+                    switch (_c.label) {
                         case 0:
                             tilesetId = (_a = this.item.tileset) === null || _a === void 0 ? void 0 : _a.TilesetID;
                             if (!tilesetId) {
@@ -5045,7 +5072,7 @@ var TilesetCadRenderManager;
                                     tilesetId: tilesetId
                                 })];
                         case 1:
-                            tileset = (_b.sent()).tileset;
+                            tileset = (_c.sent()).tileset;
                             if (!tileset) {
                                 return [2 /*return*/];
                             }
@@ -5056,13 +5083,16 @@ var TilesetCadRenderManager;
                                     rootEntityId: rootId
                                 })];
                         case 2:
-                            coords = (_b.sent()).coords;
-                            cTileset = this.cTileset = TilesetRenderEngine.Render({
-                                apiGetter: this.apiGetter,
-                                tileset: tileset,
-                                viewer: this.viewer,
-                                coords: coords
-                            });
+                            coords = (_c.sent()).coords;
+                            _b = this;
+                            return [4 /*yield*/, TilesetRenderEngine.Render({
+                                    apiGetter: this.apiGetter,
+                                    tileset: tileset,
+                                    viewer: this.viewer,
+                                    coords: coords
+                                })];
+                        case 3:
+                            cTileset = _b.cTileset = _c.sent();
                             cTileset.readyPromise.then(function () {
                                 try {
                                     if (_this.disposed || cTileset.isDestroyed()) {
@@ -5663,10 +5693,10 @@ var TilesetEntitiesRenderManager;
         Manager.prototype.Init = function () {
             var _a;
             return __awaiter(this, void 0, void 0, function () {
-                var tilesetId, api, tileset, cTileset;
+                var tilesetId, api, tileset, cTileset, _b;
                 var _this = this;
-                return __generator(this, function (_b) {
-                    switch (_b.label) {
+                return __generator(this, function (_c) {
+                    switch (_c.label) {
                         case 0:
                             tilesetId = (_a = this.item.tileset) === null || _a === void 0 ? void 0 : _a.TilesetID;
                             if (!tilesetId) {
@@ -5678,16 +5708,19 @@ var TilesetEntitiesRenderManager;
                                     tilesetId: tilesetId
                                 })];
                         case 1:
-                            tileset = (_b.sent()).tileset;
+                            tileset = (_c.sent()).tileset;
                             if (!tileset) {
                                 return [2 /*return*/];
                             }
                             this.typeId = tileset.settings.entityTypeId;
-                            cTileset = this.cTileset = TilesetRenderEngine.Render({
-                                apiGetter: this.apiGetter,
-                                tileset: tileset,
-                                viewer: this.viewer
-                            });
+                            _b = this;
+                            return [4 /*yield*/, TilesetRenderEngine.Render({
+                                    apiGetter: this.apiGetter,
+                                    tileset: tileset,
+                                    viewer: this.viewer
+                                })];
+                        case 2:
+                            cTileset = _b.cTileset = _c.sent();
                             cTileset.readyPromise.then(function () {
                                 try {
                                     if (_this.disposed || _this.viewer.isDestroyed()) {
@@ -5797,10 +5830,10 @@ var TilesetPointcloudRenderManager;
         Manager.prototype.Init = function () {
             var _a;
             return __awaiter(this, void 0, void 0, function () {
-                var tilesetId, api, tileset, cTileset;
+                var tilesetId, api, tileset, cTileset, _b;
                 var _this = this;
-                return __generator(this, function (_b) {
-                    switch (_b.label) {
+                return __generator(this, function (_c) {
+                    switch (_c.label) {
                         case 0:
                             tilesetId = (_a = this.item.tileset) === null || _a === void 0 ? void 0 : _a.TilesetID;
                             if (!tilesetId) {
@@ -5812,16 +5845,19 @@ var TilesetPointcloudRenderManager;
                                     tilesetId: tilesetId
                                 })];
                         case 1:
-                            tileset = (_b.sent()).tileset;
+                            tileset = (_c.sent()).tileset;
                             if (!tileset) {
                                 return [2 /*return*/];
                             }
-                            cTileset = this.cTileset = TilesetRenderEngine.Render({
-                                apiGetter: this.apiGetter,
-                                tileset: tileset,
-                                viewer: this.viewer,
-                                coords: null
-                            });
+                            _b = this;
+                            return [4 /*yield*/, TilesetRenderEngine.Render({
+                                    apiGetter: this.apiGetter,
+                                    tileset: tileset,
+                                    viewer: this.viewer,
+                                    coords: null
+                                })];
+                        case 2:
+                            cTileset = _b.cTileset = _c.sent();
                             cTileset.readyPromise.then(function () {
                                 try {
                                     if (_this.disposed || _this.viewer.isDestroyed()) {
@@ -6050,10 +6086,10 @@ var TilesetArbRenderManager;
         Manager.prototype.Init = function () {
             var _a, _b, _c, _d, _e, _f;
             return __awaiter(this, void 0, void 0, function () {
-                var loadUrlOverride, itemUrl, url, urlParts, tilesetId_1, accountId, tilesetId, _g, tileset, type, _h, LEGACY_TYPES, legacyTileset, _j, accountId, _k;
+                var loadUrlOverride, itemUrl, url, urlParts, tilesetId_1, accountId, tilesetId, _g, tileset, type, _h, LEGACY_TYPES, legacyTileset, _j, accountId, _k, _l;
                 var _this = this;
-                return __generator(this, function (_l) {
-                    switch (_l.label) {
+                return __generator(this, function (_m) {
+                    switch (_m.label) {
                         case 0:
                             loadUrlOverride = null;
                             if (this.item.tileset) {
@@ -6085,11 +6121,11 @@ var TilesetArbRenderManager;
                                     menuItem: this.item
                                 })];
                         case 1:
-                            _h = _l.sent();
+                            _h = _m.sent();
                             return [3 /*break*/, 3];
                         case 2:
                             _h = { tileset: null, type: null };
-                            _l.label = 3;
+                            _m.label = 3;
                         case 3:
                             _g = _h, tileset = _g.tileset, type = _g.type;
                             if (tileset && loadUrlOverride) {
@@ -6108,11 +6144,11 @@ var TilesetArbRenderManager;
                                     tileset: tileset
                                 })];
                         case 4:
-                            _j = _l.sent();
+                            _j = _m.sent();
                             return [3 /*break*/, 6];
                         case 5:
                             _j = null;
-                            _l.label = 6;
+                            _m.label = 6;
                         case 6:
                             legacyTileset = _j;
                             accountId = (_e = (_d = this.item) === null || _d === void 0 ? void 0 : _d.tileset) === null || _e === void 0 ? void 0 : _e.ClientAccountID;
@@ -6130,19 +6166,21 @@ var TilesetArbRenderManager;
                                     viaCdn: true
                                 })];
                         case 7:
-                            _k.cTileset = _l.sent();
-                            return [3 /*break*/, 9];
+                            _k.cTileset = _m.sent();
+                            return [3 /*break*/, 10];
                         case 8:
-                            if (tileset) {
-                                this.cTileset = TilesetRenderEngine.Render({
+                            if (!tileset) return [3 /*break*/, 10];
+                            _l = this;
+                            return [4 /*yield*/, TilesetRenderEngine.Render({
                                     apiGetter: this.apiGetter,
                                     tileset: tileset,
                                     viewer: this.viewer,
                                     coords: null
-                                });
-                            }
-                            _l.label = 9;
+                                })];
                         case 9:
+                            _l.cTileset = _m.sent();
+                            _m.label = 10;
+                        case 10:
                             this.cTileset.readyPromise.then(function () {
                                 try {
                                     if (_this.item.ApplyStyles ||
@@ -7480,6 +7518,19 @@ function prepareFileExt(ext) {
     ext = ext.replace(".", "");
     return ext;
 }
+/**
+ * Creates an imagery layer from a given provider.
+ * This exists because the constructor for it has changed between cesium versions.
+ * @param provider
+ * @returns
+ */
+function createImageryLayer(provider) {
+    var CIL = ImageryLayer;
+    if (CIL.length == 2) {
+        return new CIL(provider, {});
+    }
+    return new CIL(provider);
+}
 var TileRenderEngine;
 (function (TileRenderEngine) {
     /**
@@ -7517,7 +7568,7 @@ var TileRenderEngine;
                             case 2:
                                 provider = _c.sent();
                                 if (provider) {
-                                    layer = new ImageryLayer(provider);
+                                    layer = createImageryLayer(provider);
                                 }
                                 return [3 /*break*/, 13];
                             case 3:
@@ -7590,7 +7641,7 @@ var TileRenderEngine;
                                 return [3 /*break*/, 12];
                             case 12:
                                 if (provider) {
-                                    layer = new ImageryLayer(provider);
+                                    layer = createImageryLayer(provider);
                                 }
                                 _c.label = 13;
                             case 13: