bruce-cesium 2.6.8 → 2.6.9
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 +46 -12
- package/dist/bruce-cesium.es5.js.map +1 -1
- package/dist/bruce-cesium.umd.js +45 -11
- package/dist/bruce-cesium.umd.js.map +1 -1
- package/dist/lib/bruce-cesium.js +1 -1
- package/dist/lib/rendering/render-managers/tilesets/tileset-entities-render-manager.js +44 -10
- package/dist/lib/rendering/render-managers/tilesets/tileset-entities-render-manager.js.map +1 -1
- package/dist/types/bruce-cesium.d.ts +1 -1
- package/package.json +1 -1
package/dist/lib/bruce-cesium.js
CHANGED
|
@@ -45,5 +45,5 @@ __exportStar(require("./utils/measure-utils"), exports);
|
|
|
45
45
|
__exportStar(require("./utils/entity-utils"), exports);
|
|
46
46
|
__exportStar(require("./widgets/common/draw-3d-polygon"), exports);
|
|
47
47
|
__exportStar(require("./widgets/common/draw-3d-polyline"), exports);
|
|
48
|
-
exports.VERSION = "2.6.
|
|
48
|
+
exports.VERSION = "2.6.9";
|
|
49
49
|
//# sourceMappingURL=bruce-cesium.js.map
|
|
@@ -77,19 +77,53 @@ var TilesetEntitiesRenderManager;
|
|
|
77
77
|
return [2 /*return*/];
|
|
78
78
|
}
|
|
79
79
|
(function () { return __awaiter(_this, void 0, void 0, function () {
|
|
80
|
-
var api, tileset, cTileset, _a;
|
|
80
|
+
var canAccess, e_1, accountId, api, tileset, cTileset, _a;
|
|
81
81
|
var _this = this;
|
|
82
|
-
var _b, _c;
|
|
83
|
-
return __generator(this, function (
|
|
84
|
-
switch (
|
|
82
|
+
var _b, _c, _d;
|
|
83
|
+
return __generator(this, function (_e) {
|
|
84
|
+
switch (_e.label) {
|
|
85
85
|
case 0:
|
|
86
|
-
|
|
86
|
+
if (!tilesetId) return [3 /*break*/, 5];
|
|
87
|
+
canAccess = false;
|
|
88
|
+
_e.label = 1;
|
|
89
|
+
case 1:
|
|
90
|
+
_e.trys.push([1, 3, , 4]);
|
|
91
|
+
return [4 /*yield*/, bruce_models_1.Tileset.Publish.IsAccessAllowed({
|
|
92
|
+
sourceAccountId: (_b = this.item.tileset) === null || _b === void 0 ? void 0 : _b.ClientAccountID,
|
|
93
|
+
tilesetId: tilesetId,
|
|
94
|
+
forAccountId: this.getters.GetAccountId(),
|
|
95
|
+
api: this.getters.GetGlobalApi()
|
|
96
|
+
})];
|
|
97
|
+
case 2:
|
|
98
|
+
canAccess = _e.sent();
|
|
99
|
+
return [3 /*break*/, 4];
|
|
100
|
+
case 3:
|
|
101
|
+
e_1 = _e.sent();
|
|
102
|
+
console.error(e_1);
|
|
103
|
+
return [3 /*break*/, 4];
|
|
104
|
+
case 4:
|
|
105
|
+
if (!canAccess) {
|
|
106
|
+
console.warn("Cannot access tileset: ".concat(tilesetId, ", from account: ").concat((_c = this.item.tileset) === null || _c === void 0 ? void 0 : _c.ClientAccountID, "."));
|
|
107
|
+
return [2 /*return*/];
|
|
108
|
+
}
|
|
109
|
+
return [3 /*break*/, 6];
|
|
110
|
+
case 5:
|
|
111
|
+
console.warn("No tileset id found. Skipping access check.");
|
|
112
|
+
_e.label = 6;
|
|
113
|
+
case 6:
|
|
114
|
+
accountId = (_d = this.item.tileset) === null || _d === void 0 ? void 0 : _d.ClientAccountID;
|
|
115
|
+
if (!accountId) {
|
|
116
|
+
accountId = this.getters.GetAccountId();
|
|
117
|
+
}
|
|
118
|
+
api = this.getters.GetBruceApi({
|
|
119
|
+
accountId: accountId
|
|
120
|
+
});
|
|
87
121
|
return [4 /*yield*/, bruce_models_1.Tileset.Get({
|
|
88
122
|
api: api,
|
|
89
123
|
tilesetId: tilesetId
|
|
90
124
|
})];
|
|
91
|
-
case
|
|
92
|
-
tileset = (
|
|
125
|
+
case 7:
|
|
126
|
+
tileset = (_e.sent()).tileset;
|
|
93
127
|
if (!tileset || this.disposed) {
|
|
94
128
|
return [2 /*return*/];
|
|
95
129
|
}
|
|
@@ -99,11 +133,11 @@ var TilesetEntitiesRenderManager;
|
|
|
99
133
|
apiGetter: this.getters.GetBruceGetter(),
|
|
100
134
|
tileset: tileset,
|
|
101
135
|
viewer: this.viewer,
|
|
102
|
-
accountId:
|
|
136
|
+
accountId: accountId,
|
|
103
137
|
viaCdn: this.item.cdnEnabled
|
|
104
138
|
})];
|
|
105
|
-
case
|
|
106
|
-
cTileset = _a.cTileset =
|
|
139
|
+
case 8:
|
|
140
|
+
cTileset = _a.cTileset = _e.sent();
|
|
107
141
|
if (this.disposed) {
|
|
108
142
|
this.doDispose();
|
|
109
143
|
return [2 /*return*/];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tileset-entities-render-manager.js","sourceRoot":"","sources":["../../../../../src/rendering/render-managers/tilesets/tileset-entities-render-manager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAAuE;AAGvE,+BAAiC;AACjC,qEAAkE;AAElE,IAAiB,4BAA4B,
|
|
1
|
+
{"version":3,"file":"tileset-entities-render-manager.js","sourceRoot":"","sources":["../../../../../src/rendering/render-managers/tilesets/tileset-entities-render-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,4 +28,4 @@ export * from "./utils/measure-utils";
|
|
|
28
28
|
export * from "./utils/entity-utils";
|
|
29
29
|
export * from "./widgets/common/draw-3d-polygon";
|
|
30
30
|
export * from "./widgets/common/draw-3d-polyline";
|
|
31
|
-
export declare const VERSION = "2.6.
|
|
31
|
+
export declare const VERSION = "2.6.9";
|