bruce-cesium 2.3.3 → 2.3.5
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 +144 -78
- package/dist/bruce-cesium.es5.js.map +1 -1
- package/dist/bruce-cesium.umd.js +143 -77
- package/dist/bruce-cesium.umd.js.map +1 -1
- package/dist/lib/bruce-cesium.js +1 -1
- package/dist/lib/rendering/menu-item-manager.js +13 -7
- package/dist/lib/rendering/menu-item-manager.js.map +1 -1
- package/dist/lib/rendering/render-managers/render-manager.js +1 -1
- package/dist/lib/rendering/render-managers/render-manager.js.map +1 -1
- package/dist/lib/rendering/render-managers/tilesets/tileset-arb-render-manager.js +67 -39
- package/dist/lib/rendering/render-managers/tilesets/tileset-arb-render-manager.js.map +1 -1
- package/dist/lib/rendering/render-managers/tilesets/tileset-cad-render-manager.js +6 -6
- package/dist/lib/rendering/render-managers/tilesets/tileset-cad-render-manager.js.map +1 -1
- package/dist/lib/rendering/render-managers/tilesets/tileset-entities-render-manager.js +6 -6
- package/dist/lib/rendering/render-managers/tilesets/tileset-entities-render-manager.js.map +1 -1
- package/dist/lib/rendering/render-managers/tilesets/tileset-osm-render-manager.js +4 -4
- package/dist/lib/rendering/render-managers/tilesets/tileset-osm-render-manager.js.map +1 -1
- package/dist/lib/rendering/render-managers/tilesets/tileset-pointcloud-render-manager.js +45 -13
- package/dist/lib/rendering/render-managers/tilesets/tileset-pointcloud-render-manager.js.map +1 -1
- package/dist/types/bruce-cesium.d.ts +1 -1
- package/dist/types/rendering/menu-item-manager.d.ts +2 -1
- package/dist/types/rendering/render-managers/tilesets/tileset-arb-render-manager.d.ts +3 -3
- package/dist/types/rendering/render-managers/tilesets/tileset-cad-render-manager.d.ts +3 -3
- package/dist/types/rendering/render-managers/tilesets/tileset-entities-render-manager.d.ts +3 -3
- package/dist/types/rendering/render-managers/tilesets/tileset-osm-render-manager.d.ts +3 -3
- package/dist/types/rendering/render-managers/tilesets/tileset-pointcloud-render-manager.d.ts +3 -3
- package/package.json +2 -2
package/dist/bruce-cesium.umd.js
CHANGED
|
@@ -1402,7 +1402,7 @@
|
|
|
1402
1402
|
entityPos3d = Cesium.Cartesian3.fromDegrees(longitude, latitude, altitude);
|
|
1403
1403
|
}
|
|
1404
1404
|
}
|
|
1405
|
-
if (!isNaN(entityPos3d.x)) {
|
|
1405
|
+
if (!isNaN(entityPos3d === null || entityPos3d === void 0 ? void 0 : entityPos3d.x)) {
|
|
1406
1406
|
minDistance = Cesium.Cartesian3.distance(pointPos, entityPos3d);
|
|
1407
1407
|
}
|
|
1408
1408
|
// Check geometry if it's available.
|
|
@@ -6810,9 +6810,9 @@
|
|
|
6810
6810
|
// This likely means poor data so we have to disable drilling otherwise lag would be too bad.
|
|
6811
6811
|
// The result is no entity type IDs are known so most styles fail.
|
|
6812
6812
|
this.hasHitDepthLimit = false;
|
|
6813
|
-
var viewer = params.viewer, visualsManager = params.register,
|
|
6813
|
+
var viewer = params.viewer, visualsManager = params.register, getters = params.getters, item = params.item;
|
|
6814
6814
|
this.viewer = viewer;
|
|
6815
|
-
this.
|
|
6815
|
+
this.getters = getters;
|
|
6816
6816
|
this.item = item;
|
|
6817
6817
|
this.visualsManager = visualsManager;
|
|
6818
6818
|
}
|
|
@@ -6844,7 +6844,7 @@
|
|
|
6844
6844
|
return __generator(this, function (_d) {
|
|
6845
6845
|
switch (_d.label) {
|
|
6846
6846
|
case 0:
|
|
6847
|
-
api = this.
|
|
6847
|
+
api = this.getters.GetBruceApi();
|
|
6848
6848
|
return [4 /*yield*/, bruceModels.Tileset.Get({
|
|
6849
6849
|
api: api,
|
|
6850
6850
|
tilesetId: tilesetId
|
|
@@ -6868,11 +6868,11 @@
|
|
|
6868
6868
|
}
|
|
6869
6869
|
_a = this;
|
|
6870
6870
|
return [4 /*yield*/, exports.TilesetRenderEngine.Render({
|
|
6871
|
-
apiGetter: this.
|
|
6871
|
+
apiGetter: this.getters.GetBruceGetter(),
|
|
6872
6872
|
tileset: tileset,
|
|
6873
6873
|
viewer: this.viewer,
|
|
6874
6874
|
coords: coords,
|
|
6875
|
-
accountId: (_c = (_b = this.item.tileset) === null || _b === void 0 ? void 0 : _b.ClientAccountID) !== null && _c !== void 0 ? _c : this.
|
|
6875
|
+
accountId: (_c = (_b = this.item.tileset) === null || _b === void 0 ? void 0 : _b.ClientAccountID) !== null && _c !== void 0 ? _c : this.getters.GetAccountId(),
|
|
6876
6876
|
viaCdn: this.item.cdnEnabled
|
|
6877
6877
|
})];
|
|
6878
6878
|
case 3:
|
|
@@ -6938,7 +6938,7 @@
|
|
|
6938
6938
|
menuItemId: this.item.id,
|
|
6939
6939
|
priority: 0,
|
|
6940
6940
|
visual: feature,
|
|
6941
|
-
accountId: (_b = (_a = this.item.tileset) === null || _a === void 0 ? void 0 : _a.ClientAccountID) !== null && _b !== void 0 ? _b : this.
|
|
6941
|
+
accountId: (_b = (_a = this.item.tileset) === null || _a === void 0 ? void 0 : _a.ClientAccountID) !== null && _b !== void 0 ? _b : this.getters.GetAccountId(),
|
|
6942
6942
|
tilesetId: (_c = this.item.tileset) === null || _c === void 0 ? void 0 : _c.TilesetID,
|
|
6943
6943
|
rootId: this.rootId
|
|
6944
6944
|
};
|
|
@@ -7227,9 +7227,9 @@
|
|
|
7227
7227
|
this.entityTypeId = null;
|
|
7228
7228
|
this.queueCheckInterval = null;
|
|
7229
7229
|
this.processingQueue = 0;
|
|
7230
|
-
var viewer = params.viewer, visualsManager = params.register, apiGetter = params.
|
|
7230
|
+
var viewer = params.viewer, visualsManager = params.register, apiGetter = params.getters, monitor = params.monitor, item = params.item;
|
|
7231
7231
|
this.viewer = viewer;
|
|
7232
|
-
this.
|
|
7232
|
+
this.getters = apiGetter;
|
|
7233
7233
|
this.item = item;
|
|
7234
7234
|
this.visualsManager = visualsManager;
|
|
7235
7235
|
this.monitor = monitor;
|
|
@@ -7450,7 +7450,7 @@
|
|
|
7450
7450
|
for (i = 0; i < features.length; i++) {
|
|
7451
7451
|
_loop_1(i);
|
|
7452
7452
|
}
|
|
7453
|
-
api = this.
|
|
7453
|
+
api = this.getters.GetBruceApi();
|
|
7454
7454
|
return [4 /*yield*/, bruceModels.EntitySource.GetEntityIdsBySourceKeys({
|
|
7455
7455
|
api: api,
|
|
7456
7456
|
sourceId: this.sourceId,
|
|
@@ -7476,7 +7476,7 @@
|
|
|
7476
7476
|
entityTypeId: this.entityTypeId,
|
|
7477
7477
|
sourceId: this.sourceId,
|
|
7478
7478
|
sourceEntityId: osmId,
|
|
7479
|
-
accountId: this.
|
|
7479
|
+
accountId: this.getters.GetAccountId()
|
|
7480
7480
|
};
|
|
7481
7481
|
this.visualsManager.AddRego({
|
|
7482
7482
|
rego: rego
|
|
@@ -7531,9 +7531,9 @@
|
|
|
7531
7531
|
function Manager(params) {
|
|
7532
7532
|
this.disposed = false;
|
|
7533
7533
|
this.cTileset = null;
|
|
7534
|
-
var viewer = params.viewer, visualsManager = params.register, apiGetter = params.
|
|
7534
|
+
var viewer = params.viewer, visualsManager = params.register, apiGetter = params.getters, item = params.item;
|
|
7535
7535
|
this.viewer = viewer;
|
|
7536
|
-
this.
|
|
7536
|
+
this.getters = apiGetter;
|
|
7537
7537
|
this.item = item;
|
|
7538
7538
|
this.visualsManager = visualsManager;
|
|
7539
7539
|
}
|
|
@@ -7568,7 +7568,7 @@
|
|
|
7568
7568
|
return __generator(this, function (_d) {
|
|
7569
7569
|
switch (_d.label) {
|
|
7570
7570
|
case 0:
|
|
7571
|
-
api = this.
|
|
7571
|
+
api = this.getters.GetBruceApi();
|
|
7572
7572
|
return [4 /*yield*/, bruceModels.Tileset.Get({
|
|
7573
7573
|
api: api,
|
|
7574
7574
|
tilesetId: tilesetId
|
|
@@ -7581,10 +7581,10 @@
|
|
|
7581
7581
|
this.typeId = tileset.settings.entityTypeId;
|
|
7582
7582
|
_a = this;
|
|
7583
7583
|
return [4 /*yield*/, exports.TilesetRenderEngine.Render({
|
|
7584
|
-
apiGetter: this.
|
|
7584
|
+
apiGetter: this.getters.GetBruceGetter(),
|
|
7585
7585
|
tileset: tileset,
|
|
7586
7586
|
viewer: this.viewer,
|
|
7587
|
-
accountId: (_c = (_b = this.item.tileset) === null || _b === void 0 ? void 0 : _b.ClientAccountID) !== null && _c !== void 0 ? _c : this.
|
|
7587
|
+
accountId: (_c = (_b = this.item.tileset) === null || _b === void 0 ? void 0 : _b.ClientAccountID) !== null && _c !== void 0 ? _c : this.getters.GetAccountId(),
|
|
7588
7588
|
viaCdn: this.item.cdnEnabled
|
|
7589
7589
|
})];
|
|
7590
7590
|
case 2:
|
|
@@ -7663,7 +7663,7 @@
|
|
|
7663
7663
|
priority: 0,
|
|
7664
7664
|
visual: feature,
|
|
7665
7665
|
tilesetId: (_a = this.item.tileset) === null || _a === void 0 ? void 0 : _a.TilesetID,
|
|
7666
|
-
accountId: (_c = (_b = this.item.tileset) === null || _b === void 0 ? void 0 : _b.ClientAccountID) !== null && _c !== void 0 ? _c : this.
|
|
7666
|
+
accountId: (_c = (_b = this.item.tileset) === null || _b === void 0 ? void 0 : _b.ClientAccountID) !== null && _c !== void 0 ? _c : this.getters.GetAccountId()
|
|
7667
7667
|
};
|
|
7668
7668
|
this.visualsManager.AddRego({
|
|
7669
7669
|
rego: rego
|
|
@@ -7689,9 +7689,9 @@
|
|
|
7689
7689
|
function Manager(params) {
|
|
7690
7690
|
this.disposed = false;
|
|
7691
7691
|
this.cTileset = null;
|
|
7692
|
-
var viewer = params.viewer, apiGetter = params.
|
|
7692
|
+
var viewer = params.viewer, apiGetter = params.getters, item = params.item;
|
|
7693
7693
|
this.viewer = viewer;
|
|
7694
|
-
this.
|
|
7694
|
+
this.getters = apiGetter;
|
|
7695
7695
|
this.item = item;
|
|
7696
7696
|
}
|
|
7697
7697
|
Object.defineProperty(Manager.prototype, "Disposed", {
|
|
@@ -7716,33 +7716,65 @@
|
|
|
7716
7716
|
return;
|
|
7717
7717
|
}
|
|
7718
7718
|
(function () { return __awaiter(_this, void 0, void 0, function () {
|
|
7719
|
-
var api, tileset, cTileset, _a;
|
|
7719
|
+
var canAccess, e_1, accountId, api, tileset, cTileset, _a;
|
|
7720
7720
|
var _this = this;
|
|
7721
|
-
var _b, _c;
|
|
7722
|
-
return __generator(this, function (
|
|
7723
|
-
switch (
|
|
7721
|
+
var _b, _c, _d, _e;
|
|
7722
|
+
return __generator(this, function (_f) {
|
|
7723
|
+
switch (_f.label) {
|
|
7724
7724
|
case 0:
|
|
7725
|
-
|
|
7725
|
+
if (!tilesetId) return [3 /*break*/, 5];
|
|
7726
|
+
canAccess = false;
|
|
7727
|
+
_f.label = 1;
|
|
7728
|
+
case 1:
|
|
7729
|
+
_f.trys.push([1, 3, , 4]);
|
|
7730
|
+
return [4 /*yield*/, bruceModels.Tileset.Publish.IsAccessAllowed({
|
|
7731
|
+
sourceAccountId: this.getters.GetAccountId(),
|
|
7732
|
+
tilesetId: tilesetId,
|
|
7733
|
+
forAccountId: (_b = this.item.tileset) === null || _b === void 0 ? void 0 : _b.ClientAccountID,
|
|
7734
|
+
// TODO: we need to pass api-getters instance instead of bruce-api-getters around.
|
|
7735
|
+
api: null
|
|
7736
|
+
})];
|
|
7737
|
+
case 2:
|
|
7738
|
+
canAccess = _f.sent();
|
|
7739
|
+
return [3 /*break*/, 4];
|
|
7740
|
+
case 3:
|
|
7741
|
+
e_1 = _f.sent();
|
|
7742
|
+
console.error(e_1);
|
|
7743
|
+
return [3 /*break*/, 4];
|
|
7744
|
+
case 4:
|
|
7745
|
+
if (!canAccess) {
|
|
7746
|
+
console.warn("Cannot access tileset: ".concat(tilesetId, ", from account: ").concat((_c = this.item.tileset) === null || _c === void 0 ? void 0 : _c.ClientAccountID, "."));
|
|
7747
|
+
return [2 /*return*/];
|
|
7748
|
+
}
|
|
7749
|
+
return [3 /*break*/, 6];
|
|
7750
|
+
case 5:
|
|
7751
|
+
console.warn("No tileset id found. Skipping access check.");
|
|
7752
|
+
_f.label = 6;
|
|
7753
|
+
case 6:
|
|
7754
|
+
accountId = (_e = (_d = this.item.tileset) === null || _d === void 0 ? void 0 : _d.ClientAccountID) !== null && _e !== void 0 ? _e : this.getters.GetAccountId();
|
|
7755
|
+
api = this.getters.GetBruceApi({
|
|
7756
|
+
accountId: accountId
|
|
7757
|
+
});
|
|
7726
7758
|
return [4 /*yield*/, bruceModels.Tileset.Get({
|
|
7727
7759
|
api: api,
|
|
7728
7760
|
tilesetId: tilesetId
|
|
7729
7761
|
})];
|
|
7730
|
-
case
|
|
7731
|
-
tileset = (
|
|
7762
|
+
case 7:
|
|
7763
|
+
tileset = (_f.sent()).tileset;
|
|
7732
7764
|
if (!tileset || this.disposed) {
|
|
7733
7765
|
return [2 /*return*/];
|
|
7734
7766
|
}
|
|
7735
7767
|
_a = this;
|
|
7736
7768
|
return [4 /*yield*/, exports.TilesetRenderEngine.Render({
|
|
7737
|
-
apiGetter: this.
|
|
7769
|
+
apiGetter: this.getters.GetBruceGetter(),
|
|
7738
7770
|
tileset: tileset,
|
|
7739
7771
|
viewer: this.viewer,
|
|
7740
7772
|
coords: null,
|
|
7741
|
-
accountId:
|
|
7773
|
+
accountId: accountId,
|
|
7742
7774
|
viaCdn: this.item.cdnEnabled
|
|
7743
7775
|
})];
|
|
7744
|
-
case
|
|
7745
|
-
cTileset = _a.cTileset =
|
|
7776
|
+
case 8:
|
|
7777
|
+
cTileset = _a.cTileset = _f.sent();
|
|
7746
7778
|
if (this.disposed) {
|
|
7747
7779
|
this.doDispose();
|
|
7748
7780
|
return [2 /*return*/];
|
|
@@ -7949,7 +7981,7 @@
|
|
|
7949
7981
|
this.cTileset = null;
|
|
7950
7982
|
this.styler = null;
|
|
7951
7983
|
this.viewer = params.viewer;
|
|
7952
|
-
this.
|
|
7984
|
+
this.getters = params.getters;
|
|
7953
7985
|
this.visualsManager = params.register;
|
|
7954
7986
|
// We modify the object due to a lot of backwards compatibility.
|
|
7955
7987
|
try {
|
|
@@ -8002,24 +8034,52 @@
|
|
|
8002
8034
|
}
|
|
8003
8035
|
var tilesetId = (_c = this.item.tileset) === null || _c === void 0 ? void 0 : _c.TilesetID;
|
|
8004
8036
|
(function () { return __awaiter(_this, void 0, void 0, function () {
|
|
8005
|
-
var _a, tileset, type, _b, LEGACY_TYPES, legacyTileset, _c, accountId, _d, _e;
|
|
8037
|
+
var canAccess, e_3, _a, tileset, type, _b, LEGACY_TYPES, legacyTileset, _c, accountId, _d, _e;
|
|
8006
8038
|
var _this = this;
|
|
8007
|
-
var _f, _g, _h, _j, _k;
|
|
8008
|
-
return __generator(this, function (
|
|
8009
|
-
switch (
|
|
8039
|
+
var _f, _g, _h, _j, _k, _l, _m;
|
|
8040
|
+
return __generator(this, function (_o) {
|
|
8041
|
+
switch (_o.label) {
|
|
8010
8042
|
case 0:
|
|
8011
|
-
if (!tilesetId) return [3 /*break*/,
|
|
8043
|
+
if (!tilesetId) return [3 /*break*/, 5];
|
|
8044
|
+
canAccess = false;
|
|
8045
|
+
_o.label = 1;
|
|
8046
|
+
case 1:
|
|
8047
|
+
_o.trys.push([1, 3, , 4]);
|
|
8048
|
+
return [4 /*yield*/, bruceModels.Tileset.Publish.IsAccessAllowed({
|
|
8049
|
+
sourceAccountId: this.getters.GetAccountId(),
|
|
8050
|
+
tilesetId: tilesetId,
|
|
8051
|
+
forAccountId: (_f = this.item.tileset) === null || _f === void 0 ? void 0 : _f.ClientAccountID,
|
|
8052
|
+
api: this.getters.GetGlobalApi()
|
|
8053
|
+
})];
|
|
8054
|
+
case 2:
|
|
8055
|
+
canAccess = _o.sent();
|
|
8056
|
+
return [3 /*break*/, 4];
|
|
8057
|
+
case 3:
|
|
8058
|
+
e_3 = _o.sent();
|
|
8059
|
+
console.error(e_3);
|
|
8060
|
+
return [3 /*break*/, 4];
|
|
8061
|
+
case 4:
|
|
8062
|
+
if (!canAccess) {
|
|
8063
|
+
console.warn("Cannot access tileset: ".concat(tilesetId, ", from account: ").concat((_g = this.item.tileset) === null || _g === void 0 ? void 0 : _g.ClientAccountID, "."));
|
|
8064
|
+
return [2 /*return*/];
|
|
8065
|
+
}
|
|
8066
|
+
return [3 /*break*/, 6];
|
|
8067
|
+
case 5:
|
|
8068
|
+
console.warn("No tileset id found. Skipping access check.");
|
|
8069
|
+
_o.label = 6;
|
|
8070
|
+
case 6:
|
|
8071
|
+
if (!tilesetId) return [3 /*break*/, 8];
|
|
8012
8072
|
return [4 /*yield*/, getTileset({
|
|
8013
|
-
apiGetter: this.
|
|
8073
|
+
apiGetter: this.getters.GetBruceGetter(),
|
|
8014
8074
|
menuItem: this.item
|
|
8015
8075
|
})];
|
|
8016
|
-
case
|
|
8017
|
-
_b =
|
|
8018
|
-
return [3 /*break*/,
|
|
8019
|
-
case
|
|
8076
|
+
case 7:
|
|
8077
|
+
_b = _o.sent();
|
|
8078
|
+
return [3 /*break*/, 9];
|
|
8079
|
+
case 8:
|
|
8020
8080
|
_b = { tileset: null, type: null };
|
|
8021
|
-
|
|
8022
|
-
case
|
|
8081
|
+
_o.label = 9;
|
|
8082
|
+
case 9:
|
|
8023
8083
|
_a = _b, tileset = _a.tileset, type = _a.type;
|
|
8024
8084
|
if (this.disposed) {
|
|
8025
8085
|
return [2 /*return*/];
|
|
@@ -8032,57 +8092,57 @@
|
|
|
8032
8092
|
bruceModels.Tileset.EType.LegacyExternal,
|
|
8033
8093
|
bruceModels.Tileset.EType.LegacyStatic
|
|
8034
8094
|
];
|
|
8035
|
-
if (!(!type || LEGACY_TYPES.includes(type))) return [3 /*break*/,
|
|
8036
|
-
if (!tileset) return [3 /*break*/,
|
|
8095
|
+
if (!(!type || LEGACY_TYPES.includes(type))) return [3 /*break*/, 14];
|
|
8096
|
+
if (!tileset) return [3 /*break*/, 11];
|
|
8037
8097
|
return [4 /*yield*/, getLegacyTileset({
|
|
8038
|
-
apiGetter: this.
|
|
8098
|
+
apiGetter: this.getters.GetBruceGetter(),
|
|
8039
8099
|
menuItem: this.item,
|
|
8040
8100
|
tileset: tileset
|
|
8041
8101
|
})];
|
|
8042
|
-
case
|
|
8043
|
-
_c =
|
|
8044
|
-
return [3 /*break*/,
|
|
8045
|
-
case
|
|
8102
|
+
case 10:
|
|
8103
|
+
_c = _o.sent();
|
|
8104
|
+
return [3 /*break*/, 12];
|
|
8105
|
+
case 11:
|
|
8046
8106
|
_c = null;
|
|
8047
|
-
|
|
8048
|
-
case
|
|
8107
|
+
_o.label = 12;
|
|
8108
|
+
case 12:
|
|
8049
8109
|
legacyTileset = _c;
|
|
8050
8110
|
if (this.disposed) {
|
|
8051
8111
|
return [2 /*return*/];
|
|
8052
8112
|
}
|
|
8053
|
-
accountId = (
|
|
8113
|
+
accountId = (_j = (_h = this.item) === null || _h === void 0 ? void 0 : _h.tileset) === null || _j === void 0 ? void 0 : _j.ClientAccountID;
|
|
8054
8114
|
if (!accountId) {
|
|
8055
|
-
accountId = this.
|
|
8115
|
+
accountId = this.getters.GetAccountId();
|
|
8056
8116
|
}
|
|
8057
8117
|
_d = this;
|
|
8058
8118
|
return [4 /*yield*/, exports.TilesetRenderEngine.RenderLegacy({
|
|
8059
|
-
apiGetter: this.
|
|
8119
|
+
apiGetter: this.getters.GetBruceGetter(),
|
|
8060
8120
|
tileset: legacyTileset,
|
|
8061
8121
|
viewer: this.viewer,
|
|
8062
|
-
ionId: (
|
|
8122
|
+
ionId: (_k = this.item.IonResource) === null || _k === void 0 ? void 0 : _k.AssetID,
|
|
8063
8123
|
loadUrl: loadUrlOverride,
|
|
8064
8124
|
accountId: accountId,
|
|
8065
8125
|
viaCdn: true
|
|
8066
8126
|
})];
|
|
8067
|
-
case
|
|
8068
|
-
_d.cTileset =
|
|
8069
|
-
return [3 /*break*/,
|
|
8070
|
-
case
|
|
8071
|
-
if (!tileset) return [3 /*break*/,
|
|
8127
|
+
case 13:
|
|
8128
|
+
_d.cTileset = _o.sent();
|
|
8129
|
+
return [3 /*break*/, 16];
|
|
8130
|
+
case 14:
|
|
8131
|
+
if (!tileset) return [3 /*break*/, 16];
|
|
8072
8132
|
_e = this;
|
|
8073
8133
|
return [4 /*yield*/, exports.TilesetRenderEngine.Render({
|
|
8074
|
-
apiGetter: this.
|
|
8134
|
+
apiGetter: this.getters.GetBruceGetter(),
|
|
8075
8135
|
tileset: tileset,
|
|
8076
8136
|
viewer: this.viewer,
|
|
8077
8137
|
coords: null,
|
|
8078
|
-
accountId: (
|
|
8138
|
+
accountId: (_m = (_l = this.item.tileset) === null || _l === void 0 ? void 0 : _l.ClientAccountID) !== null && _m !== void 0 ? _m : this.getters.GetAccountId(),
|
|
8079
8139
|
// Not doing viaCDN here because I fear it'll break something since this is a legacy menu item type.
|
|
8080
8140
|
viaCdn: false
|
|
8081
8141
|
})];
|
|
8082
|
-
case
|
|
8083
|
-
_e.cTileset =
|
|
8084
|
-
|
|
8085
|
-
case
|
|
8142
|
+
case 15:
|
|
8143
|
+
_e.cTileset = _o.sent();
|
|
8144
|
+
_o.label = 16;
|
|
8145
|
+
case 16:
|
|
8086
8146
|
if (this.disposed) {
|
|
8087
8147
|
this.doDispose();
|
|
8088
8148
|
return [2 /*return*/];
|
|
@@ -8091,7 +8151,7 @@
|
|
|
8091
8151
|
try {
|
|
8092
8152
|
if (_this.item.ApplyStyles ||
|
|
8093
8153
|
_this.item.Type == bruceModels.MenuItem.EType.IonTileset) {
|
|
8094
|
-
var api = _this.
|
|
8154
|
+
var api = _this.getters.GetBruceApi();
|
|
8095
8155
|
_this.styler = new exports.TilesetRenderEngine.Styler(api, _this.cTileset, _this.item.styleId, _this.item.StyleMapping, _this.item.id, _this.visualsManager);
|
|
8096
8156
|
}
|
|
8097
8157
|
_this.onCTilesetLoad();
|
|
@@ -8181,7 +8241,7 @@
|
|
|
8181
8241
|
menuItemId: this.item.id,
|
|
8182
8242
|
priority: 0,
|
|
8183
8243
|
visual: feature,
|
|
8184
|
-
accountId: (_b = (_a = this.item.tileset) === null || _a === void 0 ? void 0 : _a.ClientAccountID) !== null && _b !== void 0 ? _b : this.
|
|
8244
|
+
accountId: (_b = (_a = this.item.tileset) === null || _a === void 0 ? void 0 : _a.ClientAccountID) !== null && _b !== void 0 ? _b : this.getters.GetAccountId(),
|
|
8185
8245
|
tilesetId: (_c = this.item.tileset) === null || _c === void 0 ? void 0 : _c.TilesetID
|
|
8186
8246
|
};
|
|
8187
8247
|
// Two different methods for two different Cesium versions...
|
|
@@ -8514,8 +8574,14 @@
|
|
|
8514
8574
|
if (this.viewer.isDestroyed()) {
|
|
8515
8575
|
return null;
|
|
8516
8576
|
}
|
|
8517
|
-
if (!params.
|
|
8518
|
-
params.
|
|
8577
|
+
if (!params.getters) {
|
|
8578
|
+
params.getters = bruceModels.ENVIRONMENT.Api();
|
|
8579
|
+
}
|
|
8580
|
+
if (params.apiGetter && !params.getters) {
|
|
8581
|
+
console.warn("RenderItem(): Please pass getters instead of apiGetter. This is now deprecated due to needing access to other kinds of apis.");
|
|
8582
|
+
}
|
|
8583
|
+
else if (!params.apiGetter) {
|
|
8584
|
+
params.apiGetter = params.getters.GetBruceGetter();
|
|
8519
8585
|
}
|
|
8520
8586
|
var rItem = this.items.find(function (x) { return x.id == params.item.id; });
|
|
8521
8587
|
if (rItem) {
|
|
@@ -8587,7 +8653,7 @@
|
|
|
8587
8653
|
rItem.renderManager = new exports.TilesetCadRenderManager.Manager({
|
|
8588
8654
|
viewer: this.viewer,
|
|
8589
8655
|
register: this.visualsRegister,
|
|
8590
|
-
|
|
8656
|
+
getters: params.getters,
|
|
8591
8657
|
item: params.item
|
|
8592
8658
|
});
|
|
8593
8659
|
break;
|
|
@@ -8595,7 +8661,7 @@
|
|
|
8595
8661
|
rItem.renderManager = new exports.TilesetOsmRenderManager.Manager({
|
|
8596
8662
|
viewer: this.viewer,
|
|
8597
8663
|
register: this.visualsRegister,
|
|
8598
|
-
|
|
8664
|
+
getters: params.getters,
|
|
8599
8665
|
monitor: this.sharedMonitor,
|
|
8600
8666
|
item: params.item
|
|
8601
8667
|
});
|
|
@@ -8603,7 +8669,7 @@
|
|
|
8603
8669
|
case bruceModels.MenuItem.EType.PointCloud:
|
|
8604
8670
|
rItem.renderManager = new exports.TilesetPointcloudRenderManager.Manager({
|
|
8605
8671
|
viewer: this.viewer,
|
|
8606
|
-
|
|
8672
|
+
getters: params.getters,
|
|
8607
8673
|
item: params.item
|
|
8608
8674
|
});
|
|
8609
8675
|
break;
|
|
@@ -8611,7 +8677,7 @@
|
|
|
8611
8677
|
rItem.renderManager = new exports.TilesetEntitiesRenderManager.Manager({
|
|
8612
8678
|
viewer: this.viewer,
|
|
8613
8679
|
register: this.visualsRegister,
|
|
8614
|
-
|
|
8680
|
+
getters: params.getters,
|
|
8615
8681
|
item: params.item
|
|
8616
8682
|
});
|
|
8617
8683
|
break;
|
|
@@ -8625,7 +8691,7 @@
|
|
|
8625
8691
|
case bruceModels.MenuItem.EType.IonTileset:
|
|
8626
8692
|
case bruceModels.MenuItem.EType.ArbTileset:
|
|
8627
8693
|
rItem.renderManager = new exports.TilesetArbRenderManager.Manager({
|
|
8628
|
-
|
|
8694
|
+
getters: params.getters,
|
|
8629
8695
|
item: params.item,
|
|
8630
8696
|
viewer: this.viewer,
|
|
8631
8697
|
register: this.visualsRegister
|
|
@@ -14202,7 +14268,7 @@
|
|
|
14202
14268
|
ViewerUtils.CreateWidgets = CreateWidgets;
|
|
14203
14269
|
})(exports.ViewerUtils || (exports.ViewerUtils = {}));
|
|
14204
14270
|
|
|
14205
|
-
var VERSION$1 = "2.3.
|
|
14271
|
+
var VERSION$1 = "2.3.5";
|
|
14206
14272
|
|
|
14207
14273
|
exports.VERSION = VERSION$1;
|
|
14208
14274
|
exports.CesiumViewMonitor = CesiumViewMonitor;
|