bruce-cesium 3.1.9 → 3.2.0

package/dist/lib/widgets/widget-branding.js

@@ -78,6 +78,8 @@ var WidgetBranding = /** @class */ (function (_super) {
             this._terrainListenRemoval();
             this._terrainListenRemoval = null;
         }
+        clearTimeout(this.checkTimeout);
+        this.checkTimeout = null;
         _super.prototype.Dispose.call(this);
     };
     WidgetBranding.prototype._generateStyles = function () {
@@ -124,12 +126,16 @@ var WidgetBranding = /** @class */ (function (_super) {
                             return [2 /*return*/, false];
                         }
                         provider = viewer.scene.terrainProvider;
-                        return [4 /*yield*/, provider.readyPromise];
-                    case 1:
-                        _c.sent();
-                        if (provider != viewer.scene.terrainProvider) {
+                        // Newer Cesium versions have a ready property
+                        if (provider["ready"] == false) {
                             return [2 /*return*/];
                         }
+                        if (!provider["readyPromise"]) return [3 /*break*/, 2];
+                        return [4 /*yield*/, provider["readyPromise"]];
+                    case 1:
+                        _c.sent();
+                        _c.label = 2;
+                    case 2:
                         credits = provider === null || provider === void 0 ? void 0 : provider._tileCredits;
                         return [2 /*return*/, credits && credits.length > 0 && credits[0]._html && ((_b = credits[0]._html) === null || _b === void 0 ? void 0 : _b.includes("ion-credit.png"))];
                 }
@@ -137,21 +143,23 @@ var WidgetBranding = /** @class */ (function (_super) {
         });
     };
     WidgetBranding.prototype._updateIon = function () {
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function () {
-            var shouldShow, e_1;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var shouldShow, e_1, provider;
+            var _this = this;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
                         if (this.updatingIon) {
                             return [2 /*return*/];
                         }
                         this.updatingIon = true;
-                        _a.label = 1;
+                        _c.label = 1;
                     case 1:
-                        _a.trys.push([1, 3, , 4]);
+                        _c.trys.push([1, 3, , 4]);
                         return [4 /*yield*/, this._shouldShowIonLogo()];
                     case 2:
-                        shouldShow = _a.sent();
+                        shouldShow = _c.sent();
                         if (shouldShow && !this.ion.parentElement) {
                             this._element.insertBefore(this.ion, this._element.firstChild);
                         }
@@ -160,11 +168,22 @@ var WidgetBranding = /** @class */ (function (_super) {
                         }
                         return [3 /*break*/, 4];
                     case 3:
-                        e_1 = _a.sent();
+                        e_1 = _c.sent();
                         console.error(e_1);
                         return [3 /*break*/, 4];
                     case 4:
                         this.updatingIon = false;
+                        provider = !((_a = this._viewer) === null || _a === void 0 ? void 0 : _a.scene) || ((_b = this._viewer) === null || _b === void 0 ? void 0 : _b.isDestroyed()) ? null : this._viewer.scene.terrainProvider;
+                        if (provider) {
+                            // Newer Cesium versions have a ready property
+                            // If it's not ready, we'll re-check in a moment.
+                            if (provider["ready"] == false) {
+                                clearTimeout(this.checkTimeout);
+                                this.checkTimeout = setTimeout(function () {
+                                    _this._updateIon();
+                                }, 1000);
+                            }
+                        }
                         return [2 /*return*/];
                 }
             });

package/dist/lib/widgets/widget-branding.js.map

@@ -1 +1 @@
-{"version":3,"file":"widget-branding.js","sourceRoot":"","sources":["../../../src/widgets/widget-branding.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"widget-branding.js","sourceRoot":"","sources":["../../../src/widgets/widget-branding.ts"],"names":[],"mappings":"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"}

package/dist/types/bruce-cesium.d.ts

@@ -29,4 +29,4 @@ export * from "./utils/measure-utils";
 export * from "./utils/entity-utils";
 export * from "./widgets/common/draw-3d-polygon";
 export * from "./widgets/common/draw-3d-polyline";
-export declare const VERSION = "3.1.9";
+export declare const VERSION = "3.2.0";

package/dist/types/rendering/tileset-render-engine.d.ts

@@ -38,6 +38,13 @@ export declare namespace TilesetRenderEngine {
         coords?: EntityCoords.IEntityCoords;
         viaCdn?: boolean;
     }
+    /**
+     * Returns when a tileset is ready to be used.
+     * This should be waited for after adding at tileset to the scene and BEFORE any settings are applied to it.
+     * @param cTileset
+     * @returns
+     */
+    function OnTilesetReady(cTileset: Cesium.Cesium3DTileset): Promise<void>;
     function ApplyPosition(params: {
         cTileset: Cesium.Cesium3DTileset;
         position: IPositionParams;

package/dist/types/widgets/widget-branding.d.ts

@@ -4,6 +4,7 @@ export declare class WidgetBranding extends Widget.AWidget {
     private _terrainListenRemoval;
     private ion;
     private updatingIon;
+    private checkTimeout;
     constructor(params: Widget.IParams);
     private _listenToRenders;
     Dispose(): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bruce-cesium",
-  "version": "3.1.9",
+  "version": "3.2.0",
   "description": "",
   "keywords": [],
   "main": "dist/bruce-cesium.umd.js",