bruce-cesium 2.7.8 → 2.8.0
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 +427 -242
- package/dist/bruce-cesium.es5.js.map +1 -1
- package/dist/bruce-cesium.umd.js +426 -241
- 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 +8 -0
- package/dist/lib/rendering/menu-item-manager.js.map +1 -1
- package/dist/lib/rendering/relation-render-engine.js +94 -55
- package/dist/lib/rendering/relation-render-engine.js.map +1 -1
- package/dist/lib/rendering/render-managers/common/cesium-parabola.js +3 -11
- package/dist/lib/rendering/render-managers/common/cesium-parabola.js.map +1 -1
- package/dist/lib/rendering/render-managers/other/relations-render-manager.js +197 -48
- package/dist/lib/rendering/render-managers/other/relations-render-manager.js.map +1 -1
- package/dist/lib/rendering/render-managers/tilesets/tileset-entities-render-manager.js +118 -124
- package/dist/lib/rendering/render-managers/tilesets/tileset-entities-render-manager.js.map +1 -1
- package/dist/lib/rendering/view-render-engine.js +2 -2
- package/dist/lib/rendering/view-render-engine.js.map +1 -1
- package/dist/types/bruce-cesium.d.ts +1 -1
- package/dist/types/rendering/render-managers/other/relations-render-manager.d.ts +30 -1
- package/dist/types/rendering/render-managers/tilesets/tileset-entities-render-manager.d.ts +1 -1
- package/package.json +2 -2
|
@@ -43,6 +43,8 @@ var RelationsRenderManager;
|
|
|
43
43
|
(function (RelationsRenderManager) {
|
|
44
44
|
var Manager = /** @class */ (function () {
|
|
45
45
|
function Manager(params) {
|
|
46
|
+
// If true, this menu item is disposed and should not be used.
|
|
47
|
+
// Any rendering will be ignored.
|
|
46
48
|
this.disposed = false;
|
|
47
49
|
var apiGetter = params.apiGetter, item = params.item, register = params.register, viewer = params.viewer;
|
|
48
50
|
this.apiGetter = apiGetter;
|
|
@@ -58,56 +60,61 @@ var RelationsRenderManager;
|
|
|
58
60
|
configurable: true
|
|
59
61
|
});
|
|
60
62
|
;
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
var
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
63
|
+
/**
|
|
64
|
+
* Starts rendering the menu item.
|
|
65
|
+
* Re-call with an updated menu item to re-render. It will auto-cleanup old relations.
|
|
66
|
+
* @param params
|
|
67
|
+
* @returns
|
|
68
|
+
*/
|
|
69
|
+
Manager.prototype.Init = function (params) {
|
|
70
|
+
var _a;
|
|
71
|
+
if (this.disposed) {
|
|
72
|
+
return;
|
|
73
|
+
}
|
|
74
|
+
if (params === null || params === void 0 ? void 0 : params.item) {
|
|
75
|
+
this.item = params.item;
|
|
76
|
+
}
|
|
77
|
+
// Remove relationships we no longer want to render.
|
|
78
|
+
// We'll have to get regos by the menu item ID then run a check on the related rego relationship.
|
|
79
|
+
var regos = this.register.GetRegos({
|
|
80
|
+
menuItemId: this.item.id
|
|
81
|
+
});
|
|
82
|
+
var drawnIds = [];
|
|
83
|
+
var toDrawIds = [];
|
|
84
|
+
var entityIds = (_a = this.item.BruceEntity) === null || _a === void 0 ? void 0 : _a.EntityIds;
|
|
85
|
+
if (!(entityIds === null || entityIds === void 0 ? void 0 : entityIds.length)) {
|
|
86
|
+
entityIds = [];
|
|
87
|
+
}
|
|
88
|
+
for (var i = 0; i < regos.length; i++) {
|
|
89
|
+
var rego = regos[i];
|
|
90
|
+
if (!this.shouldRenderRelation(rego.relation)) {
|
|
91
|
+
this.register.RemoveRegos({
|
|
92
|
+
relation: rego.relation,
|
|
93
|
+
entityId: rego.entityId,
|
|
94
|
+
menuItemId: this.item.id,
|
|
95
|
+
requestRender: false
|
|
96
|
+
});
|
|
97
|
+
}
|
|
98
|
+
else {
|
|
99
|
+
drawnIds.push(rego.entityId);
|
|
100
|
+
if (rego.relation) {
|
|
101
|
+
drawnIds.push(rego.relation["Principal.Entity.ID"]);
|
|
73
102
|
}
|
|
74
103
|
}
|
|
104
|
+
}
|
|
105
|
+
this.viewer.scene.requestRender();
|
|
106
|
+
var _loop_1 = function (i) {
|
|
107
|
+
if (!drawnIds.find(function (x) { return x == entityIds[i]; })) {
|
|
108
|
+
toDrawIds.push(entityIds[i]);
|
|
109
|
+
}
|
|
75
110
|
};
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
api: api,
|
|
80
|
-
entityId: entityId,
|
|
81
|
-
filter: {
|
|
82
|
-
oneWayOnly: false,
|
|
83
|
-
loadEntityData: false
|
|
84
|
-
}
|
|
85
|
-
}).then(function (data) {
|
|
86
|
-
var _a;
|
|
87
|
-
var relations = data.relations;
|
|
88
|
-
var _loop_1 = function (j) {
|
|
89
|
-
var relation = relations[j];
|
|
90
|
-
if (((_a = _this.item.relationTypeIds) === null || _a === void 0 ? void 0 : _a.length) && !_this.item.relationTypeIds.includes(relation["Relation.Type.ID"])) {
|
|
91
|
-
return "continue";
|
|
92
|
-
}
|
|
93
|
-
var key = relation_render_engine_1.RelationRenderEngine.GetRenderGroupId(relation);
|
|
94
|
-
if (!drawn.find(function (x) { return x == key; })) {
|
|
95
|
-
drawn.push(key);
|
|
96
|
-
drawBatch.push(relation);
|
|
97
|
-
if (drawBatch.length >= BATCH_SIZE) {
|
|
98
|
-
_this.onGetterUpdate(drawBatch);
|
|
99
|
-
drawBatch = [];
|
|
100
|
-
}
|
|
101
|
-
}
|
|
102
|
-
};
|
|
103
|
-
for (var j = 0; j < relations.length; j++) {
|
|
104
|
-
_loop_1(j);
|
|
105
|
-
}
|
|
106
|
-
onResolve();
|
|
107
|
-
}).catch(function (e) {
|
|
108
|
-
onResolve();
|
|
109
|
-
});
|
|
111
|
+
// We'll call a re-render on entity ids that are not drawn.
|
|
112
|
+
for (var i = 0; i < entityIds.length; i++) {
|
|
113
|
+
_loop_1(i);
|
|
110
114
|
}
|
|
115
|
+
this.renderEntityIds({
|
|
116
|
+
entityIds: toDrawIds
|
|
117
|
+
});
|
|
111
118
|
};
|
|
112
119
|
Manager.prototype.Dispose = function () {
|
|
113
120
|
if (this.disposed) {
|
|
@@ -118,6 +125,11 @@ var RelationsRenderManager;
|
|
|
118
125
|
menuItemId: this.item.id
|
|
119
126
|
});
|
|
120
127
|
};
|
|
128
|
+
/**
|
|
129
|
+
* Re-renders specific entity relationships.
|
|
130
|
+
* @TODO: This should re-render all relationships when entityIds=null.
|
|
131
|
+
* @param params
|
|
132
|
+
*/
|
|
121
133
|
Manager.prototype.ReRender = function (params) {
|
|
122
134
|
return __awaiter(this, void 0, void 0, function () {
|
|
123
135
|
var entityIds, force;
|
|
@@ -126,15 +138,142 @@ var RelationsRenderManager;
|
|
|
126
138
|
if (entityIds == null) {
|
|
127
139
|
}
|
|
128
140
|
else {
|
|
141
|
+
this.renderEntityIds({
|
|
142
|
+
dataEntityIds: entityIds
|
|
143
|
+
});
|
|
144
|
+
}
|
|
145
|
+
return [2 /*return*/];
|
|
146
|
+
});
|
|
147
|
+
});
|
|
148
|
+
};
|
|
149
|
+
/**
|
|
150
|
+
* Gets relationship records corresponding to provided IDs and requests a render for them.
|
|
151
|
+
*/
|
|
152
|
+
Manager.prototype.renderEntityIds = function (params) {
|
|
153
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
154
|
+
var entityIds, dataEntityIds, drawn, api, BATCH_SIZE, drawBatch, pending, onResolve, i, entityId, i, entityId;
|
|
155
|
+
var _this = this;
|
|
156
|
+
return __generator(this, function (_a) {
|
|
157
|
+
if (this.disposed || this.viewer.isDestroyed()) {
|
|
158
|
+
return [2 /*return*/];
|
|
159
|
+
}
|
|
160
|
+
entityIds = params.entityIds, dataEntityIds = params.dataEntityIds;
|
|
161
|
+
if (!(entityIds === null || entityIds === void 0 ? void 0 : entityIds.length)) {
|
|
162
|
+
entityIds = [];
|
|
163
|
+
}
|
|
164
|
+
if (!(dataEntityIds === null || dataEntityIds === void 0 ? void 0 : dataEntityIds.length)) {
|
|
165
|
+
dataEntityIds = [];
|
|
166
|
+
}
|
|
167
|
+
drawn = [];
|
|
168
|
+
api = this.apiGetter.getApi(this.apiGetter.accountId);
|
|
169
|
+
BATCH_SIZE = 5;
|
|
170
|
+
drawBatch = [];
|
|
171
|
+
pending = entityIds.length + dataEntityIds.length;
|
|
172
|
+
onResolve = function () {
|
|
173
|
+
if (_this.disposed || _this.viewer.isDestroyed()) {
|
|
174
|
+
return;
|
|
175
|
+
}
|
|
176
|
+
pending -= 1;
|
|
177
|
+
if (pending <= 0) {
|
|
178
|
+
if (drawBatch === null || drawBatch === void 0 ? void 0 : drawBatch.length) {
|
|
179
|
+
_this.onGetterUpdate(drawBatch);
|
|
180
|
+
}
|
|
181
|
+
}
|
|
182
|
+
};
|
|
183
|
+
// Get relationships by their data entity ID.
|
|
184
|
+
for (i = 0; i < dataEntityIds.length; i++) {
|
|
185
|
+
entityId = dataEntityIds[i];
|
|
186
|
+
bruce_models_1.EntityRelation.GetByDataEntityId({
|
|
187
|
+
entityId: entityId,
|
|
188
|
+
api: api
|
|
189
|
+
}).then(function (data) {
|
|
190
|
+
if (data.relation) {
|
|
191
|
+
var relation = data.relation;
|
|
192
|
+
var key_1 = relation_render_engine_1.RelationRenderEngine.GetRenderGroupId(relation);
|
|
193
|
+
if (!drawn.find(function (x) { return x == key_1; })) {
|
|
194
|
+
drawn.push(key_1);
|
|
195
|
+
drawBatch.push(relation);
|
|
196
|
+
if (drawBatch.length >= BATCH_SIZE) {
|
|
197
|
+
_this.onGetterUpdate(drawBatch);
|
|
198
|
+
drawBatch = [];
|
|
199
|
+
}
|
|
200
|
+
}
|
|
201
|
+
}
|
|
202
|
+
onResolve();
|
|
203
|
+
}).catch(function (e) {
|
|
204
|
+
onResolve();
|
|
205
|
+
});
|
|
206
|
+
}
|
|
207
|
+
// Get relationships by either the parent or child ID.
|
|
208
|
+
for (i = 0; i < entityIds.length; i++) {
|
|
209
|
+
entityId = entityIds[i];
|
|
210
|
+
bruce_models_1.EntityRelation.GetList({
|
|
211
|
+
api: api,
|
|
212
|
+
entityId: entityId,
|
|
213
|
+
filter: {
|
|
214
|
+
oneWayOnly: false,
|
|
215
|
+
loadEntityData: false
|
|
216
|
+
}
|
|
217
|
+
}).then(function (data) {
|
|
218
|
+
var relations = data.relations;
|
|
219
|
+
var _loop_2 = function (j) {
|
|
220
|
+
var relation = relations[j];
|
|
221
|
+
var key = relation_render_engine_1.RelationRenderEngine.GetRenderGroupId(relation);
|
|
222
|
+
if (!drawn.find(function (x) { return x == key; })) {
|
|
223
|
+
drawn.push(key);
|
|
224
|
+
drawBatch.push(relation);
|
|
225
|
+
if (drawBatch.length >= BATCH_SIZE) {
|
|
226
|
+
_this.onGetterUpdate(drawBatch);
|
|
227
|
+
drawBatch = [];
|
|
228
|
+
}
|
|
229
|
+
}
|
|
230
|
+
};
|
|
231
|
+
for (var j = 0; j < relations.length; j++) {
|
|
232
|
+
_loop_2(j);
|
|
233
|
+
}
|
|
234
|
+
onResolve();
|
|
235
|
+
}).catch(function (e) {
|
|
236
|
+
onResolve();
|
|
237
|
+
});
|
|
129
238
|
}
|
|
130
239
|
return [2 /*return*/];
|
|
131
240
|
});
|
|
132
241
|
});
|
|
133
242
|
};
|
|
243
|
+
/**
|
|
244
|
+
* Returns if a relation should be rendered.
|
|
245
|
+
* This is in case the menu item was updated and the relation is no longer relevant.
|
|
246
|
+
* @param relation
|
|
247
|
+
*/
|
|
248
|
+
Manager.prototype.shouldRenderRelation = function (relation) {
|
|
249
|
+
var _a, _b, _c;
|
|
250
|
+
if (((_a = this.item.relationTypeIds) === null || _a === void 0 ? void 0 : _a.length) && !this.item.relationTypeIds.includes(relation["Relation.Type.ID"])) {
|
|
251
|
+
return false;
|
|
252
|
+
}
|
|
253
|
+
var renderedIds = (_c = (_b = this.item) === null || _b === void 0 ? void 0 : _b.BruceEntity) === null || _c === void 0 ? void 0 : _c.EntityIds;
|
|
254
|
+
if (!renderedIds) {
|
|
255
|
+
return false;
|
|
256
|
+
}
|
|
257
|
+
var ids = [
|
|
258
|
+
relation["Principal.Entity.ID"],
|
|
259
|
+
relation["Related.Entity.ID"]
|
|
260
|
+
];
|
|
261
|
+
if (relation["Data.Entity.ID"]) {
|
|
262
|
+
ids.push(relation["Data.Entity.ID"]);
|
|
263
|
+
}
|
|
264
|
+
return ids.some(function (x) { return renderedIds.includes(x); });
|
|
265
|
+
};
|
|
266
|
+
/**
|
|
267
|
+
* Renders batch of entity relationships.
|
|
268
|
+
* This will check if a relationship SHOULD be rendered before rendering it.
|
|
269
|
+
* It will also handle already rendered relations to avoid re-rendering them.
|
|
270
|
+
* @param relations
|
|
271
|
+
*/
|
|
134
272
|
Manager.prototype.onGetterUpdate = function (relations) {
|
|
135
273
|
var _a, _b;
|
|
136
274
|
return __awaiter(this, void 0, void 0, function () {
|
|
137
|
-
var cEntities, i, relation, key, cEntity, visual, e_1;
|
|
275
|
+
var killCEntity, cEntities, key, i, relation, key, cEntity, visual, e_1;
|
|
276
|
+
var _this = this;
|
|
138
277
|
return __generator(this, function (_c) {
|
|
139
278
|
switch (_c.label) {
|
|
140
279
|
case 0:
|
|
@@ -142,6 +281,12 @@ var RelationsRenderManager;
|
|
|
142
281
|
if (this.disposed || this.viewer.isDestroyed()) {
|
|
143
282
|
return [2 /*return*/];
|
|
144
283
|
}
|
|
284
|
+
relations = relations.filter(function (x) { return _this.shouldRenderRelation(x); });
|
|
285
|
+
killCEntity = function (cEntity) {
|
|
286
|
+
if (cEntity && !_this.viewer.isDestroyed() && _this.viewer.entities.contains(cEntity)) {
|
|
287
|
+
_this.viewer.entities.remove(cEntity);
|
|
288
|
+
}
|
|
289
|
+
};
|
|
145
290
|
return [4 /*yield*/, relation_render_engine_1.RelationRenderEngine.Render({
|
|
146
291
|
apiGetter: this.apiGetter,
|
|
147
292
|
menuItemId: this.item.id,
|
|
@@ -155,13 +300,16 @@ var RelationsRenderManager;
|
|
|
155
300
|
this.register.RemoveRegos({
|
|
156
301
|
menuItemId: this.item.id
|
|
157
302
|
});
|
|
303
|
+
for (key in cEntities) {
|
|
304
|
+
killCEntity(cEntities[key]);
|
|
305
|
+
}
|
|
158
306
|
return [2 /*return*/];
|
|
159
307
|
}
|
|
160
308
|
for (i = 0; i < relations.length; i++) {
|
|
161
309
|
relation = relations[i];
|
|
162
310
|
key = relation_render_engine_1.RelationRenderEngine.GetRenderGroupId(relation);
|
|
163
311
|
cEntity = cEntities[key];
|
|
164
|
-
if (cEntity) {
|
|
312
|
+
if (cEntity && this.shouldRenderRelation(relation)) {
|
|
165
313
|
visual = (_a = this.register.GetRego({
|
|
166
314
|
entityId: key,
|
|
167
315
|
menuItemId: this.item.id
|
|
@@ -187,6 +335,7 @@ var RelationsRenderManager;
|
|
|
187
335
|
menuItemId: this.item.id,
|
|
188
336
|
requestRender: false
|
|
189
337
|
});
|
|
338
|
+
killCEntity(cEntity);
|
|
190
339
|
}
|
|
191
340
|
}
|
|
192
341
|
this.viewer.scene.requestRender();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"relations-render-manager.js","sourceRoot":"","sources":["../../../../../src/rendering/render-managers/other/relations-render-manager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAA+E;AAI/E,uEAAoE;AAEpE,IAAiB,sBAAsB,
|
|
1
|
+
{"version":3,"file":"relations-render-manager.js","sourceRoot":"","sources":["../../../../../src/rendering/render-managers/other/relations-render-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -68,135 +68,129 @@ var TilesetEntitiesRenderManager;
|
|
|
68
68
|
configurable: true
|
|
69
69
|
});
|
|
70
70
|
Manager.prototype.Init = function (params) {
|
|
71
|
+
var _this = this;
|
|
71
72
|
var _a;
|
|
72
|
-
|
|
73
|
-
|
|
73
|
+
this.initCounter += 1;
|
|
74
|
+
var counter = this.initCounter;
|
|
75
|
+
if (this.disposed) {
|
|
76
|
+
return;
|
|
77
|
+
}
|
|
78
|
+
if (params === null || params === void 0 ? void 0 : params.item) {
|
|
79
|
+
this.item = params.item;
|
|
80
|
+
}
|
|
81
|
+
var tilesetId = (_a = this.item.tileset) === null || _a === void 0 ? void 0 : _a.TilesetID;
|
|
82
|
+
if (!tilesetId) {
|
|
83
|
+
return;
|
|
84
|
+
}
|
|
85
|
+
(function () { return __awaiter(_this, void 0, void 0, function () {
|
|
86
|
+
var canAccess, e_1, accountId, api, tileset, cTileset, _a, attenuation, attenuationMax;
|
|
74
87
|
var _this = this;
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
tileset: tileset,
|
|
148
|
-
viewer: this.viewer,
|
|
149
|
-
accountId: accountId,
|
|
150
|
-
viaCdn: this.item.cdnEnabled
|
|
151
|
-
})];
|
|
152
|
-
case 8:
|
|
153
|
-
cTileset = _a.cTileset = _e.sent();
|
|
154
|
-
if (this.disposed) {
|
|
155
|
-
this.doDispose();
|
|
156
|
-
return [2 /*return*/];
|
|
157
|
-
}
|
|
158
|
-
this.viewer.scene.requestRender();
|
|
159
|
-
cTileset.readyPromise.then(function () {
|
|
160
|
-
try {
|
|
161
|
-
if (_this.disposed || _this.viewer.isDestroyed()) {
|
|
162
|
-
return;
|
|
163
|
-
}
|
|
164
|
-
_this.onCTilesetLoad();
|
|
165
|
-
_this.viewer.scene.requestRender();
|
|
166
|
-
}
|
|
167
|
-
catch (e) {
|
|
168
|
-
console.error(e);
|
|
169
|
-
}
|
|
170
|
-
});
|
|
171
|
-
cTileset.tileLoad.addEventListener(function (tile) {
|
|
172
|
-
_this.mapCTile(tile);
|
|
173
|
-
});
|
|
174
|
-
_e.label = 9;
|
|
175
|
-
case 9:
|
|
176
|
-
attenuation = this.item.attenuation;
|
|
177
|
-
if (!attenuation && attenuation != false) {
|
|
178
|
-
attenuation = true;
|
|
179
|
-
}
|
|
180
|
-
attenuationMax = this.item.attenuationMax;
|
|
181
|
-
if (isNaN(attenuationMax)) {
|
|
182
|
-
attenuationMax = 20;
|
|
88
|
+
var _b, _c, _d;
|
|
89
|
+
return __generator(this, function (_e) {
|
|
90
|
+
switch (_e.label) {
|
|
91
|
+
case 0:
|
|
92
|
+
if (!!this.cTileset) return [3 /*break*/, 9];
|
|
93
|
+
if (!tilesetId) return [3 /*break*/, 5];
|
|
94
|
+
canAccess = false;
|
|
95
|
+
_e.label = 1;
|
|
96
|
+
case 1:
|
|
97
|
+
_e.trys.push([1, 3, , 4]);
|
|
98
|
+
return [4 /*yield*/, bruce_models_1.Tileset.Publish.IsAccessAllowed({
|
|
99
|
+
sourceAccountId: (_b = this.item.tileset) === null || _b === void 0 ? void 0 : _b.ClientAccountID,
|
|
100
|
+
tilesetId: tilesetId,
|
|
101
|
+
forAccountId: this.getters.GetAccountId(),
|
|
102
|
+
api: this.getters.GetGlobalApi()
|
|
103
|
+
})];
|
|
104
|
+
case 2:
|
|
105
|
+
canAccess = _e.sent();
|
|
106
|
+
return [3 /*break*/, 4];
|
|
107
|
+
case 3:
|
|
108
|
+
e_1 = _e.sent();
|
|
109
|
+
console.error(e_1);
|
|
110
|
+
return [3 /*break*/, 4];
|
|
111
|
+
case 4:
|
|
112
|
+
if (!canAccess) {
|
|
113
|
+
console.warn("Cannot access tileset: ".concat(tilesetId, ", from account: ").concat((_c = this.item.tileset) === null || _c === void 0 ? void 0 : _c.ClientAccountID, "."));
|
|
114
|
+
return [2 /*return*/];
|
|
115
|
+
}
|
|
116
|
+
return [3 /*break*/, 6];
|
|
117
|
+
case 5:
|
|
118
|
+
console.warn("No tileset id found. Skipping access check.");
|
|
119
|
+
_e.label = 6;
|
|
120
|
+
case 6:
|
|
121
|
+
if (this.disposed || counter !== this.initCounter) {
|
|
122
|
+
return [2 /*return*/];
|
|
123
|
+
}
|
|
124
|
+
accountId = (_d = this.item.tileset) === null || _d === void 0 ? void 0 : _d.ClientAccountID;
|
|
125
|
+
if (!accountId) {
|
|
126
|
+
accountId = this.getters.GetAccountId();
|
|
127
|
+
}
|
|
128
|
+
api = this.getters.GetBruceApi({
|
|
129
|
+
accountId: accountId
|
|
130
|
+
});
|
|
131
|
+
return [4 /*yield*/, bruce_models_1.Tileset.Get({
|
|
132
|
+
api: api,
|
|
133
|
+
tilesetId: tilesetId
|
|
134
|
+
})];
|
|
135
|
+
case 7:
|
|
136
|
+
tileset = (_e.sent()).tileset;
|
|
137
|
+
if (!tileset || this.disposed || counter !== this.initCounter) {
|
|
138
|
+
return [2 /*return*/];
|
|
139
|
+
}
|
|
140
|
+
this.typeId = tileset.settings.entityTypeId;
|
|
141
|
+
_a = this;
|
|
142
|
+
return [4 /*yield*/, tileset_render_engine_1.TilesetRenderEngine.Render({
|
|
143
|
+
apiGetter: this.getters.GetBruceGetter(),
|
|
144
|
+
tileset: tileset,
|
|
145
|
+
viewer: this.viewer,
|
|
146
|
+
accountId: accountId,
|
|
147
|
+
viaCdn: this.item.cdnEnabled
|
|
148
|
+
})];
|
|
149
|
+
case 8:
|
|
150
|
+
cTileset = _a.cTileset = _e.sent();
|
|
151
|
+
if (this.disposed) {
|
|
152
|
+
this.doDispose();
|
|
153
|
+
return [2 /*return*/];
|
|
154
|
+
}
|
|
155
|
+
this.viewer.scene.requestRender();
|
|
156
|
+
cTileset.readyPromise.then(function () {
|
|
157
|
+
try {
|
|
158
|
+
if (_this.disposed || _this.viewer.isDestroyed()) {
|
|
159
|
+
return;
|
|
183
160
|
}
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
161
|
+
_this.onCTilesetLoad();
|
|
162
|
+
_this.viewer.scene.requestRender();
|
|
163
|
+
}
|
|
164
|
+
catch (e) {
|
|
165
|
+
console.error(e);
|
|
166
|
+
}
|
|
167
|
+
});
|
|
168
|
+
cTileset.tileLoad.addEventListener(function (tile) {
|
|
169
|
+
_this.mapCTile(tile);
|
|
170
|
+
});
|
|
171
|
+
_e.label = 9;
|
|
172
|
+
case 9:
|
|
173
|
+
attenuation = this.item.attenuation;
|
|
174
|
+
if (!attenuation && attenuation != false) {
|
|
175
|
+
attenuation = true;
|
|
194
176
|
}
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
177
|
+
attenuationMax = this.item.attenuationMax;
|
|
178
|
+
if (isNaN(attenuationMax)) {
|
|
179
|
+
attenuationMax = 20;
|
|
180
|
+
}
|
|
181
|
+
this.cTileset.readyPromise.then(function () {
|
|
182
|
+
tileset_render_engine_1.TilesetRenderEngine.ApplySettings({
|
|
183
|
+
cTileset: _this.cTileset,
|
|
184
|
+
settings: {
|
|
185
|
+
attenuation: attenuation,
|
|
186
|
+
maximumAttenuation: attenuationMax
|
|
187
|
+
}
|
|
188
|
+
});
|
|
189
|
+
});
|
|
190
|
+
return [2 /*return*/];
|
|
191
|
+
}
|
|
198
192
|
});
|
|
199
|
-
});
|
|
193
|
+
}); })();
|
|
200
194
|
};
|
|
201
195
|
Manager.prototype.Dispose = function () {
|
|
202
196
|
if (this.disposed) {
|