bruce-cesium 2.8.8 → 2.9.0

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;
@@ -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);
@@ -9926,11 +9966,8 @@
              * @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 renderedIds = (_c = (_b = this.item) === null || _b === void 0 ? void 0 : _b.BruceEntity) === null || _c === void 0 ? void 0 : _c.EntityIds;
+                var _a, _b;
+                var renderedIds = (_b = (_a = this.item) === null || _a === void 0 ? void 0 : _a.BruceEntity) === null || _b === void 0 ? void 0 : _b.EntityIds;
                 if (!renderedIds) {
                     return false;
                 }
@@ -15948,9 +15985,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) {
         /**
@@ -16103,7 +16144,7 @@
         ViewerUtils.CreateWidgets = CreateWidgets;
     })(exports.ViewerUtils || (exports.ViewerUtils = {}));
 
-    var VERSION$1 = "2.8.8";
+    var VERSION$1 = "2.9.0";
 
     exports.VERSION = VERSION$1;
     exports.CesiumViewMonitor = CesiumViewMonitor;