bruce-cesium 3.4.6 → 3.4.8

package/dist/bruce-cesium.umd.js

@@ -3347,6 +3347,19 @@
         VisualRegisterCuller.MarkShouldRecheck = MarkShouldRecheck;
     })(VisualRegisterCuller || (VisualRegisterCuller = {}));
 
+    var _logErrorCache = {};
+    /**
+     * Will only log the error once matching the key.
+     * @param key
+     * @param message
+     */
+    function OneTimeError(key, message) {
+        if (!_logErrorCache[key]) {
+            console.error(message);
+            _logErrorCache[key] = true;
+        }
+    }
+
     function colorToCColor(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);
     }
@@ -3618,8 +3631,6 @@
         }
         return zoomItem.MinZoom + "-" + zoomItem.MaxZoom + "-" + shouldApplyFlatFix(terrain);
     }
-    var _fileValidationCache = {};
-    var _fileHeightCache = {};
     // Key = url + scale.
     var _fileRadiusCache = new bruceModels.LRUCache(1000);
     /**
@@ -3716,7 +3727,7 @@
         }
         return length;
     }
-    var _billboardCache = new bruceModels.LRUCache(100);
+    var _billboardCache = new bruceModels.LRUCache(150);
     var POINT_BILLBOARD_PADDING = 1;
     var createCircleBillboard = function (size, colorCss) {
         var key = size + "-" + colorCss;
@@ -3744,6 +3755,53 @@
         _billboardCache.Set(key, data);
         return data;
     };
+    var createImageBillboard = function (url) {
+        var cacheKey = "image-" + url;
+        var cacheData = _billboardCache.Get(cacheKey);
+        if (cacheData) {
+            return cacheData;
+        }
+        var prom = new Promise(function (res, rej) { return __awaiter(void 0, void 0, void 0, function () {
+            var response, blob, canvas_1, image_1, e_4;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        _a.trys.push([0, 3, , 4]);
+                        return [4 /*yield*/, fetch(url)];
+                    case 1:
+                        response = _a.sent();
+                        return [4 /*yield*/, response.blob()];
+                    case 2:
+                        blob = _a.sent();
+                        canvas_1 = document.createElement("canvas");
+                        image_1 = new Image();
+                        image_1.onload = function () {
+                            canvas_1.width = image_1.width;
+                            canvas_1.height = image_1.height;
+                            var context = canvas_1.getContext("2d");
+                            context.drawImage(image_1, 0, 0);
+                            var data = {
+                                canvas: canvas_1,
+                                height: image_1.height
+                            };
+                            res(data);
+                        };
+                        image_1.onerror = function (e) {
+                            rej(e);
+                        };
+                        image_1.src = URL.createObjectURL(blob);
+                        return [3 /*break*/, 4];
+                    case 3:
+                        e_4 = _a.sent();
+                        rej(e_4);
+                        return [3 /*break*/, 4];
+                    case 4: return [2 /*return*/];
+                }
+            });
+        }); });
+        _billboardCache.Set(cacheKey, prom);
+        return prom;
+    };
     /**
      * Removes duplicate points in a row and returns a new array.
      * Passed array is not mutated.
@@ -3794,6 +3852,48 @@
             });
         });
     }
+    /**
+     * Turns a hard-coded file url into pieces so we can properly load it using our libraries rather than directly.
+     * @param url eg: https://demoplantprocess.api.nextspace-uat.net/file/4c29bdf8-1f0b-4739-b0ee-421ea07ba4e5.png
+     */
+    function extractMetadataFromFileUrl(url) {
+        var _a;
+        url = url.toLowerCase();
+        // Bzzt, invalid url format for our purposes.
+        if (!url.includes(".api.") || !url.includes("/file/")) {
+            return null;
+        }
+        url = url.replace("https://", "").replace("http://", "");
+        var envId = bruceModels.Api.EEnv.PROD;
+        if (url.includes("-dev.net")) {
+            envId = bruceModels.Api.EEnv.DEV;
+        }
+        else if (url.includes("-stg.net")) {
+            envId = bruceModels.Api.EEnv.STG;
+        }
+        else if (url.includes("-uat.net")) {
+            envId = bruceModels.Api.EEnv.UAT;
+        }
+        var parts = url.split("/");
+        var host = parts[0];
+        var hostParts = host.split(".");
+        var accountId = hostParts[0];
+        var fileId = (_a = parts[2]) !== null && _a !== void 0 ? _a : "";
+        if (fileId.includes("?")) {
+            fileId = fileId.split("?")[0];
+        }
+        if (fileId.includes(".")) {
+            fileId = fileId.split(".")[0];
+        }
+        if (!fileId || !accountId) {
+            return null;
+        }
+        return {
+            accountId: accountId,
+            fileId: fileId,
+            envId: envId
+        };
+    }
     (function (EntityRenderEngine) {
         function Render(params) {
             var _a, _b, _c, _d, _e, _f, _g, _h;
@@ -4066,10 +4166,11 @@
             }
             Point.CreateCircleBillboard = CreateCircleBillboard;
             function Render(params) {
+                var _a, _b;
                 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, bColor, cColor, 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) {
+                    var entity, style, type, cEntity, siblings, iconUrlRows, icon, iconUrl, metadata, api, image, e_5, iconScale, disableDepthTest, bColor, cColor, heightRef, radius, bFill, cFill, outline, cOutline, outlineWidth, bOutline, heightRef, pos3d, extrusion, outlineExtrusion, bColor, cColor, size, heightRef, circleBillboard;
+                    return __generator(this, function (_c) {
+                        switch (_c.label) {
                             case 0:
                                 entity = params.entity;
                                 style = params.style;
@@ -4082,7 +4183,7 @@
                                 }
                                 cEntity = null;
                                 siblings = [];
-                                if (!(type == bruceModels.Style.EPointType.Icon)) return [3 /*break*/, 12];
+                                if (!(type == bruceModels.Style.EPointType.Icon)) return [3 /*break*/, 9];
                                 iconUrlRows = style.iconUrl == null ? [] : style.iconUrl;
                                 iconUrlRows.forEach(function (row) {
                                     if (row.type == bruceModels.Calculator.EValueType.Color) {
@@ -4090,67 +4191,55 @@
                                     }
                                 });
                                 icon = bruceModels.Calculator.GetString(iconUrlRows, entity, params.tags);
-                                iconUrl_1 = null;
-                                if (typeof icon == "string") {
-                                    iconUrl_1 = icon;
-                                }
-                                if (!iconUrl_1 && style.iconId) {
-                                    iconUrl_1 = bruceModels.ClientFile.GetUrl({
-                                        api: params.api,
-                                        fileId: style.iconId,
-                                        viaCdn: true
-                                    });
-                                }
-                                if (!iconUrl_1) return [3 /*break*/, 11];
-                                _a.label = 1;
+                                iconUrl = null;
+                                if (!(typeof icon == "string")) return [3 /*break*/, 2];
+                                iconUrl = icon;
+                                metadata = extractMetadataFromFileUrl(iconUrl);
+                                if (!metadata) return [3 /*break*/, 2];
+                                api = params.apiGetter.getApi(metadata.accountId);
+                                return [4 /*yield*/, api.Loading];
                             case 1:
-                                _a.trys.push([1, 10, , 11]);
-                                if (!(_fileValidationCache[iconUrl_1] == null)) return [3 /*break*/, 8];
-                                return [4 /*yield*/, fetch(iconUrl_1)];
+                                _c.sent();
+                                iconUrl = bruceModels.ClientFile.GetUrl({
+                                    api: api,
+                                    fileId: metadata.fileId,
+                                    viaCdn: true
+                                });
+                                _c.label = 2;
                             case 2:
-                                res = _a.sent();
-                                if (!(res.status != 200)) return [3 /*break*/, 3];
-                                iconUrl_1 = null;
-                                return [3 /*break*/, 7];
+                                if (!(!iconUrl && style.iconId)) return [3 /*break*/, 4];
+                                return [4 /*yield*/, params.api.Loading];
                             case 3:
-                                _a.trys.push([3, 6, , 7]);
-                                return [4 /*yield*/, res.blob()];
+                                _c.sent();
+                                iconUrl = bruceModels.ClientFile.GetUrl({
+                                    api: params.api,
+                                    fileId: style.iconId,
+                                    viaCdn: true
+                                });
+                                _c.label = 4;
                             case 4:
-                                blob_1 = _a.sent();
-                                return [4 /*yield*/, new Promise(function (res) {
-                                        var img = new Image();
-                                        img.onload = function () {
-                                            _fileHeightCache[iconUrl_1] = img.height;
-                                            res(null);
-                                        };
-                                        img.onerror = function () {
-                                            _fileHeightCache[iconUrl_1] = undefined;
-                                            res(null);
-                                        };
-                                        img.src = URL.createObjectURL(blob_1);
-                                    })];
+                                image = null;
+                                if (!iconUrl) return [3 /*break*/, 8];
+                                _c.label = 5;
                             case 5:
-                                _a.sent();
-                                return [3 /*break*/, 7];
+                                _c.trys.push([5, 7, , 8]);
+                                return [4 /*yield*/, createImageBillboard(iconUrl)];
                             case 6:
-                                e_4 = _a.sent();
-                                console.error(e_4);
-                                return [3 /*break*/, 7];
+                                image = _c.sent();
+                                return [3 /*break*/, 8];
                             case 7:
-                                _fileValidationCache[iconUrl_1] = Boolean(iconUrl_1);
-                                return [3 /*break*/, 9];
+                                e_5 = _c.sent();
+                                // Expanding the logging here so we can figure out why this is happening.
+                                // Most of the time the file is missing but we're getting some strange errors so I am including logging on the API settings as well.
+                                OneTimeError("ENTITY_RENDER_ENGINE_ICON_URL_ERROR_" + iconUrl, {
+                                    error: e_5,
+                                    iconUrl: iconUrl,
+                                    apiUrl: (_a = params.api) === null || _a === void 0 ? void 0 : _a.GetBaseUrl(),
+                                    apiAccountId: (_b = params.api) === null || _b === void 0 ? void 0 : _b.AccountId
+                                });
+                                return [3 /*break*/, 8];
                             case 8:
-                                if (!_fileValidationCache[iconUrl_1]) {
-                                    iconUrl_1 = null;
-                                }
-                                _a.label = 9;
-                            case 9: return [3 /*break*/, 11];
-                            case 10:
-                                e_5 = _a.sent();
-                                iconUrl_1 = null;
-                                return [3 /*break*/, 11];
-                            case 11:
-                                if (iconUrl_1) {
+                                if (image) {
                                     iconScale = EnsureNumber(bruceModels.Calculator.GetNumber(style.iconScale, entity, params.tags));
                                     if (!iconScale && iconScale != 0) {
                                         iconScale = 1;
@@ -4165,7 +4254,7 @@
                                             billboard: {
                                                 horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
                                                 verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
-                                                image: iconUrl_1,
+                                                image: image.canvas,
                                                 heightReference: getHeightRef(style),
                                                 scale: iconScale,
                                                 disableDepthTestDistance: disableDepthTest ? Number.POSITIVE_INFINITY : undefined,
@@ -4182,11 +4271,11 @@
                                             }),
                                             show: true
                                         });
-                                        cEntity.billboard._billboardSize = _fileHeightCache[iconUrl_1];
+                                        cEntity.billboard._billboardSize = image.height;
                                     }
                                 }
-                                _a.label = 12;
-                            case 12:
+                                _c.label = 9;
+                            case 9:
                                 if (type == bruceModels.Style.EPointType.Cylinder) {
                                     radius = EnsureNumber(bruceModels.Calculator.GetNumber(style.CylinderRadius, entity, params.tags));
                                     if (radius <= 0) {
@@ -4345,6 +4434,7 @@
                                         tags: tags,
                                         viewer: params.viewer,
                                         api: api,
+                                        apiGetter: params.apiGetter,
                                         maxDistance: zoomItem.MaxZoom,
                                         minDistance: zoomItem.MinZoom
                                     })];
@@ -4944,6 +5034,9 @@
                         switch (_g.label) {
                             case 0:
                                 api = params.apiGetter.getApi();
+                                return [4 /*yield*/, api.Loading];
+                            case 1:
+                                _g.sent();
                                 cEntities = {};
                                 reqBody = {
                                     "strict": false,
@@ -4951,32 +5044,32 @@
                                     "Items": []
                                 };
                                 i = 0;
-                                _g.label = 1;
-                            case 1:
-                                if (!(i < params.entities.length)) return [3 /*break*/, 8];
+                                _g.label = 2;
+                            case 2:
+                                if (!(i < params.entities.length)) return [3 /*break*/, 9];
                                 entity = params.entities[i];
                                 zoomItem = params.zoomItems[entity.Bruce.ID];
-                                if (!(zoomItem.StyleID != -1)) return [3 /*break*/, 3];
+                                if (!(zoomItem.StyleID != -1)) return [3 /*break*/, 4];
                                 return [4 /*yield*/, getStyle(api, entity, zoomItem.StyleID)];
-                            case 2:
-                                _f = (_a = (_g.sent())) === null || _a === void 0 ? void 0 : _a.Settings;
-                                return [3 /*break*/, 4];
                             case 3:
-                                _f = zoomItem.Style;
-                                _g.label = 4;
+                                _f = (_a = (_g.sent())) === null || _a === void 0 ? void 0 : _a.Settings;
+                                return [3 /*break*/, 5];
                             case 4:
+                                _f = zoomItem.Style;
+                                _g.label = 5;
+                            case 5:
                                 style = _f;
                                 tagIds = entity.Bruce["Layer.ID"];
                                 tags = [];
-                                if (!(tagIds && tagIds.length > 0)) return [3 /*break*/, 6];
+                                if (!(tagIds && tagIds.length > 0)) return [3 /*break*/, 7];
                                 return [4 /*yield*/, bruceModels.EntityTag.GetListByIds({
                                         api: api,
                                         tagIds: tagIds
                                     })];
-                            case 5:
-                                tags = (_g.sent()).tags;
-                                _g.label = 6;
                             case 6:
+                                tags = (_g.sent()).tags;
+                                _g.label = 7;
+                            case 7:
                                 mStyle = (_b = style === null || style === void 0 ? void 0 : style.modelStyle) !== null && _b !== void 0 ? _b : {};
                                 group = mStyle.lodGroup ? bruceModels.Calculator.GetString(mStyle.lodGroup, entity, tags) : null;
                                 if (!group) {
@@ -4996,15 +5089,15 @@
                                     "group": group,
                                     "level": level
                                 });
-                                _g.label = 7;
-                            case 7:
+                                _g.label = 8;
+                            case 8:
                                 i++;
-                                return [3 /*break*/, 1];
-                            case 8: return [4 /*yield*/, bruceModels.EntityLod.GetLods({
+                                return [3 /*break*/, 2];
+                            case 9: return [4 /*yield*/, bruceModels.EntityLod.GetLods({
                                     api: api,
                                     filter: reqBody
                                 })];
-                            case 9:
+                            case 10:
                                 lodData = (_g.sent()).lods;
                                 _loop_2 = function (i) {
                                     var entity, zoomItem, style, _h, tagIds, tags, lod, mStyle, cEntity, name_5;
@@ -5066,17 +5159,17 @@
                                     });
                                 };
                                 i = 0;
-                                _g.label = 10;
-                            case 10:
-                                if (!(i < params.entities.length)) return [3 /*break*/, 13];
-                                return [5 /*yield**/, _loop_2(i)];
+                                _g.label = 11;
                             case 11:
-                                _g.sent();
-                                _g.label = 12;
+                                if (!(i < params.entities.length)) return [3 /*break*/, 14];
+                                return [5 /*yield**/, _loop_2(i)];
                             case 12:
+                                _g.sent();
+                                _g.label = 13;
+                            case 13:
                                 i++;
-                                return [3 /*break*/, 10];
-                            case 13: return [2 /*return*/, cEntities];
+                                return [3 /*break*/, 11];
+                            case 14: return [2 /*return*/, cEntities];
                         }
                     });
                 });
