bruce-cesium 2.8.7 → 2.8.9

package/dist/bruce-cesium.umd.js

@@ -1937,6 +1937,34 @@
         }
         return length;
     }
+    var _billboardCache = new bruceModels.LRUCache(100);
+    var POINT_BILLBOARD_PADDING = 1;
+    var createCircleBillboard = function (size, colorCss) {
+        var key = size + "-" + colorCss;
+        var cacheData = _billboardCache.Get(key);
+        if ((cacheData === null || cacheData === void 0 ? void 0 : cacheData.canvas) instanceof HTMLCanvasElement) {
+            return cacheData;
+        }
+        // Slight padding to avoid corners clipping.
+        var canvasSize = size + (POINT_BILLBOARD_PADDING * 4);
+        var canvas = document.createElement("canvas");
+        canvas.width = canvasSize;
+        canvas.height = canvasSize;
+        var context = canvas.getContext("2d");
+        context.beginPath();
+        context.arc(canvasSize / 2, canvasSize / 2, size / 2, 0, 2 * Math.PI, false);
+        context.fillStyle = colorCss;
+        context.fill();
+        var data = {
+            canvas: canvas,
+            colorCss: colorCss,
+            size: size,
+            height: canvasSize,
+            width: canvasSize
+        };
+        _billboardCache.Set(key, data);
+        return data;
+    };
     (function (EntityRenderEngine) {
         function Render(params) {
             var _a, _b, _c, _d, _e, _f, _g, _h;
@@ -2196,7 +2224,7 @@
         (function (Point) {
             function Render(params) {
                 return __awaiter(this, void 0, void 0, function () {
-                    var entity, style, type, cEntity, siblings, iconUrlRows, icon, iconUrl_1, res, blob_1, e_4, e_5, iconScale, disableDepthTest, heightRef, radius, bFill, cFill, outline, cOutline, outlineWidth, bOutline, heightRef, pos3d, extrusion, outlineExtrusion, bColor, cColor, size, heightRef;
+                    var entity, style, type, cEntity, siblings, iconUrlRows, icon, iconUrl_1, res, blob_1, e_4, e_5, iconScale, disableDepthTest, heightRef, radius, bFill, cFill, outline, cOutline, outlineWidth, bOutline, heightRef, pos3d, extrusion, outlineExtrusion, bColor, cColor, size, heightRef, circleBillboard;
                     return __generator(this, function (_a) {
                         switch (_a.label) {
                             case 0:
@@ -2294,8 +2322,7 @@
                                                 heightReference: getHeightRef(style),
                                                 scale: iconScale,
                                                 disableDepthTestDistance: disableDepthTest ? Number.POSITIVE_INFINITY : undefined,
-                                                distanceDisplayCondition: getDisplayCondition(params.minDistance, params.maxDistance),
-                                                height: _fileHeightCache[iconUrl_1]
+                                                distanceDisplayCondition: getDisplayCondition(params.minDistance, params.maxDistance)
                                                 // Would be great once we have a setting for this.
                                                 // translucencyByDistance: getTranslucencyByDistance(params.minDistance, params.maxDistance),
                                             },
@@ -2307,6 +2334,7 @@
                                             }),
                                             show: true
                                         });
+                                        cEntity.billboard._billboardSize = _fileHeightCache[iconUrl_1];
                                     }
                                 }
                                 _a.label = 12;
@@ -2386,11 +2414,22 @@
                                         return [2 /*return*/, null];
                                     }
                                     heightRef = getHeightRef(style);
+                                    circleBillboard = createCircleBillboard(size, cColor.toCssColorString());
                                     cEntity = new Cesium.Entity({
-                                        point: {
-                                            pixelSize: size,
-                                            color: cColor,
-                                            heightReference: getHeightRef(style),
+                                        // point: {
+                                        //     pixelSize: size,
+                                        //     color: cColor,
+                                        //     heightReference: getHeightRef(style),
+                                        //     distanceDisplayCondition: getDisplayCondition(params.minDistance, params.maxDistance)
+                                        // },
+                                        // We are generating a billboard instead of using the point.
+                                        // This is because points were behaving strangely where they would appear oblong shapes.
+                                        // This occurred consistently when rendering many icons and points at the same time.
+                                        billboard: {
+                                            height: circleBillboard.height,
+                                            width: circleBillboard.width,
+                                            image: circleBillboard.canvas,
+                                            heightReference: heightRef,
                                             distanceDisplayCondition: getDisplayCondition(params.minDistance, params.maxDistance)
                                         },
                                         position: exports.EntityUtils.GetPos({
@@ -2401,6 +2440,7 @@
                                         }),
                                         show: true
                                     });
+                                    cEntity.billboard._billboardSize = Math.ceil(circleBillboard.height / 2);
                                 }
                                 if (cEntity) {
                                     cEntity._siblingGraphics = siblings;
@@ -3803,12 +3843,12 @@
                     return __generator(this, function (_h) {
                         switch (_h.label) {
                             case 0:
+                                this.removeLabel();
                                 pos3d = starterPos3d ? starterPos3d.clone() : null;
                                 counter = ++this.counter;
                                 if (this.disposed) {
                                     return [2 /*return*/];
                                 }
-                                this.removeLabel();
                                 sizeInM = 0;
                                 heightRef = null;
                                 pixelOffset = new Cesium.Cartesian2(0, -5);
@@ -3893,7 +3933,7 @@
                                     }
                                     else if (visual.billboard) {
                                         heightRef = getValue$1(this.viewer, visual.billboard.heightReference);
-                                        height = getValue$1(this.viewer, visual.billboard.height);
+                                        height = visual.billboard._billboardSize;
                                         if (height) {
                                             scale = EnsureNumber(getValue$1(this.viewer, visual.billboard.scale), 1);
                                             pixelOffset.y = -(height * scale);
@@ -3943,7 +3983,7 @@
                             case 1:
                                 pos3d = _h.sent();
                                 heightRef = Cesium.HeightReference.NONE;
-                                if (this.counter != counter) {
+                                if (this.counter != counter || this.disposed) {
                                     return [2 /*return*/];
                                 }
                                 _h.label = 2;
@@ -4000,11 +4040,17 @@
                                 if (this.disposed || this.counter != counter) {
                                     return [2 /*return*/];
                                 }
-                                ele = document.createElement("div");
-                                ele.innerHTML = text;
-                                ele.setAttribute("style", "\n                position: absolute;\n                z-index: 0;\n                display: none;\n                pointer-events: none;\n                padding: 6px 8px;\n                border-radius: 6px;\n                font-family: Arial;\n                font-size: 12px;\n                -webkit-backdrop-filter: blur(20px);\n                backdrop-filter: blur(20px);\n                background: rgba(33,39,42,.8);\n                border-radius: 9px;\n                box-shadow: 0 0 1px rgba(18,22,25,.36),0 18px 36px -4px rgba(18,22,25,.36);\n                color: #ffffff;\n            }");
-                                this.label = ele;
-                                this.viewer.container.appendChild(ele);
+                                ele = null;
+                                if (this.label) {
+                                    ele = this.label;
+                                }
+                                else {
+                                    ele = document.createElement("div");
+                                    ele.innerHTML = text;
+                                    ele.setAttribute("style", "\n                    position: absolute;\n                    z-index: 0;\n                    display: none;\n                    pointer-events: none;\n                    padding: 6px 8px;\n                    border-radius: 6px;\n                    font-family: Arial;\n                    font-size: 12px;\n                    -webkit-backdrop-filter: blur(20px);\n                    backdrop-filter: blur(20px);\n                    background: rgba(33,39,42,.8);\n                    border-radius: 9px;\n                    box-shadow: 0 0 1px rgba(18,22,25,.36),0 18px 36px -4px rgba(18,22,25,.36);\n                    color: #ffffff;\n                }");
+                                    this.label = ele;
+                                    this.viewer.container.appendChild(ele);
+                                }
                                 _lastDistance = null;
                                 _lastCameraPos = null;
                                 getDistance = function () {
@@ -4107,12 +4153,12 @@
                                 updateLabel();
                                 terrTimeout = null;
                                 this.terrChangedRemoval = this.viewer.scene.terrainProviderChanged.addEventListener(function () {
-                                    if (_this.disposed) {
+                                    clearTimeout(terrTimeout);
+                                    if (_this.disposed || _this.counter != counter) {
                                         return;
                                     }
-                                    clearTimeout(terrTimeout);
                                     terrTimeout = setTimeout(function () {
-                                        if (counter != _this.counter) {
+                                        if (_this.disposed || counter != _this.counter) {
                                             return;
                                         }
                                         _this.createLabel(starterPos3d);
@@ -4346,6 +4392,11 @@
                     });
                 }
             }
+            else {
+                exports.EntityLabel.Detatch({
+                    rego: rego
+                });
+            }
         }
     }
     function markEntity(register, rego, visual, ignoreParent) {
@@ -4940,6 +4991,9 @@
                             if (shouldRetain) {
                                 continue;
                             }
+                            exports.EntityLabel.Detatch({
+                                rego: rego
+                            });
                             removeEntity(this.viewer, rego.visual);
                             var doesInclude = this.rego[entityId_4].find(function (r) { return r.menuItemId === menuItemId; });
                             if (doesInclude) {
@@ -4968,6 +5022,9 @@
                         if (!rego) {
                             return { value: void 0 };
                         }
+                        exports.EntityLabel.Detatch({
+                            rego: rego
+                        });
                         removeEntity(this_2.viewer, rego.visual);
                         (_b = this_2.onUpdate) === null || _b === void 0 ? void 0 : _b.Trigger({
                             type: EVisualUpdateType.Remove,
@@ -4995,6 +5052,9 @@
                             if (!rego) {
                                 continue;
                             }
+                            exports.EntityLabel.Detatch({
+                                rego: rego
+                            });
                             removeEntity(this.viewer, rego.visual);
                             this.rego[entityId_5] = entityRegos.filter(function (r) { return r.menuItemId !== menuItemId; });
                             (_c = this.onUpdate) === null || _c === void 0 ? void 0 : _c.Trigger({
@@ -5015,7 +5075,7 @@
             /**
              * Returns an array of drilled visuals associated with this register.
              * The top array item is the first found.
-             * @param cursor
+             * @param params
              * @returns
              */
             Register.prototype.GetRegosFromCursor = function (params) {
@@ -9906,11 +9966,17 @@
              * @param relation
              */
             Manager.prototype.shouldRenderRelation = function (relation) {
-                var _a, _b, _c;
-                if (((_a = this.item.relationTypeIds) === null || _a === void 0 ? void 0 : _a.length) && !this.item.relationTypeIds.includes(relation["Relation.Type.ID"])) {
-                    return false;
+                var _a, _b, _c, _d;
+                if ((_a = this.item.relations) === null || _a === void 0 ? void 0 : _a.length) {
+                    // Find group for the same relationship type.
+                    var typeRelations = this.item.relations.find(function (x) { return x.relationTypeId == relation["Relation.Type.ID"]; });
+                    // See if group contains the parent entity ID.
+                    if ((_b = typeRelations === null || typeRelations === void 0 ? void 0 : typeRelations.entityIds) === null || _b === void 0 ? void 0 : _b.find(function (x) { return x == relation["Principal.Entity.ID"]; })) {
+                        return true;
+                    }
                 }
-                var renderedIds = (_c = (_b = this.item) === null || _b === void 0 ? void 0 : _b.BruceEntity) === null || _c === void 0 ? void 0 : _c.EntityIds;
+                // Backwards compatability.
+                var renderedIds = (_d = (_c = this.item) === null || _c === void 0 ? void 0 : _c.BruceEntity) === null || _d === void 0 ? void 0 : _d.EntityIds;
                 if (!renderedIds) {
                     return false;
                 }
@@ -10362,8 +10428,7 @@
             /**
              * Disables a menu item by its id.
              * This will disable all children as well.
-             * @param id
-             * @param recursive
+             * @param params
              */
             Manager.prototype.RemoveItemById = function (params) {
                 var _a, _b;
@@ -12685,6 +12750,7 @@
     }
     /**
      * Renders DATA_VERSION = 1 navigator.
+     * param iteration
      * @param params
      * @param bookmark
      * @param view
@@ -12808,33 +12874,32 @@
                         }
                         _f.label = 3;
                     case 3:
-                        if (!((_e = bSettings === null || bSettings === void 0 ? void 0 : bSettings.drawnRelationEntityIDs) === null || _e === void 0 ? void 0 : _e.length)) return [3 /*break*/, 5];
-                        menuItem = {
-                            id: RELATION_MENU_ITEM_ID,
-                            Caption: "Entity relations",
-                            BruceEntity: {
-                                EntityIds: bSettings.drawnRelationEntityIDs
-                            },
-                            Type: bruceModels.MenuItem.EType.Relations
-                        };
-                        return [4 /*yield*/, params.manager.RenderItem({
+                        if ((_e = bSettings === null || bSettings === void 0 ? void 0 : bSettings.drawnRelationEntityIDs) === null || _e === void 0 ? void 0 : _e.length) {
+                            menuItem = {
+                                id: RELATION_MENU_ITEM_ID,
+                                Caption: "Entity relations",
+                                BruceEntity: {
+                                    EntityIds: bSettings.drawnRelationEntityIDs
+                                },
+                                Type: bruceModels.MenuItem.EType.Relations
+                            };
+                            params.manager.RenderItem({
                                 apiGetter: params.apiGetter,
                                 getters: params.getters,
                                 item: menuItem
-                            })];
-                    case 4:
-                        _f.sent();
-                        if (!assertIteration$1(params.viewer, iteration)) {
-                            return [2 /*return*/];
+                            });
+                            if (!assertIteration$1(params.viewer, iteration)) {
+                                return [2 /*return*/];
+                            }
                         }
-                        _f.label = 5;
-                    case 5: return [2 /*return*/];
+                        return [2 /*return*/];
                 }
             });
         });
     }
     /**
      * Renders DATA_VERSION > 1 navigator.
+     * @param iteration
      * @param params
      * @param bookmark
      * @param view
@@ -12842,7 +12907,7 @@
     function renderNavigator(iteration, params, bookmark, view) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6;
         return __awaiter(this, void 0, void 0, function () {
-            var viewer, scene, vSettings, bSettings, defaults, camera, newLens, shouldBe2d, curIs2d, transition, pos, terrain, hillShades, baseColor, globeHidden, terrainWireframe, globeAlpha, shadows, size, ambientOcclusion, AO, lighting, light, quality, fxaa, dateTime, clock, selectedIds, hiddenIds, isolatedIds, labelledIds, entityOpacityMap, entityId, opacity, imagery, renderedRelationEntityIds, curEnabled, newItemIds, _i, curEnabled_1, id, menuItem, gOcclusion;
+            var viewer, scene, vSettings, bSettings, defaults, camera, newLens, shouldBe2d, curIs2d, transition, pos, terrain, hillShades, baseColor, globeHidden, terrainWireframe, globeAlpha, shadows, size, ambientOcclusion, AO, lighting, light, quality, fxaa, dateTime, clock, selectedIds, hiddenIds, isolatedIds, labelledIds, curLabelledIds, toUnLabel, entityOpacityMap, entityId, opacity, imagery, legacyRelationIds, relations, curEnabled, newItemIds, _i, curEnabled_1, id, menuItem, gOcclusion;
             return __generator(this, function (_7) {
                 switch (_7.label) {
                     case 0:
@@ -13070,15 +13135,24 @@
                                 entityIds: isolatedIds
                             });
                         }
-                        params.manager.VisualsRegister.ClearLabelled();
                         labelledIds = bSettings === null || bSettings === void 0 ? void 0 : bSettings.labelledEntityIds;
                         if (labelledIds == null) {
                             labelledIds = (_2 = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _2 === void 0 ? void 0 : _2.labelledEntityIds;
                         }
-                        if (labelledIds != null) {
+                        if (!(labelledIds === null || labelledIds === void 0 ? void 0 : labelledIds.length)) {
+                            params.manager.VisualsRegister.ClearLabelled();
+                        }
+                        else {
+                            curLabelledIds = params.manager.VisualsRegister.GetLabelled();
                             params.manager.VisualsRegister.SetLabelled({
                                 labelled: true,
-                                entityIds: labelledIds
+                                entityIds: labelledIds,
+                                requestRender: false
+                            });
+                            toUnLabel = curLabelledIds.filter(function (id) { return labelledIds.indexOf(id) === -1; });
+                            params.manager.VisualsRegister.SetLabelled({
+                                labelled: false,
+                                entityIds: toUnLabel
                             });
                         }
                         params.manager.VisualsRegister.ClearOpacity();
@@ -13119,16 +13193,20 @@
                             tiles: imagery,
                             viewer: params.manager.Viewer,
                         });
-                        renderedRelationEntityIds = bSettings === null || bSettings === void 0 ? void 0 : bSettings.renderedEntityRelations;
-                        if (!renderedRelationEntityIds) {
-                            renderedRelationEntityIds = [];
+                        legacyRelationIds = bSettings === null || bSettings === void 0 ? void 0 : bSettings.renderedEntityRelations;
+                        if (!legacyRelationIds) {
+                            legacyRelationIds = [];
+                        }
+                        relations = bSettings === null || bSettings === void 0 ? void 0 : bSettings.renderedRelations;
+                        if (!relations) {
+                            relations = [];
                         }
                         curEnabled = params.manager.GetEnabledItemIds();
                         newItemIds = (_5 = bSettings === null || bSettings === void 0 ? void 0 : bSettings.menuItemIds) !== null && _5 !== void 0 ? _5 : [];
                         for (_i = 0, curEnabled_1 = curEnabled; _i < curEnabled_1.length; _i++) {
                             id = curEnabled_1[_i];
-                            if (newItemIds.indexOf(id) === -1 ||
-                                (id == RELATION_MENU_ITEM_ID && !renderedRelationEntityIds.length)) {
+                            if ((newItemIds.indexOf(id) === -1 && id != RELATION_MENU_ITEM_ID) ||
+                                (id == RELATION_MENU_ITEM_ID && !legacyRelationIds.length && !relations.length)) {
                                 params.manager.RemoveItemById({
                                     menuItemId: id
                                 });
@@ -13148,26 +13226,24 @@
                         }
                         _7.label = 4;
                     case 4:
-                        if (!renderedRelationEntityIds.length) return [3 /*break*/, 6];
-                        menuItem = {
-                            id: RELATION_MENU_ITEM_ID,
-                            Caption: "Entity relations",
-                            BruceEntity: {
-                                EntityIds: renderedRelationEntityIds
-                            },
-                            Type: bruceModels.MenuItem.EType.Relations
-                        };
-                        return [4 /*yield*/, params.manager.RenderItem({
+                        if (legacyRelationIds.length || relations.length) {
+                            menuItem = {
+                                id: RELATION_MENU_ITEM_ID,
+                                Caption: "Entity relations",
+                                BruceEntity: {
+                                    EntityIds: legacyRelationIds
+                                },
+                                relations: relations,
+                                Type: bruceModels.MenuItem.EType.Relations
+                            };
+                            params.manager.RenderItem({
                                 getters: params.getters,
                                 item: menuItem
-                            })];
-                    case 5:
-                        _7.sent();
-                        if (!assertIteration$1(params.viewer, iteration)) {
-                            return [2 /*return*/];
+                            });
+                            if (!assertIteration$1(params.viewer, iteration)) {
+                                return [2 /*return*/];
+                            }
                         }
-                        _7.label = 6;
-                    case 6:
                         gOcclusion = bSettings === null || bSettings === void 0 ? void 0 : bSettings.groundOcclusion;
                         if (gOcclusion == null) {
                             gOcclusion = (_6 = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _6 === void 0 ? void 0 : _6.groundOcclusion;
@@ -15920,9 +15996,13 @@
             // We check in case something else is also requesting renders.
             var lastRenderTime = viewer.scene.lastRenderTime;
             if (!lastRenderTime || Cesium.JulianDate.secondsDifference(Cesium.JulianDate.now(), lastRenderTime) > 3) {
-                viewer.scene.requestRender();
+                // Check if window is active/in focus.
+                // TODO: Should render the moment it is in focus as well.
+                if (document.hasFocus()) {
+                    viewer.scene.requestRender();
+                }
             }
-        }, 3500);
+        }, 1500);
     }
     (function (ViewerUtils) {
         /**
@@ -16075,7 +16155,7 @@
         ViewerUtils.CreateWidgets = CreateWidgets;
     })(exports.ViewerUtils || (exports.ViewerUtils = {}));
 
-    var VERSION$1 = "2.8.7";
+    var VERSION$1 = "2.8.9";
 
     exports.VERSION = VERSION$1;
     exports.CesiumViewMonitor = CesiumViewMonitor;