bruce-cesium 0.4.0 → 0.4.2
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 -58
- package/dist/bruce-cesium.es5.js.map +1 -1
- package/dist/bruce-cesium.umd.js +45 -57
- package/dist/bruce-cesium.umd.js.map +1 -1
- package/dist/lib/bruce-cesium.js +30 -30
- package/dist/lib/rendering/entity-render-engine.js +848 -848
- package/dist/lib/rendering/menu-item-manager.js +252 -252
- package/dist/lib/rendering/render-addons/measure-addon.js +186 -186
- package/dist/lib/rendering/render-addons/render-addon.js +2 -2
- package/dist/lib/rendering/render-helper.js +296 -296
- package/dist/lib/rendering/render-managers/common/shared-getters.js +31 -31
- package/dist/lib/rendering/render-managers/entities/entities-ids-render-manager.js +146 -146
- package/dist/lib/rendering/render-managers/entities/entities-loaded-render-manager.js +143 -143
- package/dist/lib/rendering/render-managers/entities/entities-render-manager.js +234 -234
- package/dist/lib/rendering/render-managers/entities/entity-render-manager.js +139 -139
- package/dist/lib/rendering/render-managers/render-manager.js +50 -50
- package/dist/lib/rendering/render-managers/tilesets/tileset-cad-render-manager.js +236 -236
- package/dist/lib/rendering/render-managers/tilesets/tileset-osm-render-manager.js +320 -320
- package/dist/lib/rendering/tile-render-engine.js +815 -831
- package/dist/lib/rendering/tile-render-engine.js.map +1 -1
- package/dist/lib/rendering/tileset-render-engine.js +499 -499
- package/dist/lib/rendering/view-render-engine.js +305 -309
- package/dist/lib/rendering/view-render-engine.js.map +1 -1
- package/dist/lib/rendering/visuals-register.js +402 -394
- package/dist/lib/rendering/visuals-register.js.map +1 -1
- package/dist/lib/utils/drawing-utils.js +42 -42
- package/dist/lib/utils/entity-utils.js +99 -99
- package/dist/lib/utils/measure-utils.js +34 -34
- package/dist/lib/utils/view-utils.js +72 -72
- package/dist/lib/viewer/cesium-view-monitor.js +231 -231
- package/dist/lib/viewer/viewer-utils.js +85 -85
- package/dist/types/rendering/tile-render-engine.d.ts +2 -4
- package/dist/types/rendering/visuals-register.d.ts +2 -0
- package/package.json +76 -76
package/dist/bruce-cesium.umd.js
CHANGED
|
@@ -1723,6 +1723,7 @@
|
|
|
1723
1723
|
for (var i = 0; i < entityRegos.length; i++) {
|
|
1724
1724
|
var rego = entityRegos[i];
|
|
1725
1725
|
var show = rego === highestPriority;
|
|
1726
|
+
rego.best = show;
|
|
1726
1727
|
updateEntityShow(viewer, rego.visual, show);
|
|
1727
1728
|
}
|
|
1728
1729
|
if (addons) {
|
|
@@ -1949,6 +1950,13 @@
|
|
|
1949
1950
|
}
|
|
1950
1951
|
return entityRegos.find(function (r) { return r.menuItemId === menuItemId; });
|
|
1951
1952
|
};
|
|
1953
|
+
Register.prototype.GetRegos = function (entityId) {
|
|
1954
|
+
var entityRegos = this.rego[entityId];
|
|
1955
|
+
if (!entityRegos) {
|
|
1956
|
+
return [];
|
|
1957
|
+
}
|
|
1958
|
+
return entityRegos;
|
|
1959
|
+
};
|
|
1952
1960
|
Register.prototype.GetMenuItemRegos = function (menuItemId) {
|
|
1953
1961
|
var visuals = [];
|
|
1954
1962
|
for (var entityId in this.rego) {
|
|
@@ -4185,35 +4193,19 @@
|
|
|
4185
4193
|
V2.GetOrCreateLayer = GetOrCreateLayer;
|
|
4186
4194
|
function Render(params) {
|
|
4187
4195
|
return __awaiter(this, void 0, void 0, function () {
|
|
4188
|
-
var
|
|
4196
|
+
var i, enabled, curEnabled, toDisable, curEnabledArr, _loop_2, i, i, _loop_3, i;
|
|
4189
4197
|
return __generator(this, function (_a) {
|
|
4190
4198
|
switch (_a.label) {
|
|
4191
4199
|
case 0:
|
|
4192
|
-
_loop_2 = function (i) {
|
|
4193
|
-
var enabled, source;
|
|
4194
|
-
return __generator(this, function (_a) {
|
|
4195
|
-
switch (_a.label) {
|
|
4196
|
-
case 0:
|
|
4197
|
-
enabled = params.enabled[i];
|
|
4198
|
-
source = params.sources.find(function (x) { return x.accountId === enabled.accountId && x.tilesetId === enabled.tilesetId; });
|
|
4199
|
-
if (!source) {
|
|
4200
|
-
console.error("Missing source for enabled imagery.", enabled);
|
|
4201
|
-
}
|
|
4202
|
-
return [4 /*yield*/, GetOrCreateLayer(params.viewer, params.apiGetter, {
|
|
4203
|
-
accountId: source.accountId,
|
|
4204
|
-
tilesetId: source.tilesetId,
|
|
4205
|
-
})];
|
|
4206
|
-
case 1:
|
|
4207
|
-
_a.sent();
|
|
4208
|
-
return [2 /*return*/];
|
|
4209
|
-
}
|
|
4210
|
-
});
|
|
4211
|
-
};
|
|
4212
4200
|
i = 0;
|
|
4213
4201
|
_a.label = 1;
|
|
4214
4202
|
case 1:
|
|
4215
|
-
if (!(i < params.
|
|
4216
|
-
|
|
4203
|
+
if (!(i < params.tiles.length)) return [3 /*break*/, 4];
|
|
4204
|
+
enabled = params.tiles[i];
|
|
4205
|
+
return [4 /*yield*/, GetOrCreateLayer(params.viewer, params.apiGetter, {
|
|
4206
|
+
accountId: enabled.accountId,
|
|
4207
|
+
tilesetId: enabled.tilesetId,
|
|
4208
|
+
})];
|
|
4217
4209
|
case 2:
|
|
4218
4210
|
_a.sent();
|
|
4219
4211
|
_a.label = 3;
|
|
@@ -4224,10 +4216,10 @@
|
|
|
4224
4216
|
curEnabled = params.viewer.imageryLayers;
|
|
4225
4217
|
toDisable = [];
|
|
4226
4218
|
curEnabledArr = [];
|
|
4227
|
-
|
|
4219
|
+
_loop_2 = function (i) {
|
|
4228
4220
|
var layer = curEnabled.get(i);
|
|
4229
4221
|
var meta = layer === null || layer === void 0 ? void 0 : layer._bMeta;
|
|
4230
|
-
var disable = !params.
|
|
4222
|
+
var disable = !params.tiles.find(function (x) { return x.accountId === (meta === null || meta === void 0 ? void 0 : meta.accountId) && x.tilesetId === (meta === null || meta === void 0 ? void 0 : meta.tilesetId); });
|
|
4231
4223
|
if (disable) {
|
|
4232
4224
|
toDisable.push(layer);
|
|
4233
4225
|
}
|
|
@@ -4236,13 +4228,13 @@
|
|
|
4236
4228
|
}
|
|
4237
4229
|
};
|
|
4238
4230
|
for (i = 0; i < curEnabled.length; i++) {
|
|
4239
|
-
|
|
4231
|
+
_loop_2(i);
|
|
4240
4232
|
}
|
|
4241
4233
|
for (i = 0; i < toDisable.length; i++) {
|
|
4242
4234
|
params.viewer.imageryLayers.remove(toDisable[i]);
|
|
4243
4235
|
}
|
|
4244
|
-
|
|
4245
|
-
var enabled = params.
|
|
4236
|
+
_loop_3 = function (i) {
|
|
4237
|
+
var enabled = params.tiles[i];
|
|
4246
4238
|
var layer = curEnabledArr.find(function (x) { var _a, _b; return ((_a = x._bMeta) === null || _a === void 0 ? void 0 : _a.accountId) === enabled.accountId && ((_b = x._bMeta) === null || _b === void 0 ? void 0 : _b.tilesetId) === enabled.tilesetId; });
|
|
4247
4239
|
if (layer) {
|
|
4248
4240
|
params.viewer.imageryLayers.raiseToTop(layer);
|
|
@@ -4254,8 +4246,8 @@
|
|
|
4254
4246
|
layer.gamma = Number(enabled.gamma == null ? 1 : enabled.gamma);
|
|
4255
4247
|
}
|
|
4256
4248
|
};
|
|
4257
|
-
for (i = 0; i < params.
|
|
4258
|
-
|
|
4249
|
+
for (i = 0; i < params.tiles.length; i++) {
|
|
4250
|
+
_loop_3(i);
|
|
4259
4251
|
}
|
|
4260
4252
|
return [2 /*return*/];
|
|
4261
4253
|
}
|
|
@@ -4357,18 +4349,18 @@
|
|
|
4357
4349
|
switch (_b.label) {
|
|
4358
4350
|
case 0:
|
|
4359
4351
|
enabledMeta = (_a = params.viewer.terrainProvider) === null || _a === void 0 ? void 0 : _a._bMeta;
|
|
4360
|
-
if ((enabledMeta === null || enabledMeta === void 0 ? void 0 : enabledMeta.tilesetId) === params.
|
|
4361
|
-
(enabledMeta === null || enabledMeta === void 0 ? void 0 : enabledMeta.accountId) === params.
|
|
4352
|
+
if ((enabledMeta === null || enabledMeta === void 0 ? void 0 : enabledMeta.tilesetId) === params.tile.tilesetId &&
|
|
4353
|
+
(enabledMeta === null || enabledMeta === void 0 ? void 0 : enabledMeta.accountId) === params.tile.accountId) {
|
|
4362
4354
|
return [2 /*return*/];
|
|
4363
4355
|
}
|
|
4364
|
-
defaultTerr = params.
|
|
4356
|
+
defaultTerr = params.tile.accountId ? null : bruceModels.ProjectViewTile.DefaultTerrains.find(function (x) { return x.id === params.tile.tilesetId; });
|
|
4365
4357
|
provider = null;
|
|
4366
4358
|
if (!defaultTerr) return [3 /*break*/, 1];
|
|
4367
4359
|
provider = renderDefaultTerrTile(defaultTerr.id);
|
|
4368
4360
|
return [3 /*break*/, 3];
|
|
4369
4361
|
case 1:
|
|
4370
|
-
api = params.apiGetter.getApi(params.
|
|
4371
|
-
return [4 /*yield*/, bruceModels.Tileset.Get(api, params.
|
|
4362
|
+
api = params.apiGetter.getApi(params.tile.accountId);
|
|
4363
|
+
return [4 /*yield*/, bruceModels.Tileset.Get(api, params.tile.tilesetId)];
|
|
4372
4364
|
case 2:
|
|
4373
4365
|
tileset = _b.sent();
|
|
4374
4366
|
url = void 0;
|
|
@@ -4394,8 +4386,8 @@
|
|
|
4394
4386
|
case 3:
|
|
4395
4387
|
if (provider) {
|
|
4396
4388
|
provider._bMeta = {
|
|
4397
|
-
accountId: params.
|
|
4398
|
-
tilesetId: params.
|
|
4389
|
+
accountId: params.tile.accountId,
|
|
4390
|
+
tilesetId: params.tile.tilesetId
|
|
4399
4391
|
};
|
|
4400
4392
|
params.viewer.terrainProvider = provider;
|
|
4401
4393
|
}
|
|
@@ -4493,11 +4485,11 @@
|
|
|
4493
4485
|
});
|
|
4494
4486
|
}
|
|
4495
4487
|
function renderV2(params, bookmark, view) {
|
|
4496
|
-
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s
|
|
4488
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
|
|
4497
4489
|
return __awaiter(this, void 0, void 0, function () {
|
|
4498
|
-
var viewer, scene, vSettings, bSettings, defaults, camera, newLens, curLens, transition, pos, gOcclusion, terrain,
|
|
4499
|
-
return __generator(this, function (
|
|
4500
|
-
switch (
|
|
4490
|
+
var viewer, scene, vSettings, bSettings, defaults, camera, newLens, curLens, transition, pos, gOcclusion, terrain, imagery, curEnabled, newItemIds, _i, curEnabled_1, id;
|
|
4491
|
+
return __generator(this, function (_t) {
|
|
4492
|
+
switch (_t.label) {
|
|
4501
4493
|
case 0:
|
|
4502
4494
|
viewer = params.manager.Viewer;
|
|
4503
4495
|
scene = viewer.scene;
|
|
@@ -4560,19 +4552,16 @@
|
|
|
4560
4552
|
scene.globe.depthTestAgainstTerrain = Boolean(gOcclusion);
|
|
4561
4553
|
terrain = (_o = bSettings === null || bSettings === void 0 ? void 0 : bSettings.terrain) !== null && _o !== void 0 ? _o : (_p = defaults.settings) === null || _p === void 0 ? void 0 : _p.terrain;
|
|
4562
4554
|
if (!terrain) return [3 /*break*/, 2];
|
|
4563
|
-
source = (_q = vSettings.terrains) === null || _q === void 0 ? void 0 : _q.find(function (x) { return x.accountId === terrain.accountId && x.tilesetId === terrain.tilesetId; });
|
|
4564
|
-
if (!source) return [3 /*break*/, 2];
|
|
4565
4555
|
return [4 /*yield*/, exports.TileRenderEngine.Terrain.V2.Render({
|
|
4566
4556
|
apiGetter: params.apiGetter,
|
|
4567
|
-
|
|
4568
|
-
source: source,
|
|
4557
|
+
tile: terrain,
|
|
4569
4558
|
viewer: params.manager.Viewer,
|
|
4570
4559
|
})];
|
|
4571
4560
|
case 1:
|
|
4572
|
-
|
|
4573
|
-
|
|
4561
|
+
_t.sent();
|
|
4562
|
+
_t.label = 2;
|
|
4574
4563
|
case 2:
|
|
4575
|
-
imagery = (
|
|
4564
|
+
imagery = (_q = bSettings.imagery) !== null && _q !== void 0 ? _q : (_r = defaults.settings) === null || _r === void 0 ? void 0 : _r.imagery;
|
|
4576
4565
|
if (imagery == null) {
|
|
4577
4566
|
// TODO: Need global default.
|
|
4578
4567
|
imagery = [
|
|
@@ -4590,24 +4579,23 @@
|
|
|
4590
4579
|
}
|
|
4591
4580
|
return [4 /*yield*/, exports.TileRenderEngine.Map.V2.Render({
|
|
4592
4581
|
apiGetter: params.apiGetter,
|
|
4593
|
-
|
|
4594
|
-
sources: vSettings.imageries,
|
|
4582
|
+
tiles: imagery,
|
|
4595
4583
|
viewer: params.manager.Viewer,
|
|
4596
4584
|
})];
|
|
4597
4585
|
case 3:
|
|
4598
|
-
|
|
4586
|
+
_t.sent();
|
|
4599
4587
|
curEnabled = params.manager.GetEnabledItemIds();
|
|
4600
|
-
newItemIds = (
|
|
4588
|
+
newItemIds = (_s = bSettings === null || bSettings === void 0 ? void 0 : bSettings.menuItemIds) !== null && _s !== void 0 ? _s : [];
|
|
4601
4589
|
_i = 0, curEnabled_1 = curEnabled;
|
|
4602
|
-
|
|
4590
|
+
_t.label = 4;
|
|
4603
4591
|
case 4:
|
|
4604
4592
|
if (!(_i < curEnabled_1.length)) return [3 /*break*/, 7];
|
|
4605
4593
|
id = curEnabled_1[_i];
|
|
4606
4594
|
if (!(newItemIds.indexOf(id) === -1)) return [3 /*break*/, 6];
|
|
4607
4595
|
return [4 /*yield*/, params.manager.RemoveItemById(id)];
|
|
4608
4596
|
case 5:
|
|
4609
|
-
|
|
4610
|
-
|
|
4597
|
+
_t.sent();
|
|
4598
|
+
_t.label = 6;
|
|
4611
4599
|
case 6:
|
|
4612
4600
|
_i++;
|
|
4613
4601
|
return [3 /*break*/, 4];
|
|
@@ -4618,8 +4606,8 @@
|
|
|
4618
4606
|
manager: params.manager,
|
|
4619
4607
|
}, params.viewId, params.bookmarkId)];
|
|
4620
4608
|
case 8:
|
|
4621
|
-
|
|
4622
|
-
|
|
4609
|
+
_t.sent();
|
|
4610
|
+
_t.label = 9;
|
|
4623
4611
|
case 9: return [2 /*return*/];
|
|
4624
4612
|
}
|
|
4625
4613
|
});
|