@@ -6349,7 +6442,7 @@
         }
         // A sub-object can be culled while the siblings are not.
         // We only cull things that give us some benefit. For example clamped to ground graphics are expensive to keep rendered.
-        show = show ? !VisualRegisterCuller.IsCulled(viewer, rego, visual) : true;
+        show = show ? !VisualRegisterCuller.IsCulled(viewer, rego, visual) : false;
         if (visual._parentEntity && !ignoreParent) {
             updateCEntityShow(viewer, visual._parentEntity, rego, show, false, depth + 1);
         }
@@ -6439,6 +6532,7 @@
             if (visible == null) {
                 visible = getShowState(rego);
             }
+            console.log("entityId", rego.entityId, "visible", visible, "overrideShow", rego.overrideShow);
             updateEntityShow(viewer, rego, visible);
             if (rego.best) {
                 var isLabelled = register.GetIsLabelled({
@@ -7900,7 +7994,7 @@
                         entityId: id,
                         menuItemId: this.menuItemId
                     });
-                    if (rego && rego.overrideShow) {
+                    if (rego && rego.overrideShow != null) {
                         rego.overrideShow = null;
                         entitiesToUpdate.push(id);
                     }
@@ -7979,8 +8073,8 @@
                         entityId: entityId,
                         menuItemId: this_1.menuItemId
                     });
