bruce-cesium 3.4.6 → 3.4.7

package/dist/lib/bruce-cesium.js

@@ -46,5 +46,5 @@ __exportStar(require("./utils/measure-utils"), exports);
 __exportStar(require("./utils/entity-utils"), exports);
 __exportStar(require("./widgets/common/draw-3d-polygon"), exports);
 __exportStar(require("./widgets/common/draw-3d-polyline"), exports);
-exports.VERSION = "3.4.6";
+exports.VERSION = "3.4.7";
 //# sourceMappingURL=bruce-cesium.js.map

package/dist/lib/internal/limited-log.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OneTimeError = void 0;
+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;
+    }
+}
+exports.OneTimeError = OneTimeError;
+//# sourceMappingURL=limited-log.js.map

package/dist/lib/internal/limited-log.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"limited-log.js","sourceRoot":"","sources":["../../../src/internal/limited-log.ts"],"names":[],"mappings":";;;AAAA,IAAI,cAAc,GAAG,EAAE,CAAC;AACxB;;;;GAIG;AACH,SAAgB,YAAY,CAAC,GAAW,EAAE,OAAoB;IAC1D,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE;QACtB,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACvB,cAAc,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;KAC9B;AACL,CAAC;AALD,oCAKC"}

package/dist/lib/rendering/entity-render-engine.js

@@ -54,6 +54,7 @@ var entity_utils_1 = require("../utils/entity-utils");
 var render_manager_1 = require("./render-managers/render-manager");
 var js_utils_1 = require("../internal/js-utils");
 var visual_register_culler_1 = require("./visual-register-culler");
+var limited_log_1 = require("../internal/limited-log");
 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);
 }
@@ -440,7 +441,7 @@ function getTranslucencyByDistance(min, max) {
     }
     return new Cesium.NearFarScalar(min, 1, max, 0);
 }
-var _billboardCache = new bruce_models_1.LRUCache(100);
+var _billboardCache = new bruce_models_1.LRUCache(150);
 var POINT_BILLBOARD_PADDING = 1;
 var createCircleBillboard = function (size, colorCss) {
     var key = size + "-" + colorCss;
@@ -468,6 +469,53 @@ var createCircleBillboard = function (size, colorCss) {
     _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 () {
+                        rej(null);
+                    };
+                    image_1.src = URL.createObjectURL(blob);
+                    return [3 /*break*/, 4];
+                case 3:
+                    e_4 = _a.sent();
+                    rej(null);
+                    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.
@@ -518,6 +566,48 @@ function getModelEntity(url, scale) {
         });
     });
 }
+/**
+ * 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 = bruce_models_1.Api.EEnv.PROD;
+    if (url.includes("-dev.net")) {
+        envId = bruce_models_1.Api.EEnv.DEV;
+    }
+    else if (url.includes("-stg.net")) {
+        envId = bruce_models_1.Api.EEnv.STG;
+    }
+    else if (url.includes("-uat.net")) {
+        envId = bruce_models_1.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
+    };
+}
 var EntityRenderEngine;
 (function (EntityRenderEngine) {
     function Render(params) {
@@ -791,10 +881,11 @@ var EntityRenderEngine;
         }
         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;
@@ -807,7 +898,7 @@ var EntityRenderEngine;
                             }
                             cEntity = null;
                             siblings = [];
-                            if (!(type == bruce_models_1.Style.EPointType.Icon)) return [3 /*break*/, 12];
+                            if (!(type == bruce_models_1.Style.EPointType.Icon)) return [3 /*break*/, 9];
                             iconUrlRows = style.iconUrl == null ? [] : style.iconUrl;
                             iconUrlRows.forEach(function (row) {
                                 if (row.type == bruce_models_1.Calculator.EValueType.Color) {
@@ -815,67 +906,55 @@ var EntityRenderEngine;
                                 }
                             });
                             icon = bruce_models_1.Calculator.GetString(iconUrlRows, entity, params.tags);
-                            iconUrl_1 = null;
-                            if (typeof icon == "string") {
-                                iconUrl_1 = icon;
-                            }
-                            if (!iconUrl_1 && style.iconId) {
-                                iconUrl_1 = bruce_models_1.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 = bruce_models_1.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 = bruce_models_1.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.
+                            (0, limited_log_1.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 = (0, js_utils_1.EnsureNumber)(bruce_models_1.Calculator.GetNumber(style.iconScale, entity, params.tags));
                                 if (!iconScale && iconScale != 0) {
                                     iconScale = 1;
@@ -890,7 +969,7 @@ var EntityRenderEngine;
                                         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,
@@ -907,11 +986,11 @@ var EntityRenderEngine;
                                         }),
                                         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 == bruce_models_1.Style.EPointType.Cylinder) {
                                 radius = (0, js_utils_1.EnsureNumber)(bruce_models_1.Calculator.GetNumber(style.CylinderRadius, entity, params.tags));
                                 if (radius <= 0) {
@@ -1070,6 +1149,7 @@ var EntityRenderEngine;
                                     tags: tags,
                                     viewer: params.viewer,
                                     api: api,
+                                    apiGetter: params.apiGetter,
                                     maxDistance: zoomItem.MaxZoom,
                                     minDistance: zoomItem.MinZoom
                                 })];
@@ -1669,6 +1749,9 @@ var EntityRenderEngine;
                     switch (_g.label) {
                         case 0:
                             api = params.apiGetter.getApi();
+                            return [4 /*yield*/, api.Loading];
+                        case 1:
+                            _g.sent();
                             cEntities = {};
                             reqBody = {
                                 "strict": false,
@@ -1676,32 +1759,32 @@ var EntityRenderEngine;
                                 "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*/, bruce_models_1.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 ? bruce_models_1.Calculator.GetString(mStyle.lodGroup, entity, tags) : null;
                             if (!group) {
@@ -1721,15 +1804,15 @@ var EntityRenderEngine;
                                 "group": group,
                                 "level": level
                             });
-                            _g.label = 7;
-                        case 7:
+                            _g.label = 8;
+                        case 8:
                             i++;
-                            return [3 /*break*/, 1];
-                        case 8: return [4 /*yield*/, bruce_models_1.EntityLod.GetLods({
+                            return [3 /*break*/, 2];
+                        case 9: return [4 /*yield*/, bruce_models_1.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;
@@ -1791,17 +1874,17 @@ var EntityRenderEngine;
                                 });
                             };
                             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];
                     }
                 });
             });