bruce-cesium 0.4.0 → 0.4.1
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 +37 -57
- package/dist/bruce-cesium.es5.js.map +1 -1
- package/dist/bruce-cesium.umd.js +37 -57
- package/dist/bruce-cesium.umd.js.map +1 -1
- package/dist/lib/rendering/tile-render-engine.js +21 -37
- package/dist/lib/rendering/tile-render-engine.js.map +1 -1
- package/dist/lib/rendering/view-render-engine.js +16 -20
- package/dist/lib/rendering/view-render-engine.js.map +1 -1
- package/dist/types/rendering/tile-render-engine.d.ts +2 -4
- package/package.json +2 -2
package/dist/bruce-cesium.es5.js
CHANGED
|
@@ -4225,35 +4225,19 @@ var TileRenderEngine;
|
|
|
4225
4225
|
V2.GetOrCreateLayer = GetOrCreateLayer;
|
|
4226
4226
|
function Render(params) {
|
|
4227
4227
|
return __awaiter(this, void 0, void 0, function () {
|
|
4228
|
-
var
|
|
4228
|
+
var i, enabled, curEnabled, toDisable, curEnabledArr, _loop_2, i, i, _loop_3, i;
|
|
4229
4229
|
return __generator(this, function (_a) {
|
|
4230
4230
|
switch (_a.label) {
|
|
4231
4231
|
case 0:
|
|
4232
|
-
_loop_2 = function (i) {
|
|
4233
|
-
var enabled, source;
|
|
4234
|
-
return __generator(this, function (_a) {
|
|
4235
|
-
switch (_a.label) {
|
|
4236
|
-
case 0:
|
|
4237
|
-
enabled = params.enabled[i];
|
|
4238
|
-
source = params.sources.find(function (x) { return x.accountId === enabled.accountId && x.tilesetId === enabled.tilesetId; });
|
|
4239
|
-
if (!source) {
|
|
4240
|
-
console.error("Missing source for enabled imagery.", enabled);
|
|
4241
|
-
}
|
|
4242
|
-
return [4 /*yield*/, GetOrCreateLayer(params.viewer, params.apiGetter, {
|
|
4243
|
-
accountId: source.accountId,
|
|
4244
|
-
tilesetId: source.tilesetId,
|
|
4245
|
-
})];
|
|
4246
|
-
case 1:
|
|
4247
|
-
_a.sent();
|
|
4248
|
-
return [2 /*return*/];
|
|
4249
|
-
}
|
|
4250
|
-
});
|
|
4251
|
-
};
|
|
4252
4232
|
i = 0;
|
|
4253
4233
|
_a.label = 1;
|
|
4254
4234
|
case 1:
|
|
4255
|
-
if (!(i < params.
|
|
4256
|
-
|
|
4235
|
+
if (!(i < params.tiles.length)) return [3 /*break*/, 4];
|
|
4236
|
+
enabled = params.tiles[i];
|
|
4237
|
+
return [4 /*yield*/, GetOrCreateLayer(params.viewer, params.apiGetter, {
|
|
4238
|
+
accountId: enabled.accountId,
|
|
4239
|
+
tilesetId: enabled.tilesetId,
|
|
4240
|
+
})];
|
|
4257
4241
|
case 2:
|
|
4258
4242
|
_a.sent();
|
|
4259
4243
|
_a.label = 3;
|
|
@@ -4264,10 +4248,10 @@ var TileRenderEngine;
|
|
|
4264
4248
|
curEnabled = params.viewer.imageryLayers;
|
|
4265
4249
|
toDisable = [];
|
|
4266
4250
|
curEnabledArr = [];
|
|
4267
|
-
|
|
4251
|
+
_loop_2 = function (i) {
|
|
4268
4252
|
var layer = curEnabled.get(i);
|
|
4269
4253
|
var meta = layer === null || layer === void 0 ? void 0 : layer._bMeta;
|
|
4270
|
-
var disable = !params.
|
|
4254
|
+
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); });
|
|
4271
4255
|
if (disable) {
|
|
4272
4256
|
toDisable.push(layer);
|
|
4273
4257
|
}
|
|
@@ -4276,13 +4260,13 @@ var TileRenderEngine;
|
|
|
4276
4260
|
}
|
|
4277
4261
|
};
|
|
4278
4262
|
for (i = 0; i < curEnabled.length; i++) {
|
|
4279
|
-
|
|
4263
|
+
_loop_2(i);
|
|
4280
4264
|
}
|
|
4281
4265
|
for (i = 0; i < toDisable.length; i++) {
|
|
4282
4266
|
params.viewer.imageryLayers.remove(toDisable[i]);
|
|
4283
4267
|
}
|
|
4284
|
-
|
|
4285
|
-
var enabled = params.
|
|
4268
|
+
_loop_3 = function (i) {
|
|
4269
|
+
var enabled = params.tiles[i];
|
|
4286
4270
|
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; });
|
|
4287
4271
|
if (layer) {
|
|
4288
4272
|
params.viewer.imageryLayers.raiseToTop(layer);
|
|
@@ -4294,8 +4278,8 @@ var TileRenderEngine;
|
|
|
4294
4278
|
layer.gamma = Number(enabled.gamma == null ? 1 : enabled.gamma);
|
|
4295
4279
|
}
|
|
4296
4280
|
};
|
|
4297
|
-
for (i = 0; i < params.
|
|
4298
|
-
|
|
4281
|
+
for (i = 0; i < params.tiles.length; i++) {
|
|
4282
|
+
_loop_3(i);
|
|
4299
4283
|
}
|
|
4300
4284
|
return [2 /*return*/];
|
|
4301
4285
|
}
|
|
@@ -4397,18 +4381,18 @@ var TileRenderEngine;
|
|
|
4397
4381
|
switch (_b.label) {
|
|
4398
4382
|
case 0:
|
|
4399
4383
|
enabledMeta = (_a = params.viewer.terrainProvider) === null || _a === void 0 ? void 0 : _a._bMeta;
|
|
4400
|
-
if ((enabledMeta === null || enabledMeta === void 0 ? void 0 : enabledMeta.tilesetId) === params.
|
|
4401
|
-
(enabledMeta === null || enabledMeta === void 0 ? void 0 : enabledMeta.accountId) === params.
|
|
4384
|
+
if ((enabledMeta === null || enabledMeta === void 0 ? void 0 : enabledMeta.tilesetId) === params.tile.tilesetId &&
|
|
4385
|
+
(enabledMeta === null || enabledMeta === void 0 ? void 0 : enabledMeta.accountId) === params.tile.accountId) {
|
|
4402
4386
|
return [2 /*return*/];
|
|
4403
4387
|
}
|
|
4404
|
-
defaultTerr = params.
|
|
4388
|
+
defaultTerr = params.tile.accountId ? null : ProjectViewTile.DefaultTerrains.find(function (x) { return x.id === params.tile.tilesetId; });
|
|
4405
4389
|
provider = null;
|
|
4406
4390
|
if (!defaultTerr) return [3 /*break*/, 1];
|
|
4407
4391
|
provider = renderDefaultTerrTile(defaultTerr.id);
|
|
4408
4392
|
return [3 /*break*/, 3];
|
|
4409
4393
|
case 1:
|
|
4410
|
-
api = params.apiGetter.getApi(params.
|
|
4411
|
-
return [4 /*yield*/, Tileset.Get(api, params.
|
|
4394
|
+
api = params.apiGetter.getApi(params.tile.accountId);
|
|
4395
|
+
return [4 /*yield*/, Tileset.Get(api, params.tile.tilesetId)];
|
|
4412
4396
|
case 2:
|
|
4413
4397
|
tileset = _b.sent();
|
|
4414
4398
|
url = void 0;
|
|
@@ -4434,8 +4418,8 @@ var TileRenderEngine;
|
|
|
4434
4418
|
case 3:
|
|
4435
4419
|
if (provider) {
|
|
4436
4420
|
provider._bMeta = {
|
|
4437
|
-
accountId: params.
|
|
4438
|
-
tilesetId: params.
|
|
4421
|
+
accountId: params.tile.accountId,
|
|
4422
|
+
tilesetId: params.tile.tilesetId
|
|
4439
4423
|
};
|
|
4440
4424
|
params.viewer.terrainProvider = provider;
|
|
4441
4425
|
}
|
|
@@ -4533,11 +4517,11 @@ function renderV1(params, bookmark, view) {
|
|
|
4533
4517
|
});
|
|
4534
4518
|
}
|
|
4535
4519
|
function renderV2(params, bookmark, view) {
|
|
4536
|
-
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s
|
|
4520
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
|
|
4537
4521
|
return __awaiter(this, void 0, void 0, function () {
|
|
4538
|
-
var viewer, scene, vSettings, bSettings, defaults, camera, newLens, curLens, transition, pos, gOcclusion, terrain,
|
|
4539
|
-
return __generator(this, function (
|
|
4540
|
-
switch (
|
|
4522
|
+
var viewer, scene, vSettings, bSettings, defaults, camera, newLens, curLens, transition, pos, gOcclusion, terrain, imagery, curEnabled, newItemIds, _i, curEnabled_1, id;
|
|
4523
|
+
return __generator(this, function (_t) {
|
|
4524
|
+
switch (_t.label) {
|
|
4541
4525
|
case 0:
|
|
4542
4526
|
viewer = params.manager.Viewer;
|
|
4543
4527
|
scene = viewer.scene;
|
|
@@ -4600,19 +4584,16 @@ function renderV2(params, bookmark, view) {
|
|
|
4600
4584
|
scene.globe.depthTestAgainstTerrain = Boolean(gOcclusion);
|
|
4601
4585
|
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;
|
|
4602
4586
|
if (!terrain) return [3 /*break*/, 2];
|
|
4603
|
-
source = (_q = vSettings.terrains) === null || _q === void 0 ? void 0 : _q.find(function (x) { return x.accountId === terrain.accountId && x.tilesetId === terrain.tilesetId; });
|
|
4604
|
-
if (!source) return [3 /*break*/, 2];
|
|
4605
4587
|
return [4 /*yield*/, TileRenderEngine.Terrain.V2.Render({
|
|
4606
4588
|
apiGetter: params.apiGetter,
|
|
4607
|
-
|
|
4608
|
-
source: source,
|
|
4589
|
+
tile: terrain,
|
|
4609
4590
|
viewer: params.manager.Viewer,
|
|
4610
4591
|
})];
|
|
4611
4592
|
case 1:
|
|
4612
|
-
|
|
4613
|
-
|
|
4593
|
+
_t.sent();
|
|
4594
|
+
_t.label = 2;
|
|
4614
4595
|
case 2:
|
|
4615
|
-
imagery = (
|
|
4596
|
+
imagery = (_q = bSettings.imagery) !== null && _q !== void 0 ? _q : (_r = defaults.settings) === null || _r === void 0 ? void 0 : _r.imagery;
|
|
4616
4597
|
if (imagery == null) {
|
|
4617
4598
|
// TODO: Need global default.
|
|
4618
4599
|
imagery = [
|
|
@@ -4630,24 +4611,23 @@ function renderV2(params, bookmark, view) {
|
|
|
4630
4611
|
}
|
|
4631
4612
|
return [4 /*yield*/, TileRenderEngine.Map.V2.Render({
|
|
4632
4613
|
apiGetter: params.apiGetter,
|
|
4633
|
-
|
|
4634
|
-
sources: vSettings.imageries,
|
|
4614
|
+
tiles: imagery,
|
|
4635
4615
|
viewer: params.manager.Viewer,
|
|
4636
4616
|
})];
|
|
4637
4617
|
case 3:
|
|
4638
|
-
|
|
4618
|
+
_t.sent();
|
|
4639
4619
|
curEnabled = params.manager.GetEnabledItemIds();
|
|
4640
|
-
newItemIds = (
|
|
4620
|
+
newItemIds = (_s = bSettings === null || bSettings === void 0 ? void 0 : bSettings.menuItemIds) !== null && _s !== void 0 ? _s : [];
|
|
4641
4621
|
_i = 0, curEnabled_1 = curEnabled;
|
|
4642
|
-
|
|
4622
|
+
_t.label = 4;
|
|
4643
4623
|
case 4:
|
|
4644
4624
|
if (!(_i < curEnabled_1.length)) return [3 /*break*/, 7];
|
|
4645
4625
|
id = curEnabled_1[_i];
|
|
4646
4626
|
if (!(newItemIds.indexOf(id) === -1)) return [3 /*break*/, 6];
|
|
4647
4627
|
return [4 /*yield*/, params.manager.RemoveItemById(id)];
|
|
4648
4628
|
case 5:
|
|
4649
|
-
|
|
4650
|
-
|
|
4629
|
+
_t.sent();
|
|
4630
|
+
_t.label = 6;
|
|
4651
4631
|
case 6:
|
|
4652
4632
|
_i++;
|
|
4653
4633
|
return [3 /*break*/, 4];
|
|
@@ -4658,8 +4638,8 @@ function renderV2(params, bookmark, view) {
|
|
|
4658
4638
|
manager: params.manager,
|
|
4659
4639
|
}, params.viewId, params.bookmarkId)];
|
|
4660
4640
|
case 8:
|
|
4661
|
-
|
|
4662
|
-
|
|
4641
|
+
_t.sent();
|
|
4642
|
+
_t.label = 9;
|
|
4663
4643
|
case 9: return [2 /*return*/];
|
|
4664
4644
|
}
|
|
4665
4645
|
});
|