bruce-cesium 3.7.7 → 3.7.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 +42 -38
- package/dist/bruce-cesium.es5.js.map +1 -1
- package/dist/bruce-cesium.umd.js +41 -37
- package/dist/bruce-cesium.umd.js.map +1 -1
- package/dist/lib/bruce-cesium.js +1 -1
- package/dist/lib/rendering/getters/entity-filter-getter.js +3 -18
- package/dist/lib/rendering/getters/entity-filter-getter.js.map +1 -1
- package/dist/lib/rendering/render-managers/entities/entities-ids-render-manager.js +4 -1
- package/dist/lib/rendering/render-managers/entities/entities-ids-render-manager.js.map +1 -1
- package/dist/lib/rendering/render-managers/entities/entities-loaded-render-manager.js +4 -1
- package/dist/lib/rendering/render-managers/entities/entities-loaded-render-manager.js.map +1 -1
- package/dist/lib/rendering/render-managers/entities/entities-render-manager.js +25 -15
- package/dist/lib/rendering/render-managers/entities/entities-render-manager.js.map +1 -1
- package/dist/lib/rendering/render-managers/entities/entity-render-manager.js +4 -1
- package/dist/lib/rendering/render-managers/entities/entity-render-manager.js.map +1 -1
- package/dist/types/bruce-cesium.d.ts +1 -1
- package/dist/types/rendering/getters/entity-filter-getter.d.ts +0 -2
- package/package.json +2 -2
package/dist/bruce-cesium.umd.js
CHANGED
|
@@ -9804,10 +9804,11 @@
|
|
|
9804
9804
|
this.sources = [];
|
|
9805
9805
|
};
|
|
9806
9806
|
Manager.prototype.ReRender = function (params) {
|
|
9807
|
+
var _a;
|
|
9807
9808
|
return __awaiter(this, void 0, void 0, function () {
|
|
9808
9809
|
var entityIds, force, entities, data, e_1;
|
|
9809
|
-
return __generator(this, function (
|
|
9810
|
-
switch (
|
|
9810
|
+
return __generator(this, function (_b) {
|
|
9811
|
+
switch (_b.label) {
|
|
9811
9812
|
case 0:
|
|
9812
9813
|
entityIds = params.entityIds, force = params.force, entities = params.entities;
|
|
9813
9814
|
if (entities && !entityIds) {
|
|
@@ -9828,17 +9829,19 @@
|
|
|
9828
9829
|
this.renderEntities(entities, true);
|
|
9829
9830
|
return [3 /*break*/, 4];
|
|
9830
9831
|
case 1:
|
|
9831
|
-
|
|
9832
|
+
_b.trys.push([1, 3, , 4]);
|
|
9832
9833
|
return [4 /*yield*/, bruceModels.Entity.GetListByIds({
|
|
9833
9834
|
api: this.apiGetter.getApi(),
|
|
9834
|
-
entityIds: entityIds
|
|
9835
|
+
entityIds: entityIds,
|
|
9836
|
+
historicKey: (_a = this.item.BruceEntity) === null || _a === void 0 ? void 0 : _a.historicAttrKey,
|
|
9837
|
+
historicPoint: this.viewer.clock.currentTime.toString()
|
|
9835
9838
|
})];
|
|
9836
9839
|
case 2:
|
|
9837
|
-
data =
|
|
9840
|
+
data = _b.sent();
|
|
9838
9841
|
this.renderEntities(data.entities, true);
|
|
9839
9842
|
return [3 /*break*/, 4];
|
|
9840
9843
|
case 3:
|
|
9841
|
-
e_1 =
|
|
9844
|
+
e_1 = _b.sent();
|
|
9842
9845
|
console.error(e_1);
|
|
9843
9846
|
return [3 /*break*/, 4];
|
|
9844
9847
|
case 4: return [3 /*break*/, 8];
|
|
@@ -9848,8 +9851,8 @@
|
|
|
9848
9851
|
return [3 /*break*/, 8];
|
|
9849
9852
|
case 6: return [4 /*yield*/, this.doEntityCheck(entityIds)];
|
|
9850
9853
|
case 7:
|
|
9851
|
-
|
|
9852
|
-
|
|
9854
|
+
_b.sent();
|
|
9855
|
+
_b.label = 8;
|
|
9853
9856
|
case 8: return [2 /*return*/];
|
|
9854
9857
|
}
|
|
9855
9858
|
});
|
|
@@ -10310,12 +10313,12 @@
|
|
|
10310
10313
|
* @returns
|
|
10311
10314
|
*/
|
|
10312
10315
|
Manager.prototype.renderAsIndividuals = function (entities, force) {
|
|
10313
|
-
var _a, _b, _c, _d, _e, _f;
|
|
10316
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j;
|
|
10314
10317
|
if (force === void 0) { force = false; }
|
|
10315
10318
|
return __awaiter(this, void 0, void 0, function () {
|
|
10316
|
-
var toRemove, i, entity,
|
|
10317
|
-
return __generator(this, function (
|
|
10318
|
-
switch (
|
|
10319
|
+
var toRemove, i, entity, _k, updated, cEntities, i, entity, id, cEntity, rego, visual, wasClustered, tagIds, rego_1;
|
|
10320
|
+
return __generator(this, function (_l) {
|
|
10321
|
+
switch (_l.label) {
|
|
10319
10322
|
case 0:
|
|
10320
10323
|
if ((_a = this.item.BruceEntity) === null || _a === void 0 ? void 0 : _a.historicAttrKey) {
|
|
10321
10324
|
toRemove = entities.filter(function (x) { var _a; return !((_a = x.Bruce) === null || _a === void 0 ? void 0 : _a.historicAttrKey); });
|
|
@@ -10340,7 +10343,7 @@
|
|
|
10340
10343
|
force: force
|
|
10341
10344
|
})];
|
|
10342
10345
|
case 1:
|
|
10343
|
-
|
|
10346
|
+
_k = _l.sent(), updated = _k.updated, cEntities = _k.entities;
|
|
10344
10347
|
if (this.disposed) {
|
|
10345
10348
|
this.doDispose();
|
|
10346
10349
|
return [2 /*return*/];
|
|
@@ -10378,7 +10381,14 @@
|
|
|
10378
10381
|
requestRender: false
|
|
10379
10382
|
});
|
|
10380
10383
|
}
|
|
10381
|
-
else if (updated.get(id)) {
|
|
10384
|
+
else if (updated.get(id) && rego) {
|
|
10385
|
+
rego.name = cEntity.name;
|
|
10386
|
+
rego.visual = cEntity;
|
|
10387
|
+
rego.entityTypeId = entity.Bruce["EntityType.ID"];
|
|
10388
|
+
rego.tagIds = ((_f = entity.Bruce) === null || _f === void 0 ? void 0 : _f["Layer.ID"]) ? [].concat(entity.Bruce["Layer.ID"]) : [];
|
|
10389
|
+
rego.historicDateTime = (_g = entity.Bruce) === null || _g === void 0 ? void 0 : _g.historicDateTime;
|
|
10390
|
+
rego.historicAttrKey = (_h = entity.Bruce) === null || _h === void 0 ? void 0 : _h.historicAttrKey;
|
|
10391
|
+
rego.cdn = this.item.cdnEnabled;
|
|
10382
10392
|
// We manually trigger an update event since the graphic was updated but not recreated.
|
|
10383
10393
|
this.visualsManager.OnUpdate.Trigger({
|
|
10384
10394
|
type: exports.VisualsRegister.EVisualUpdateType.Update,
|
|
@@ -10393,7 +10403,7 @@
|
|
|
10393
10403
|
menuItemId: this.item.id,
|
|
10394
10404
|
requestRender: false
|
|
10395
10405
|
});
|
|
10396
|
-
(
|
|
10406
|
+
(_j = this.clustering) === null || _j === void 0 ? void 0 : _j.RemoveEntity(id, false);
|
|
10397
10407
|
}
|
|
10398
10408
|
}
|
|
10399
10409
|
this.viewer.scene.requestRender();
|
|
@@ -11198,7 +11208,10 @@
|
|
|
11198
11208
|
requestRender: false
|
|
11199
11209
|
});
|
|
11200
11210
|
}
|
|
11201
|
-
else if (updated.get(id)) {
|
|
11211
|
+
else if (updated.get(id) && rego) {
|
|
11212
|
+
rego.visual = cEntity;
|
|
11213
|
+
rego.entityTypeId = entity.Bruce["EntityType.ID"];
|
|
11214
|
+
rego.name = cEntity.name;
|
|
11202
11215
|
// We manually trigger an update event since the graphic was updated but not recreated.
|
|
11203
11216
|
this.visualsManager.OnUpdate.Trigger({
|
|
11204
11217
|
type: exports.VisualsRegister.EVisualUpdateType.Update,
|
|
@@ -11802,7 +11815,10 @@
|
|
|
11802
11815
|
requestRender: false
|
|
11803
11816
|
});
|
|
11804
11817
|
}
|
|
11805
|
-
else if (updated.get(id)) {
|
|
11818
|
+
else if (updated.get(id) && rego) {
|
|
11819
|
+
rego.visual = cEntity;
|
|
11820
|
+
rego.entityTypeId = entity.Bruce["EntityType.ID"];
|
|
11821
|
+
rego.name = cEntity.name;
|
|
11806
11822
|
// We manually trigger an update event since the graphic was updated but not recreated.
|
|
11807
11823
|
this.visualsManager.OnUpdate.Trigger({
|
|
11808
11824
|
type: exports.VisualsRegister.EVisualUpdateType.Update,
|
|
@@ -12012,7 +12028,10 @@
|
|
|
12012
12028
|
requestRender: false
|
|
12013
12029
|
});
|
|
12014
12030
|
}
|
|
12015
|
-
else if (updated.get(id)) {
|
|
12031
|
+
else if (updated.get(id) && rego) {
|
|
12032
|
+
rego.visual = cEntity;
|
|
12033
|
+
rego.entityTypeId = entity.Bruce["EntityType.ID"];
|
|
12034
|
+
rego.name = cEntity.name;
|
|
12016
12035
|
// We manually trigger an update event since the graphic was updated but not recreated.
|
|
12017
12036
|
this.visualsManager.OnUpdate.Trigger({
|
|
12018
12037
|
type: exports.VisualsRegister.EVisualUpdateType.Update,
|
|
@@ -13683,9 +13702,6 @@
|
|
|
13683
13702
|
var integrity = this.tagIds == null ? "" : this.tagIds.join();
|
|
13684
13703
|
if (this.historicAttrKey) {
|
|
13685
13704
|
integrity += this.historicAttrKey;
|
|
13686
|
-
if (this.historicAttrDateTime) {
|
|
13687
|
-
integrity += this.historicAttrDateTime;
|
|
13688
|
-
}
|
|
13689
13705
|
}
|
|
13690
13706
|
return integrity;
|
|
13691
13707
|
};
|
|
@@ -13713,9 +13729,9 @@
|
|
|
13713
13729
|
return;
|
|
13714
13730
|
}
|
|
13715
13731
|
var delayQueue = new bruceModels.DelayQueue(function () {
|
|
13716
|
-
var current = _this.
|
|
13732
|
+
var current = _this.historicAttrDateTime;
|
|
13717
13733
|
_this.updateHistoricDateTime();
|
|
13718
|
-
if (current != _this.
|
|
13734
|
+
if (current != _this.historicAttrDateTime) {
|
|
13719
13735
|
_this.updateState();
|
|
13720
13736
|
}
|
|
13721
13737
|
}, 250);
|
|
@@ -13734,8 +13750,6 @@
|
|
|
13734
13750
|
Getter.prototype.updateHistoricDateTime = function () {
|
|
13735
13751
|
if (!this.historicAttrKey) {
|
|
13736
13752
|
this.historicAttrDateTime = null;
|
|
13737
|
-
this.historicAttrDateTimeMin = null;
|
|
13738
|
-
this.historicAttrDateTimeMax = null;
|
|
13739
13753
|
return;
|
|
13740
13754
|
}
|
|
13741
13755
|
var isChanged = function (before, after) {
|
|
@@ -13750,16 +13764,8 @@
|
|
|
13750
13764
|
};
|
|
13751
13765
|
var oldDateTime = this.historicAttrDateTime ? new Date(this.historicAttrDateTime) : null;
|
|
13752
13766
|
var newDateTime = Cesium.JulianDate.toDate(this.viewer.clock.currentTime);
|
|
13753
|
-
|
|
13754
|
-
var newDateMin = this.viewer.clock.startTime ? Cesium.JulianDate.toDate(this.viewer.clock.startTime) : null;
|
|
13755
|
-
var oldDateMax = this.historicAttrDateTimeMax ? new Date(this.historicAttrDateTimeMax) : null;
|
|
13756
|
-
var newDateMax = this.viewer.clock.stopTime ? Cesium.JulianDate.toDate(this.viewer.clock.stopTime) : null;
|
|
13757
|
-
if (isChanged(oldDateTime, newDateTime) ||
|
|
13758
|
-
isChanged(oldDateMin, newDateMin) ||
|
|
13759
|
-
isChanged(oldDateMax, newDateMax)) {
|
|
13767
|
+
if (isChanged(oldDateTime, newDateTime)) {
|
|
13760
13768
|
this.historicAttrDateTime = newDateTime.toISOString();
|
|
13761
|
-
this.historicAttrDateTimeMin = newDateMin === null || newDateMin === void 0 ? void 0 : newDateMin.toISOString();
|
|
13762
|
-
this.historicAttrDateTimeMax = newDateMax === null || newDateMax === void 0 ? void 0 : newDateMax.toISOString();
|
|
13763
13769
|
}
|
|
13764
13770
|
};
|
|
13765
13771
|
Getter.prototype.viewerDateTimeDispose = function () {
|
|
@@ -13926,8 +13932,6 @@
|
|
|
13926
13932
|
api: this.api,
|
|
13927
13933
|
historicKey: this.historicAttrKey,
|
|
13928
13934
|
historicPoint: this.historicAttrDateTime,
|
|
13929
|
-
historicFrom: this.historicAttrKey ? this.historicAttrDateTimeMin : null,
|
|
13930
|
-
historicTo: this.historicAttrKey ? this.historicAttrDateTimeMax : null,
|
|
13931
13935
|
filter: {
|
|
13932
13936
|
pageSize: PAGE_SIZE,
|
|
13933
13937
|
pageIndex: curCell.FetchPageIndex,
|
|
@@ -23432,7 +23436,7 @@
|
|
|
23432
23436
|
ViewRenderEngine.Render = Render;
|
|
23433
23437
|
})(exports.ViewRenderEngine || (exports.ViewRenderEngine = {}));
|
|
23434
23438
|
|
|
23435
|
-
var VERSION = "3.7.
|
|
23439
|
+
var VERSION = "3.7.9";
|
|
23436
23440
|
|
|
23437
23441
|
exports.VERSION = VERSION;
|
|
23438
23442
|
exports.CesiumParabola = CesiumParabola;
|