bruce-cesium 3.3.7 → 3.3.8

package/dist/bruce-cesium.umd.js

@@ -3049,7 +3049,7 @@
                 var rego = register.GetRego({
                     entityId: entityId
                 });
-                if (!rego || !rego.visual || !(rego.visual instanceof Cesium.Entity) || rego.relation != null || rego.overrideShow != null) {
+                if (!rego || !rego.visual || !(rego.visual instanceof Cesium.Entity) || rego.relation != null || rego.overrideShow != null || rego.collection) {
                     continue;
                 }
                 var parts = exports.EntityUtils.GatherEntity({
@@ -6173,8 +6173,14 @@
             }
         }
     }
-    function updateCEntityShow(viewer, isRelationship, visual, isShowOverriden, show, ignoreParent) {
-        if (show && !isRelationship && !isShowOverriden) {
+    var MAX_SHOW_DEPTH = 10;
+    function updateCEntityShow(viewer, visual, rego, show, ignoreParent, depth) {
+        if (depth === void 0) { depth = 0; }
+        if (depth > MAX_SHOW_DEPTH) {
+            console.warn("updateCEntityShow(): Max show depth reached. EntityId = " + rego.entityId);
+            return;
+        }
+        if (show && !rego.relation && !rego.overrideShow && !rego.collection) {
             // Culling is controlled by "visual-register-culler.ts".
             // When an object is unculled then the 'updateEntityShow' function is re-called to reveal it and related objects.
             // A sub-object can be culled while the siblings are not.
@@ -6182,31 +6188,42 @@
             show = !isCulled;
         }
         if (visual._parentEntity && !ignoreParent) {
-            updateCEntityShow(viewer, isRelationship, visual._parentEntity, isShowOverriden, show, false);
+            updateCEntityShow(viewer, visual._parentEntity, rego, show, false, depth + 1);
         }
         if (visual._siblingGraphics) {
             for (var i = 0; i < visual._siblingGraphics.length; i++) {
                 var sibling = visual._siblingGraphics[i];
-                updateCEntityShow(viewer, isRelationship, sibling, isShowOverriden, show, true);
+                updateCEntityShow(viewer, sibling, rego, show, true, depth + 1);
             }
         }
         /**
          * Do NOT use ".show" as it causes crashes in Cesium polylines that are clamped to ground.
          * We could target them specifically here but we may be getting overall performance gain by just removing stuff from the scene.
          */
-        if (!show && viewer.entities.contains(visual)) {
-            viewer.entities.remove(visual);
+        if (rego.collection) {
+            if (!show && rego.collection.contains(visual)) {
+                rego.collection.remove(visual);
+            }
+            else if (show && !rego.collection.contains(visual)) {
+                rego.collection.add(visual);
+            }
         }
-        else if (show && !viewer.entities.contains(visual)) {
-            viewer.entities.add(visual);
+        else {
+            if (!show && viewer.entities.contains(visual)) {
+                viewer.entities.remove(visual);
+            }
+            else if (show && !viewer.entities.contains(visual)) {
+                viewer.entities.add(visual);
+            }
         }
     }
-    function updateEntityShow(viewer, isRelationship, visual, isShowOverriden, show) {
+    function updateEntityShow(viewer, rego, show) {
+        var visual = rego.visual;
         if (visual instanceof Cesium.Entity) {
             if (!(viewer === null || viewer === void 0 ? void 0 : viewer.scene) || viewer.isDestroyed()) {
                 return;
             }
-            updateCEntityShow(viewer, isRelationship, visual, isShowOverriden, show, false);
+            updateCEntityShow(viewer, rego.visual, rego, show, false, 0);
             return;
         }
         if (!isAlive$1(viewer, visual)) {
@@ -6259,7 +6276,7 @@
             if (visible == null) {
                 visible = getShowState(rego);
             }
-            updateEntityShow(viewer, rego.relation != null, rego.visual, rego.overrideShow != null, visible);
+            updateEntityShow(viewer, rego, visible);
             if (rego.best) {
                 var isLabelled = register.GetIsLabelled({
                     entityId: entityId
@@ -6376,6 +6393,10 @@
                 enumerable: false,
                 configurable: true
             });
+            Register.prototype.RefreshMark = function (params) {
+                var rego = params.rego;
+                markEntity(this, rego, rego.visual, false);
+            };
             Register.prototype.Dispose = function () {
                 var _a;
                 (_a = this.cameraCullerDispose) === null || _a === void 0 ? void 0 : _a.call(this, {
@@ -7998,6 +8019,15 @@
 
     var BATCH_SIZE = 500;
     var CHECK_BATCH_SIZE = 250;
+    function getValue$3(viewer, obj) {
+        if (obj === null || obj === void 0 ? void 0 : obj.getValue) {
+            return obj.getValue(viewer.scene.lastRenderTime);
+        }
+        return obj;
+    }
+    function colorToCColor$2(color) {
+        return new Cesium.Color(color.red ? color.red / 255 : 0, color.green ? color.green / 255 : 0, color.blue ? color.blue / 255 : 0, color.alpha);
+    }
     (function (EntitiesRenderManager) {
         var Manager = /** @class */ (function () {
             function Manager(params) {
@@ -8012,6 +8042,10 @@
                 this.viewMonitorRemoval = null;
                 this.renderQueue = [];
                 this.renderQueueInterval = null;
+                this.sources = [];
+                // Highly experimental flag to try improve rendering large sets of polygons and polylines.
+                // Many things are not supported when this is enabled.
+                this.useGeojson = false;
                 var viewer = params.viewer, apiGetter = params.apiGetter, monitor = params.monitor, item = params.item, visualsManager = params.register, sharedGetters = params.sharedGetters;
                 this.viewer = viewer;
                 this.sharedGetters = sharedGetters;
@@ -8019,6 +8053,7 @@
                 this.apiGetter = apiGetter;
                 this.item = item;
                 this.visualsManager = visualsManager;
+                this.useGeojson = item.renderAsGeojson == true;
                 if (item.enableClustering) {
                     this.clustering = new PointClustering(this.visualsManager, this.item.id);
                 }
@@ -8168,6 +8203,12 @@
                 clearInterval(this.renderQueueInterval);
                 this.renderQueue = [];
                 (_c = this.clustering) === null || _c === void 0 ? void 0 : _c.Dispose();
+                this.clustering = null;
+                for (var i = 0; i < this.sources.length; i++) {
+                    var source = this.sources[i];
+                    this.viewer.dataSources.remove(source);
+                }
+                this.sources = [];
             };
             Manager.prototype.ReRender = function (params) {
                 return __awaiter(this, void 0, void 0, function () {
@@ -8319,14 +8360,14 @@
                 }
             };
             Manager.prototype.renderEntities = function (entities, force) {
-                var _a, _b, _c, _d;
+                var _a;
                 if (force === void 0) { force = false; }
                 return __awaiter(this, void 0, void 0, function () {
-                    var typeId_1, cEntities, i, entity, id, cEntity, visual, wasClustered, tagIds, rego, e_3;
-                    return __generator(this, function (_e) {
-                        switch (_e.label) {
+                    var typeId_1, e_3;
+                    return __generator(this, function (_b) {
+                        switch (_b.label) {
                             case 0:
-                                _e.trys.push([0, 2, , 3]);
+                                _b.trys.push([0, 5, , 6]);
                                 if (this.disposed || this.viewer.isDestroyed()) {
                                     return [2 /*return*/];
                                 }
@@ -8334,17 +8375,227 @@
                                 if (typeId_1) {
                                     entities = entities.filter(function (x) { var _a; return ((_a = x.Bruce) === null || _a === void 0 ? void 0 : _a["EntityType.ID"]) == typeId_1; });
                                 }
-                                return [4 /*yield*/, exports.EntityRenderEngine.Render({
-                                        viewer: this.viewer,
-                                        apiGetter: this.apiGetter,
-                                        entities: entities,
-                                        menuItemId: this.item.id,
-                                        visualRegister: this.visualsManager,
-                                        zoomControl: this.item.CameraZoomSettings,
-                                        force: force
+                                if (!this.useGeojson) return [3 /*break*/, 2];
+                                return [4 /*yield*/, this.renderAsGeojson(entities, force)];
+                            case 1:
+                                _b.sent();
+                                return [3 /*break*/, 4];
+                            case 2: return [4 /*yield*/, this.renderAsIndividuals(entities, force)];
+                            case 3:
+                                _b.sent();
+                                _b.label = 4;
+                            case 4: return [3 /*break*/, 6];
+                            case 5:
+                                e_3 = _b.sent();
+                                console.error(e_3);
+                                return [3 /*break*/, 6];
+                            case 6: return [2 /*return*/];
+                        }
+                    });
+                });
+            };
+            /**
+             * Our optimized and more stable path.
+             * We construct a geojson that we draw in one go.
+             * @param entities
+             * @param force TODO: This should re-render entities that are already rendered.
+             */
+            Manager.prototype.renderAsGeojson = function (entities, force) {
+                var _a, _b, _c, _d, _e, _f, _g, _h;
+                return __awaiter(this, void 0, void 0, function () {
+                    var zoomItem, style, e_4, entityType, e_5, pStyle, polygonsClamped, bFillColor, cFillColor, bLineColor, cLineColor, lineWidthPx, geojson, source, groups, register, sEntities, i, cEntity;
+                    var _this = this;
+                    return __generator(this, function (_j) {
+                        switch (_j.label) {
+                            case 0:
+                                entities = entities.filter(function (entity) {
+                                    var _a;
+                                    return !_this.renderedEntities[(_a = entity.Bruce) === null || _a === void 0 ? void 0 : _a.ID];
+                                });
+                                // Mark these as rendered.
+                                entities.forEach(function (entity) {
+                                    var _a;
+                                    _this.renderedEntities[(_a = entity.Bruce) === null || _a === void 0 ? void 0 : _a.ID] = true;
+                                });
+                                zoomItem = this.item.CameraZoomSettings[0];
+                                style = null;
+                                if (!(zoomItem === null || zoomItem === void 0 ? void 0 : zoomItem.StyleID)) return [3 /*break*/, 4];
+                                _j.label = 1;
+                            case 1:
+                                _j.trys.push([1, 3, , 4]);
+                                return [4 /*yield*/, bruceModels.Style.Get({
+                                        api: this.apiGetter.getApi(),
+                                        styleId: zoomItem === null || zoomItem === void 0 ? void 0 : zoomItem.StyleID
                                     })];
+                            case 2:
+                                style = (_a = (_j.sent()).style) === null || _a === void 0 ? void 0 : _a.Settings;
+                                return [3 /*break*/, 4];
+                            case 3:
+                                e_4 = _j.sent();
+                                console.error(e_4);
+                                return [3 /*break*/, 4];
+                            case 4:
+                                _j.trys.push([4, 8, , 9]);
+                                return [4 /*yield*/, bruceModels.EntityType.Get({
+                                        entityTypeId: this.item.BruceEntity["EntityType.ID"],
+                                        api: this.apiGetter.getApi()
+                                    })];
+                            case 5:
+                                entityType = (_b = (_j.sent())) === null || _b === void 0 ? void 0 : _b.entityType;
+                                if (!(!style && ((_c = this.item.BruceEntity) === null || _c === void 0 ? void 0 : _c["EntityType.ID"]))) return [3 /*break*/, 7];
+                                if (!entityType["DisplaySetting.ID"]) return [3 /*break*/, 7];
+                                return [4 /*yield*/, bruceModels.Style.Get({
+                                        api: this.apiGetter.getApi(),
+                                        styleId: entityType["DisplaySetting.ID"]
+                                    })];
+                            case 6:
+                                style = (_d = (_j.sent()).style) === null || _d === void 0 ? void 0 : _d.Settings;
+                                _j.label = 7;
+                            case 7: return [3 /*break*/, 9];
+                            case 8:
+                                e_5 = _j.sent();
+                                console.error(e_5);
+                                return [3 /*break*/, 9];
+                            case 9:
+                                pStyle = (_e = style === null || style === void 0 ? void 0 : style.polygonStyle) !== null && _e !== void 0 ? _e : {};
+                                polygonsClamped = ((_f = pStyle === null || pStyle === void 0 ? void 0 : pStyle.altitudeOption) === null || _f === void 0 ? void 0 : _f.id) == null ? true : ((_g = pStyle === null || pStyle === void 0 ? void 0 : pStyle.altitudeOption) === null || _g === void 0 ? void 0 : _g.id) == 0;
+                                bFillColor = bruceModels.Calculator.GetColor(pStyle.fillColor, {}, []);
+                                cFillColor = bFillColor ? colorToCColor$2(bFillColor) : Cesium.Color.fromCssColorString("rgba(139, 195, 74, 0.8)");
+                                bLineColor = bruceModels.Calculator.GetColor(pStyle.lineColor, {}, []);
+                                cLineColor = bLineColor ? colorToCColor$2(bLineColor) : Cesium.Color.fromCssColorString("rgba(80, 80, 80, 0.8)");
+                                lineWidthPx = pStyle.lineWidth ? bruceModels.Calculator.GetNumber(pStyle.lineWidth, {}, []) : null;
+                                if (lineWidthPx == null) {
+                                    lineWidthPx = 1;
+                                }
+                                lineWidthPx = EnsureNumber(lineWidthPx);
+                                if (lineWidthPx < 0.01) {
+                                    lineWidthPx = 0;
+                                }
+                                lineWidthPx = Math.round(lineWidthPx);
+                                geojson = bruceModels.Entity.ToGeoJson({
+                                    entities: entities,
+                                    includeUserData: false,
+                                    excludeAltitude: polygonsClamped && lineWidthPx <= 0,
+                                    altitude: lineWidthPx > 0 && polygonsClamped ? 1 : null,
+                                    // No points.
+                                    allowedDisplayTypes: [bruceModels.ZoomControl.EDisplayType.Geometry]
+                                });
+                                if (!((_h = geojson === null || geojson === void 0 ? void 0 : geojson.features) === null || _h === void 0 ? void 0 : _h.length)) {
+                                    return [2 /*return*/];
+                                }
+                                return [4 /*yield*/, Cesium.GeoJsonDataSource.load(geojson, {
+                                        stroke: cLineColor,
+                                        fill: cFillColor,
+                                        strokeWidth: lineWidthPx,
+                                        clampToGround: lineWidthPx <= 0 && polygonsClamped
+                                    })];
+                            case 10:
+                                source = _j.sent();
+                                this.viewer.dataSources.add(source);
+                                this.sources.push(source);
+                                if (this.disposed) {
+                                    this.doDispose();
+                                    return [2 /*return*/];
+                                }
+                                groups = [];
+                                register = function (thing) {
+                                    var _a, _b, _c, _d;
+                                    // See if the cesium entity already exists in a group.
+                                    var group = groups.find(function (x) { var _a; return ((_a = x.visual) === null || _a === void 0 ? void 0 : _a.id) == thing.id || x.siblings.find(function (x) { return (x === null || x === void 0 ? void 0 : x.id) == thing.id; }); });
+                                    if (group) {
+                                        return;
+                                    }
+                                    var metadata = getValue$3(_this.viewer, thing === null || thing === void 0 ? void 0 : thing.properties);
+                                    var entityId = (_a = metadata === null || metadata === void 0 ? void 0 : metadata.Bruce) === null || _a === void 0 ? void 0 : _a.ID;
+                                    if (!entityId) {
+                                        return;
+                                    }
+                                    // Find group for the nextspace entity ID.
+                                    group = groups.find(function (x) { return x.entityId == entityId; });
+                                    // No group yet. We can designate this as the primary entity and create a new group for it.
+                                    if (!group) {
+                                        group = {
+                                            entityId: entityId,
+                                            visual: thing,
+                                            tagIds: (_b = metadata === null || metadata === void 0 ? void 0 : metadata.Bruce) === null || _b === void 0 ? void 0 : _b["Layer.ID"],
+                                            entityTypeId: (_c = metadata === null || metadata === void 0 ? void 0 : metadata.Bruce) === null || _c === void 0 ? void 0 : _c["EntityType.ID"],
+                                            siblings: [],
+                                            data: entities.find(function (x) { var _a; return ((_a = x.Bruce) === null || _a === void 0 ? void 0 : _a.ID) == entityId; }),
+                                            rego: null
+                                        };
+                                        groups.push(group);
+                                        var rego = {
+                                            entityId: entityId,
+                                            menuItemId: _this.item.id,
+                                            visual: thing,
+                                            priority: 0,
+                                            entityTypeId: group.entityTypeId,
+                                            accountId: _this.apiGetter.accountId,
+                                            tagIds: group.tagIds ? [].concat(group.tagIds) : [],
+                                            name: (_d = bruceModels.Entity.CalculateName({
+                                                entity: group.data,
+                                                type: entityType,
+                                                defaultToId: false
+                                            })) !== null && _d !== void 0 ? _d : "Unnamed Entity",
+                                            cdn: _this.item.cdnEnabled,
+                                            collection: source.entities
+                                        };
+                                        group.rego = rego;
+                                        _this.visualsManager.AddRego({
+                                            rego: rego,
+                                            requestRender: false
+                                        });
+                                    }
+                                    // Found a group. We flag this as a sibling entity of the primary.
+                                    else {
+                                        group.siblings.push(thing);
+                                        group.visual._siblingGraphics = group.siblings;
+                                        thing._parentEntity = group.visual;
+                                        if (group.rego) {
+                                            _this.visualsManager.RefreshMark({
+                                                rego: group.rego
+                                            });
+                                        }
+                                    }
+                                    // Won't do individual styles for now. More stability that way.
+                                    // applyStyle(thing, entityId, group.data);
+                                };
+                                sEntities = source.entities.values;
+                                for (i = 0; i < sEntities.length; i++) {
+                                    cEntity = sEntities[i];
+                                    register(cEntity);
+                                }
+                                this.viewer.scene.requestRender();
+                                return [2 /*return*/];
+                        }
+                    });
+                });
+            };
+            /**
+             * Our default path.
+             * We render each entity individually.
+             * @param entities
+             * @param force
+             * @returns
+             */
+            Manager.prototype.renderAsIndividuals = function (entities, force) {
+                var _a, _b, _c;
+                if (force === void 0) { force = false; }
+                return __awaiter(this, void 0, void 0, function () {
+                    var cEntities, i, entity, id, cEntity, visual, wasClustered, tagIds, rego;
+                    return __generator(this, function (_d) {
+                        switch (_d.label) {
+                            case 0: return [4 /*yield*/, exports.EntityRenderEngine.Render({
+                                    viewer: this.viewer,
+                                    apiGetter: this.apiGetter,
+                                    entities: entities,
+                                    menuItemId: this.item.id,
+                                    visualRegister: this.visualsManager,
+                                    zoomControl: this.item.CameraZoomSettings,
+                                    force: force
+                                })];
                             case 1:
-                                cEntities = _e.sent();
+                                cEntities = _d.sent();
                                 if (this.disposed) {
                                     this.doDispose();
                                     return [2 /*return*/];
@@ -8355,13 +8606,13 @@
                                     cEntity = cEntities[id];
                                     this.renderedEntities[id] = !!cEntity;
                                     if (cEntity) {
-                                        visual = (_b = this.visualsManager.GetRego({
+                                        visual = (_a = this.visualsManager.GetRego({
                                             entityId: id,
                                             menuItemId: this.item.id
-                                        })) === null || _b === void 0 ? void 0 : _b.visual;
+                                        })) === null || _a === void 0 ? void 0 : _a.visual;
                                         if (!visual || visual != cEntity) {
                                             wasClustered = this.clustering ? this.clustering.AddEntity(id, cEntity, false) : false;
-                                            tagIds = (_c = entity.Bruce) === null || _c === void 0 ? void 0 : _c["Layer.ID"];
+                                            tagIds = (_b = entity.Bruce) === null || _b === void 0 ? void 0 : _b["Layer.ID"];
                                             rego = {
                                                 entityId: id,
                                                 menuItemId: this.item.id,
@@ -8386,19 +8637,14 @@
                                             menuItemId: this.item.id,
                                             requestRender: false
                                         });
-                                        (_d = this.clustering) === null || _d === void 0 ? void 0 : _d.RemoveEntity(id, false);
+                                        (_c = this.clustering) === null || _c === void 0 ? void 0 : _c.RemoveEntity(id, false);
                                     }
                                 }
                                 this.viewer.scene.requestRender();
                                 if (this.clustering && entities.length) {
                                     this.clustering.Update();
                                 }
-                                return [3 /*break*/, 3];
-                            case 2:
-                                e_3 = _e.sent();
-                                console.error(e_3);
-                                return [3 /*break*/, 3];
-                            case 3: return [2 /*return*/];
+                                return [2 /*return*/];
                         }
                     });
                 });
@@ -9267,7 +9513,7 @@
         EntityRenderManager.Manager = Manager;
     })(exports.EntityRenderManager || (exports.EntityRenderManager = {}));
 
-    function colorToCColor$2(color) {
+    function colorToCColor$3(color) {
         return new Cesium.Color(color.red ? color.red / 255 : 0, color.green ? color.green / 255 : 0, color.blue ? color.blue / 255 : 0, color.alpha);
     }
     /**
@@ -10082,7 +10328,7 @@
                 }
                 var bColor = ((_a = style.modelStyle) === null || _a === void 0 ? void 0 : _a.fillColor) ? bruceModels.Calculator.GetColor(style.modelStyle.fillColor, data, []) : null;
                 if (bColor != null) {
-                    var cColor = colorToCColor$2(bColor);
+                    var cColor = colorToCColor$3(bColor);
                     var visual = entity.visual;
                     if (visual && visual instanceof Cesium.Cesium3DTileFeature) {
                         visual.color = cColor;
@@ -20049,7 +20295,7 @@
         CesiumViewMonitor.Monitor = Monitor;
     })(exports.CesiumViewMonitor || (exports.CesiumViewMonitor = {}));
 
-    var VERSION$1 = "3.3.7";
+    var VERSION$1 = "3.3.8";
 
     exports.VERSION = VERSION$1;
     exports.CesiumParabola = CesiumParabola;