bruce-models 3.0.5 → 3.0.7

package/dist/bruce-models.umd.js

@@ -2016,11 +2016,12 @@
     })(exports.PathUtils || (exports.PathUtils = {}));
 
     (function (Entity) {
-        function GetCacheKey(entityId, entityTypeId, expandLocation) {
+        function GetCacheKey(params) {
+            let { entityId, entityTypeId, expandLocation, expandRelations } = params;
             if (!entityTypeId) {
                 entityTypeId = "";
             }
-            return `${exports.Api.ECacheKey.Entity}${exports.Api.ECacheKey.Id}${entityId}${String(entityTypeId)}${String(Boolean(expandLocation))}`;
+            return `${exports.Api.ECacheKey.Entity}${exports.Api.ECacheKey.Id}${entityId}${String(entityTypeId)}${String(Boolean(expandLocation))}${String(Boolean(expandRelations))}`;
         }
         Entity.GetCacheKey = GetCacheKey;
         function GetContainsKey(entityId) {
@@ -2029,15 +2030,20 @@
         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 = exports.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;
                 }
@@ -2047,6 +2053,9 @@
                         if (expandLocation) {
                             urlParams.append("$expand", "location");
                         }
+                        if (expandRelations) {
+                            urlParams.append("$expand", "relation");
+                        }
                         if (entityTypeId) {
                             urlParams.append("BruceEntityType", entityTypeId);
                         }
@@ -2059,7 +2068,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key,
                     value: prom,
                     req: reqParams
@@ -2070,7 +2079,7 @@
         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 = exports.ENVIRONMENT.Api().GetBruceApi();
                 }
@@ -2081,8 +2090,8 @@
                 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);
                     }
@@ -2099,10 +2108,14 @@
                     PageSize: reqIds.length
                 };
                 if (reqIds.length > 0) {
-                    const req = api.POST("entities", reqData, exports.Api.PrepReqParams(reqParams));
+                    const urlParams = new URLSearchParams();
+                    if (expandRelations) {
+                        urlParams.append("$expand", "relation");
+                    }
+                    const req = api.POST("entities?" + urlParams.toString(), reqData, exports.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;
@@ -2116,7 +2129,7 @@
                             }
                             res(null);
                         }));
-                        yield api.SetCacheItem({
+                        api.SetCacheItem({
                             key,
                             value: prom,
                             req: reqParams
@@ -2273,7 +2286,7 @@
         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 = exports.ENVIRONMENT.Api().GetBruceApi();
                 }
@@ -2308,12 +2321,17 @@
                 };
                 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) {
@@ -2337,6 +2355,9 @@
                     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, exports.Api.PrepReqParams(reqParams));
                     if (!analysis) {
@@ -2345,15 +2366,24 @@
                     totalCount = data.TotalCount;
                 }
                 else {
-                    const data = yield api.POST(analysis ? "entities/summary" : "entities", body, exports.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, exports.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
                                 },
@@ -6425,7 +6455,9 @@
             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) {
@@ -6514,9 +6546,6 @@
             throw ("Tileset type not supported.");
         }
         MenuItem.CreateFromTilesetId = CreateFromTilesetId;
-        let Item;
-        (function (Item) {
-        })(Item = MenuItem.Item || (MenuItem.Item = {}));
     })(exports.MenuItem || (exports.MenuItem = {}));
 
     (function (ProjectViewBookmark) {
@@ -8905,7 +8934,7 @@
         DataSource.GetList = GetList;
     })(exports.DataSource || (exports.DataSource = {}));
 
-    const VERSION = "3.0.5";
+    const VERSION = "3.0.7";
 
     exports.VERSION = VERSION;
     exports.AbstractApi = AbstractApi;