bruce-cesium 1.2.3 → 1.2.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/bruce-cesium.es5.js +41 -27
- package/dist/bruce-cesium.es5.js.map +1 -1
- package/dist/bruce-cesium.umd.js +40 -26
- package/dist/bruce-cesium.umd.js.map +1 -1
- package/dist/lib/rendering/render-managers/tilesets/tileset-arb-render-manager.js +40 -26
- package/dist/lib/rendering/render-managers/tilesets/tileset-arb-render-manager.js.map +1 -1
- package/package.json +1 -1
package/dist/bruce-cesium.umd.js
CHANGED
|
@@ -5585,8 +5585,14 @@
|
|
|
5585
5585
|
this.styler = null;
|
|
5586
5586
|
this.viewer = params.viewer;
|
|
5587
5587
|
this.apiGetter = params.apiGetter;
|
|
5588
|
-
this.item = params.item;
|
|
5589
5588
|
this.visualsManager = params.register;
|
|
5589
|
+
// We modify the object due to a lot of backwards compatibility.
|
|
5590
|
+
try {
|
|
5591
|
+
this.item = params.item ? JSON.parse(JSON.stringify(params.item)) : {};
|
|
5592
|
+
}
|
|
5593
|
+
catch (e) {
|
|
5594
|
+
console.error(e);
|
|
5595
|
+
}
|
|
5590
5596
|
}
|
|
5591
5597
|
Object.defineProperty(Manager.prototype, "Disposed", {
|
|
5592
5598
|
get: function () {
|
|
@@ -5603,12 +5609,12 @@
|
|
|
5603
5609
|
configurable: true
|
|
5604
5610
|
});
|
|
5605
5611
|
Manager.prototype.Init = function () {
|
|
5606
|
-
var _a, _b, _c;
|
|
5612
|
+
var _a, _b, _c, _d;
|
|
5607
5613
|
return __awaiter(this, void 0, void 0, function () {
|
|
5608
|
-
var loadUrlOverride, itemUrl, url, urlParts,
|
|
5614
|
+
var loadUrlOverride, itemUrl, url, urlParts, tilesetId_1, accountId, tilesetId, _e, tileset, type, _f, LEGACY_TYPES, legacyTileset, _g, _h;
|
|
5609
5615
|
var _this = this;
|
|
5610
|
-
return __generator(this, function (
|
|
5611
|
-
switch (
|
|
5616
|
+
return __generator(this, function (_j) {
|
|
5617
|
+
switch (_j.label) {
|
|
5612
5618
|
case 0:
|
|
5613
5619
|
loadUrlOverride = null;
|
|
5614
5620
|
if (this.item.tileset) {
|
|
@@ -5626,19 +5632,27 @@
|
|
|
5626
5632
|
url = this.item.tileset.TilesetURL;
|
|
5627
5633
|
urlParts = url.split("/");
|
|
5628
5634
|
if (urlParts.length > 5) {
|
|
5629
|
-
|
|
5635
|
+
tilesetId_1 = urlParts[urlParts.length - 3];
|
|
5630
5636
|
accountId = urlParts[urlParts.length - 5].split(".")[0];
|
|
5631
|
-
this.item.tileset.TilesetID =
|
|
5637
|
+
this.item.tileset.TilesetID = tilesetId_1;
|
|
5632
5638
|
this.item.tileset.ClientAccountID = accountId;
|
|
5633
5639
|
}
|
|
5634
5640
|
}
|
|
5635
5641
|
}
|
|
5642
|
+
tilesetId = (_c = this.item.tileset) === null || _c === void 0 ? void 0 : _c.TilesetID;
|
|
5643
|
+
if (!tilesetId) return [3 /*break*/, 2];
|
|
5636
5644
|
return [4 /*yield*/, getTileset({
|
|
5637
5645
|
apiGetter: this.apiGetter,
|
|
5638
5646
|
menuItem: this.item
|
|
5639
5647
|
})];
|
|
5640
5648
|
case 1:
|
|
5641
|
-
|
|
5649
|
+
_f = _j.sent();
|
|
5650
|
+
return [3 /*break*/, 3];
|
|
5651
|
+
case 2:
|
|
5652
|
+
_f = null;
|
|
5653
|
+
_j.label = 3;
|
|
5654
|
+
case 3:
|
|
5655
|
+
_e = _f, tileset = _e.tileset, type = _e.type;
|
|
5642
5656
|
if (tileset && loadUrlOverride) {
|
|
5643
5657
|
tileset.loadUrl = loadUrlOverride;
|
|
5644
5658
|
}
|
|
@@ -5647,33 +5661,33 @@
|
|
|
5647
5661
|
bruceModels.Tileset.EType.LegacyExternal,
|
|
5648
5662
|
bruceModels.Tileset.EType.LegacyStatic
|
|
5649
5663
|
];
|
|
5650
|
-
if (!LEGACY_TYPES.includes(type)) return [3 /*break*/,
|
|
5651
|
-
if (!tileset) return [3 /*break*/,
|
|
5664
|
+
if (!(!type || LEGACY_TYPES.includes(type))) return [3 /*break*/, 8];
|
|
5665
|
+
if (!tileset) return [3 /*break*/, 5];
|
|
5652
5666
|
return [4 /*yield*/, getLegacyTileset({
|
|
5653
5667
|
apiGetter: this.apiGetter,
|
|
5654
5668
|
menuItem: this.item,
|
|
5655
5669
|
tileset: tileset
|
|
5656
5670
|
})];
|
|
5657
|
-
case 2:
|
|
5658
|
-
_e = _g.sent();
|
|
5659
|
-
return [3 /*break*/, 4];
|
|
5660
|
-
case 3:
|
|
5661
|
-
_e = null;
|
|
5662
|
-
_g.label = 4;
|
|
5663
5671
|
case 4:
|
|
5664
|
-
|
|
5665
|
-
|
|
5672
|
+
_g = _j.sent();
|
|
5673
|
+
return [3 /*break*/, 6];
|
|
5674
|
+
case 5:
|
|
5675
|
+
_g = null;
|
|
5676
|
+
_j.label = 6;
|
|
5677
|
+
case 6:
|
|
5678
|
+
legacyTileset = _g;
|
|
5679
|
+
_h = this;
|
|
5666
5680
|
return [4 /*yield*/, exports.TilesetRenderEngine.RenderLegacy({
|
|
5667
5681
|
apiGetter: this.apiGetter,
|
|
5668
5682
|
tileset: legacyTileset,
|
|
5669
5683
|
viewer: this.viewer,
|
|
5670
|
-
ionId: (
|
|
5684
|
+
ionId: (_d = this.item.IonResource) === null || _d === void 0 ? void 0 : _d.AssetID,
|
|
5671
5685
|
loadUrl: loadUrlOverride
|
|
5672
5686
|
})];
|
|
5673
|
-
case
|
|
5674
|
-
|
|
5675
|
-
return [3 /*break*/,
|
|
5676
|
-
case
|
|
5687
|
+
case 7:
|
|
5688
|
+
_h.cTileset = _j.sent();
|
|
5689
|
+
return [3 /*break*/, 9];
|
|
5690
|
+
case 8:
|
|
5677
5691
|
if (tileset) {
|
|
5678
5692
|
this.cTileset = exports.TilesetRenderEngine.Render({
|
|
5679
5693
|
apiGetter: this.apiGetter,
|
|
@@ -5682,8 +5696,8 @@
|
|
|
5682
5696
|
coords: null
|
|
5683
5697
|
});
|
|
5684
5698
|
}
|
|
5685
|
-
|
|
5686
|
-
case
|
|
5699
|
+
_j.label = 9;
|
|
5700
|
+
case 9:
|
|
5687
5701
|
this.cTileset.readyPromise.then(function () {
|
|
5688
5702
|
try {
|
|
5689
5703
|
if (_this.item.ApplyStyles) {
|
|
@@ -5710,7 +5724,7 @@
|
|
|
5710
5724
|
});
|
|
5711
5725
|
};
|
|
5712
5726
|
Manager.prototype.onCTilesetLoad = function () {
|
|
5713
|
-
{
|
|
5727
|
+
if (this.item.FlyTo) {
|
|
5714
5728
|
this.viewer.zoomTo(this.cTileset, new Cesium.HeadingPitchRange(0.0, -0.5, this.cTileset.boundingSphere.radius / 4.0));
|
|
5715
5729
|
}
|
|
5716
5730
|
};
|