-                    if (rego && !rego.overrideShow) {
-                        rego.overrideShow = true;
+                    if (rego && rego.overrideShow != false) {
+                        rego.overrideShow = false;
                         entitiesToUpdate.push(entityId);
                     }
                 }
@@ -8950,7 +9044,7 @@
                                                 entityTypeId: entity.Bruce["EntityType.ID"],
                                                 accountId: this.apiGetter.accountId,
                                                 tagIds: tagIds ? [].concat(tagIds) : [],
-                                                overrideShow: wasClustered ? true : null,
+                                                overrideShow: wasClustered ? false : null,
                                                 name: cEntity.name,
                                                 cdn: this.item.cdnEnabled
                                             };
@@ -10352,7 +10446,7 @@
                                                     priority: 0,
                                                     entityTypeId: entity.Bruce["EntityType.ID"],
                                                     accountId: this.apiGetter.accountId,
-                                                    overrideShow: clustered ? true : null,
+                                                    overrideShow: clustered ? false : null,
                                                     name: cEntity.name
                                                 },
                                                 requestRender: false
@@ -21449,7 +21543,7 @@
         CesiumViewMonitor.Monitor = Monitor;
     })(exports.CesiumViewMonitor || (exports.CesiumViewMonitor = {}));
 
-    var VERSION$1 = "3.4.6";
+    var VERSION$1 = "3.4.8";
 
     exports.VERSION = VERSION$1;
     exports.CesiumParabola = CesiumParabola;