bruce-models 4.1.6 → 4.1.8

package/dist/bruce-models.es5.js

@@ -3307,11 +3307,18 @@ var Entity;
             const prom = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
                 try {
                     const urlParams = new URLSearchParams();
+                    let expand;
                     if (expandLocation) {
-                        urlParams.append("$expand", "location");
+                        expand = "location";
                     }
                     if (expandRelations) {
-                        urlParams.append("$expand", "relation");
+                        if (expand) {
+                            expand += ",";
+                        }
+                        expand += "relation";
+                    }
+                    if (expand) {
+                        urlParams.append("$expand", expand);
                     }
                     if (entityTypeId) {
                         urlParams.append("BruceEntityType", entityTypeId);
@@ -3356,7 +3363,7 @@ var Entity;
      */
     function GetListByIds(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            let { api, entityIds, schemaId, req: reqParams, expandRelations, expandLocation, historicFrom, historicKey, historicTo, historicPoint } = params;
+            let { api, entityIds, schemaId, req: reqParams, expandRelations, expandLocation, historicFrom, historicKey, historicTo, historicPoint, expandSources } = params;
             if (!entityIds.length) {
                 throw ("Entity IDs are required.");
             }
@@ -3387,8 +3394,16 @@ var Entity;
             if (expandRelations) {
                 reqData["Expand"] = "relation";
             }
-            else if (expandLocation) {
-                reqData["Expand"] = "location";
+            if (expandLocation) {
+                if (reqData["Expand"]) {
+                    reqData["Expand"] += ",location";
+                }
+                else {
+                    reqData["Expand"] = "location";
+                }
+            }
+            if (expandSources) {
+                reqData["ExpandSources"] = true;
             }
             if (historicKey) {
                 reqData["historicKey"] = historicKey;
@@ -3416,6 +3431,7 @@ var Entity;
                         entityId,
                         expandLocation,
                         expandRelations,
+                        expandSources,
                         entityTypeId: null,
                         historicFrom: historicFrom,
                         historicKey: historicKey,
@@ -3706,7 +3722,7 @@ var Entity;
     function GetList(params) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            let { api, filter, schemaId, req: reqParams, viaCdn, viaCdnCacheToken, analysis, expandRelations, historicFrom, historicKey, historicTo, historicPoint } = params;
+            let { api, filter, schemaId, req: reqParams, viaCdn, viaCdnCacheToken, analysis, expandRelations, historicFrom, historicKey, historicTo, historicPoint, expandLocation, expandSources } = params;
             if (!api) {
                 api = ENVIRONMENT.Api().GetBruceApi();
             }
@@ -3746,8 +3762,24 @@ var Entity;
                 historicKey: historicKey,
                 historicFrom: historicFrom,
                 historicTo: historicTo,
-                historicPoint: historicPoint
+                historicPoint: historicPoint,
+                ExpandSources: expandSources
             };
+            if (expandLocation || expandRelations) {
+                let expand = "";
+                if (expandLocation) {
+                    expand += "location";
+                }
+                if (expandRelations) {
+                    if (expand) {
+                        expand += ",";
+                    }
+                    expand += "relation";
+                }
+                if (expand) {
+                    body["Expand"] = expand;
+                }
+            }
             let totalCount;
             let entities = [];
             if (analysis || expandRelations || (viaCdn && api.EntityCdnUrl)) {
@@ -3787,6 +3819,12 @@ var Entity;
                 if (expandRelations) {
                     urlParams.append("$expand", "relation");
                 }
+                if (expandLocation) {
+                    urlParams.append("$expand", "location");
+                }
+                if (expandSources) {
+                    urlParams.append("ExpandSources", "true");
+                }
                 if (historicKey) {
                     urlParams.set("historicKey", historicKey);
                 }
@@ -3815,6 +3853,9 @@ var Entity;
                 if (expandRelations) {
                     urlParams.append("$expand", "relation");
                 }
+                if (expandLocation) {
+                    urlParams.append("$expand", "location");
+                }
                 if (schemaId) {
                     urlParams.set("schema", schemaId);
                 }
@@ -3830,7 +3871,8 @@ var Entity;
                             key: GetCacheKey({
                                 entityId: id,
                                 expandRelations,
-                                expandLocation: false,
+                                expandLocation,
+                                expandSources,
                                 entityTypeId: filter.entityTypeId,
                                 historicFrom: historicFrom,
                                 historicKey: historicKey,
@@ -3983,7 +4025,7 @@ var Entity;
      * @returns
      */
     function GetCacheKey(params) {
-        let { entityId, entityTypeId, schemaId, expandLocation, expandRelations, historicFrom, historicKey, historicTo, historicPoint } = params;
+        let { entityId, entityTypeId, schemaId, expandLocation, expandRelations, expandSources, historicFrom, historicKey, historicTo, historicPoint } = params;
         if (!entityTypeId) {
             entityTypeId = "";
         }
@@ -4003,7 +4045,7 @@ var Entity;
             schemaId = "";
         }
         let key = `${Api.ECacheKey.Entity}${Api.ECacheKey.Id}${entityId}${String(entityTypeId)}${schemaId}`;
-        key += `${String(Boolean(expandLocation))}${String(Boolean(expandRelations))}`;
+        key += `${String(Boolean(expandLocation))}${String(Boolean(expandRelations))}${String(Boolean(expandSources))}`;
         key += `${Api.ECacheKey.EntityHistoricData}${Api.ECacheKey.Id}${historicKey}-${historicFrom}-${historicTo}-${historicPoint}`;
         return key;
     }
@@ -11398,17 +11440,18 @@ var AccountFeatures;
         EFeature["EntityLexicalSearch"] = "Feature_Entity_Lexical_Search";
     })(EFeature = AccountFeatures.EFeature || (AccountFeatures.EFeature = {}));
     /**
-     * Gets account features corresponding to an account ID.
+     * Gets account features corresponding to the API instance's account.
      * @param params
      * @returns
      */
     function Get(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            let { api, accountId: id, req: reqParams } = params;
+            let { api, req: reqParams } = params;
             if (!api) {
                 api = ENVIRONMENT.Api().GetBruceApi();
             }
-            const cache = yield api.GetCacheItem(GetCacheKey(id), reqParams);
+            const accountId = api.AccountId;
+            const cache = yield api.GetCacheItem(GetCacheKey(accountId), reqParams);
             if (cache === null || cache === void 0 ? void 0 : cache.found) {
                 return cache.data;
             }
@@ -11425,7 +11468,7 @@ var AccountFeatures;
                 }
             }));
             api.SetCacheItem({
-                key: GetCacheKey(id),
+                key: GetCacheKey(accountId),
                 value: prom,
                 req: reqParams
             });
@@ -11435,10 +11478,11 @@ var AccountFeatures;
     AccountFeatures.Get = Get;
     function Update(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            let { api, accountId: id, features, req: reqParams } = params;
+            let { api, features, req: reqParams } = params;
             if (!api) {
                 api = ENVIRONMENT.Api().GetBruceApi();
             }
+            const accountId = api.AccountId;
             const prom = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
                 try {
                     const data = yield api.POST("features", {
@@ -11453,7 +11497,7 @@ var AccountFeatures;
                     rej(e);
                 }
             }));
-            api.Cache.Remove(GetCacheKey(id));
+            api.Cache.Remove(GetCacheKey(accountId));
             return prom;
         });
     }
@@ -13114,7 +13158,7 @@ var DataSource;
 })(DataSource || (DataSource = {}));
 
 // This is updated with the package.json version on build.
-const VERSION = "4.1.6";
+const VERSION = "4.1.8";
 
 export { VERSION, AnnDocument, CustomForm, AbstractApi, Api, BruceApi, 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, EntityCoords, EntityTypeVisualSettings, EntityAttribute, EntityHistoricData, Comment, ClientFile, ProgramKey, ZoomControl, MenuItem, ProjectViewBookmark, ProjectView, ProjectViewLegacyTile, ProjectViewTile, ProjectViewLegacy, ProjectViewLegacyBookmark, PendingAction, MessageBroker, HostingLocation, Style, Tileset, Permission, Session, UserGroup, User, Account, AccountInvite, AccountFeatures, AccountLimits, EncryptUtils, MathUtils, ObjectUtils, PathUtils, UrlUtils, DataLab, ImportCad, ImportCsv, ImportJson, ImportKml, ImportedFile, Markup, Uploader, Plugin, ENVIRONMENT, DataSource };
 //# sourceMappingURL=bruce-models.es5.js.map