bruce-models 3.0.5 → 3.0.8

package/dist/bruce-models.es5.js

@@ -2059,11 +2059,12 @@ var PathUtils;
  */
 var Entity;
 (function (Entity) {
-    function GetCacheKey(entityId, entityTypeId, expandLocation) {
+    function GetCacheKey(params) {
+        let { entityId, entityTypeId, expandLocation, expandRelations } = params;
         if (!entityTypeId) {
             entityTypeId = "";
         }
-        return `${Api.ECacheKey.Entity}${Api.ECacheKey.Id}${entityId}${String(entityTypeId)}${String(Boolean(expandLocation))}`;
+        return `${Api.ECacheKey.Entity}${Api.ECacheKey.Id}${entityId}${String(entityTypeId)}${String(Boolean(expandLocation))}${String(Boolean(expandRelations))}`;
     }
     Entity.GetCacheKey = GetCacheKey;
     function GetContainsKey(entityId) {
@@ -2072,15 +2073,20 @@ var Entity;
     Entity.GetContainsKey = GetContainsKey;
     function Get(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            let { api, entityId, req: reqParams, expandLocation, entityTypeId } = params;
+            let { api, entityId, req: reqParams, expandLocation, expandRelations, entityTypeId } = params;
             if (!api) {
                 api = ENVIRONMENT.Api().GetBruceApi();
             }
             if (!entityId) {
                 throw ("Entity ID is required.");
             }
-            const key = GetCacheKey(entityId, entityTypeId, expandLocation);
-            const cache = yield api.GetCacheItem(key, reqParams);
+            const key = GetCacheKey({
+                entityId,
+                entityTypeId,
+                expandLocation,
+                expandRelations
+            });
+            const cache = api.GetCacheItem(key, reqParams);
             if (cache === null || cache === void 0 ? void 0 : cache.found) {
                 return cache.data;
             }
@@ -2090,6 +2096,9 @@ var Entity;
                     if (expandLocation) {
                         urlParams.append("$expand", "location");
                     }
+                    if (expandRelations) {
+                        urlParams.append("$expand", "relation");
+                    }
                     if (entityTypeId) {
                         urlParams.append("BruceEntityType", entityTypeId);
                     }
@@ -2102,7 +2111,7 @@ var Entity;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key,
                 value: prom,
                 req: reqParams
@@ -2113,7 +2122,7 @@ var Entity;
     Entity.Get = Get;
     function GetListByIds(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            let { api, entityIds, req: reqParams } = params;
+            let { api, entityIds, req: reqParams, expandRelations } = params;
             if (!api) {
                 api = ENVIRONMENT.Api().GetBruceApi();
             }
@@ -2124,8 +2133,8 @@ var Entity;
             const reqIds = [];
             for (let i = 0; i < entityIds.length; i++) {
                 const entityId = entityIds[i];
-                const key = GetCacheKey(entityId);
-                const cache = yield api.GetCacheItem(key, reqParams);
+                const key = GetCacheKey({ entityId, expandRelations });
+                const cache = api.GetCacheItem(key, reqParams);
                 if (cache === null || cache === void 0 ? void 0 : cache.found) {
                     reqs.push(cache.data);
                 }
@@ -2142,10 +2151,14 @@ var Entity;
                 PageSize: reqIds.length
             };
             if (reqIds.length > 0) {
-                const req = api.POST("entities", reqData, Api.PrepReqParams(reqParams));
+                const urlParams = new URLSearchParams();
+                if (expandRelations) {
+                    urlParams.append("$expand", "relation");
+                }
+                const req = api.POST("entities?" + urlParams.toString(), reqData, Api.PrepReqParams(reqParams));
                 for (let i = 0; i < reqIds.length; i++) {
                     const entityId = reqIds[i];
-                    const key = GetCacheKey(entityId);
+                    const key = GetCacheKey({ entityId });
                     const prom = new Promise((res) => __awaiter(this, void 0, void 0, function* () {
                         try {
                             const data = yield req;
@@ -2159,7 +2172,7 @@ var Entity;
                         }
                         res(null);
                     }));
-                    yield api.SetCacheItem({
+                    api.SetCacheItem({
                         key,
                         value: prom,
                         req: reqParams
@@ -2316,7 +2329,7 @@ var Entity;
     function GetList(params) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            let { api, filter, req: reqParams, viaCdn, viaCdnCacheToken, analysis } = params;
+            let { api, filter, req: reqParams, viaCdn, viaCdnCacheToken, analysis, expandRelations } = params;
             if (!api) {
                 api = ENVIRONMENT.Api().GetBruceApi();
             }
@@ -2351,12 +2364,17 @@ var Entity;
             };
             let totalCount;
             let entities = [];
-            if (analysis || (viaCdn && api.EntityCdnUrl)) {
-                const url = new URL(
-                // !analysis && viaCdn... for now because we have an inflexible CDN param in the lib.
-                // Api CAN support this. TODO: Have a CDN base url instead of an EntityCDN base url.
-                (!analysis && viaCdn && api.EntityCdnUrl) ? api.EntityCdnUrl :
-                    (api.GetBaseUrl() + (analysis ? "entities/summary" : "entities")));
+            if (analysis || expandRelations || (viaCdn && api.EntityCdnUrl)) {
+                let url;
+                if (analysis) {
+                    url = new URL(api.GetBaseUrl() + "entities/summary");
+                }
+                else if (viaCdn && api.EntityCdnUrl) {
+                    url = new URL(api.EntityCdnUrl);
+                }
+                else {
+                    url = new URL(api.GetBaseUrl() + "entities");
+                }
                 const urlParams = new URLSearchParams(url.search);
                 urlParams.set("cacheToken", String(viaCdnCacheToken ? viaCdnCacheToken : 0));
                 if (body.SortOrder) {
@@ -2380,6 +2398,9 @@ var Entity;
                 if (body.PageSize) {
                     urlParams.set("PageSize", String(body.PageSize));
                 }
+                if (expandRelations) {
+                    urlParams.append("$expand", "relation");
+                }
                 const urlStr = url.toString() + "?" + urlParams.toString();
                 const data = yield api.get(urlStr, Api.PrepReqParams(reqParams));
                 if (!analysis) {
@@ -2388,15 +2409,24 @@ var Entity;
                 totalCount = data.TotalCount;
             }
             else {
-                const data = yield api.POST(analysis ? "entities/summary" : "entities", body, Api.PrepReqParams(reqParams));
+                const url = new URL(api.GetBaseUrl() + (analysis ? "entities/summary" : "entities"));
+                const urlParams = new URLSearchParams(url.search);
+                if (expandRelations) {
+                    urlParams.append("$expand", "relation");
+                }
+                const urlStr = url.toString() + "?" + urlParams.toString();
+                const data = yield api.post(urlStr, body, Api.PrepReqParams(reqParams));
                 if (!analysis) {
                     entities = data.Items;
                     // Only caching when non-CDN.
                     for (let i = 0; i < entities.length; i++) {
                         const entity = entities[i];
                         const id = entity.Bruce.ID;
-                        yield api.SetCacheItem({
-                            key: GetCacheKey(id),
+                        api.SetCacheItem({
+                            key: GetCacheKey({
+                                entityId: id,
+                                expandRelations
+                            }),
                             value: {
                                 entity: entity
                             },
@@ -6589,7 +6619,9 @@ var MenuItem;
         EType["PointCloud"] = "PointCloudTileset";
         EType["EntitiesLoaded"] = "LoadedEntities";
         EType["EntitiesIds"] = "EntitiesIds";
+        // Deprecated. Use Relationships instead.
         EType["Relations"] = "Relations";
+        EType["Relationships"] = "Relationships";
         EType["GooglePhotoTileset"] = "GooglePhotoTileset";
     })(EType = MenuItem.EType || (MenuItem.EType = {}));
     function CreateFromEntityId(entityId, typeId, styleId) {
@@ -6678,9 +6710,6 @@ var MenuItem;
         throw ("Tileset type not supported.");
     }
     MenuItem.CreateFromTilesetId = CreateFromTilesetId;
-    let Item;
-    (function (Item) {
-    })(Item = MenuItem.Item || (MenuItem.Item = {}));
 })(MenuItem || (MenuItem = {}));
 
 /**
@@ -8967,40 +8996,40 @@ var Plugin;
             window[paramsId] = pluginParams ? pluginParams : {};
             const disposeId = ObjectUtils.UId();
             const elementId = ObjectUtils.UId();
-            let script = `
-            function run() {
-                ${fileContent}
-
-                const paramsId = "${paramsId}";
-                const containerId = "${containerId}";
-                let container;
-                if (containerId) {
-                    container = document.getElementById("${containerId}");
-                }
-
-                let pluginHTML = null;
-                if (container) {
-                    pluginHTML = document.createElement("div");
-                    pluginHTML.id = "${elementId}";
-                    container.appendChild(pluginHTML);
-                }
-
-                {TEMPLATE_CODE}
-                const params = window["${paramsId}"];
-
-                window["${disposeId}"] = Run({
-                    element: pluginHTML,
-                    container: container,
-                    pluginParams: params
-                });
-            }
-            run();
+            let script = `
+            function run() {
+                ${fileContent}
+
+                const paramsId = "${paramsId}";
+                const containerId = "${containerId}";
+                let container;
+                if (containerId) {
+                    container = document.getElementById("${containerId}");
+                }
+
+                let pluginHTML = null;
+                if (container) {
+                    pluginHTML = document.createElement("div");
+                    pluginHTML.id = "${elementId}";
+                    container.appendChild(pluginHTML);
+                }
+
+                {TEMPLATE_CODE}
+                const params = window["${paramsId}"];
+
+                window["${disposeId}"] = Run({
+                    element: pluginHTML,
+                    container: container,
+                    pluginParams: params
+                });
+            }
+            run();
         `;
             if (script.includes("var template")) {
-                script = script.replace("{TEMPLATE_CODE}", `
-                if (pluginHTML && template) {
-                    pluginHTML.innerHTML = template;
-                }
+                script = script.replace("{TEMPLATE_CODE}", `
+                if (pluginHTML && template) {
+                    pluginHTML.innerHTML = template;
+                }
             `);
             }
             else {
@@ -9139,7 +9168,7 @@ var DataSource;
     DataSource.GetList = GetList;
 })(DataSource || (DataSource = {}));
 
-const VERSION = "3.0.5";
+const VERSION = "3.0.8";
 
 export { VERSION, AnnDocument, CustomForm, AbstractApi, Api, BruceApi, CamApi, IdmApi, GlobalApi, GuardianApi, ApiGetters, Calculator, Bounds, BruceEvent, CacheControl, Camera, Cartes, Carto, Color, DelayQueue, Geometry, UTC, BruceVariable, LRUCache, EntityAttachmentType, EntityAttachment, EntityComment, EntityLink, EntityLod, EntityLodCategory, EntityRelationType, EntityRelation, EntitySource, EntityTag, EntityType, Entity, EntityGlobe, EntityFilterGetter, BatchedDataGetter, EntityCoords, EntityTypeVisualSettings, EntityAttribute, ClientFile, ProgramKey, ZoomControl, MenuItem, ProjectViewBookmark, ProjectView, ProjectViewLegacyTile, ProjectViewTile, PendingAction, MessageBroker, HostingLocation, Style, Tileset, Permission, Session, UserGroup, User, Account, AccountInvite, EncryptUtils, MathUtils, ObjectUtils, PathUtils, UrlUtils, DataLab, ImportCad, ImportCsv, ImportJson, ImportKml, ImportedFile, Markup, Uploader, Plugin, ENVIRONMENT, DataSource };
 //# sourceMappingURL=bruce-models.es5.js.map