bruce-models 6.2.1 → 6.2.3

package/dist/bruce-models.es5.js

@@ -2746,21 +2746,26 @@ var EntityType;
      */
     function Get(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            let { api, entityTypeId: typeId, req: reqParams } = params;
+            let { api, entityTypeId: typeId, req: reqParams, expandLODs } = params;
             if (!typeId) {
                 throw ("Type ID is required.");
             }
             if (!api) {
                 api = ENVIRONMENT.Api().GetBruceApi();
             }
-            const key = GetCacheKey(typeId);
+            const key = GetCacheKey(typeId, expandLODs);
             const cache = api.GetCacheItem(key, reqParams);
             if (cache === null || cache === void 0 ? void 0 : cache.found) {
                 return cache.data;
             }
             const prom = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    const data = yield api.GET(`entitytype/${typeId}`, Api.PrepReqParams(reqParams));
+                    const urlParams = new URLSearchParams();
+                    if (expandLODs) {
+                        urlParams.append("Expand", "LOD");
+                    }
+                    const url = `entitytype/${typeId}?${urlParams.toString()}`;
+                    const data = yield api.GET(url, Api.PrepReqParams(reqParams));
                     appendInternalAttrSchema(data);
                     res({
                         entityType: data
@@ -2793,7 +2798,7 @@ var EntityType;
                 api = ENVIRONMENT.Api().GetBruceApi();
             }
             yield api.DELETE(`entitytype/${typeId}`, Api.PrepReqParams(reqParams));
-            api.Cache.Remove(GetCacheKey(typeId));
+            api.Cache.RemoveByStartsWith(GetCacheKey(typeId));
             api.Cache.RemoveByStartsWith(GetListCacheKey());
         });
     }
@@ -2805,13 +2810,14 @@ var EntityType;
      */
     function GetList(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            let { entityTypeIds, api, req: reqParams, parentTypeId, expandSettings, search } = params;
+            let { entityTypeIds, api, req: reqParams, parentTypeId, expandSettings, search, expandLODs } = params;
             if (!api) {
                 api = ENVIRONMENT.Api().GetBruceApi();
             }
             const cache = api.GetCacheItem(GetListCacheKey({
                 typeIds: entityTypeIds,
                 parentTypeId,
+                expandLODs,
                 expandSettings,
                 search
             }), reqParams);
@@ -2828,16 +2834,22 @@ var EntityType;
                             const batch = entityTypeIds.slice(i, i + BATCH_SIZE);
                             const urlParams = new URLSearchParams();
                             for (const id of batch) {
-                                urlParams.append("typeId", id);
+                                urlParams.append("ID", id);
                             }
                             if (parentTypeId) {
-                                urlParams.append("parentEntityTypeID", parentTypeId);
+                                urlParams.append("ParentTypeID", parentTypeId);
+                            }
+                            if (expandSettings && expandLODs) {
+                                urlParams.append("Expand", "true");
                             }
-                            if (expandSettings) {
-                                urlParams.append("expandSettings", "true");
+                            else if (expandSettings) {
+                                urlParams.append("Expand", "Schema");
+                            }
+                            else if (expandLODs) {
+                                urlParams.append("Expand", "LOD");
                             }
                             if (search) {
-                                urlParams.append("search", search);
+                                urlParams.append("Search", search);
                             }
                             reqs.push(api.GET("entitytypes?" + urlParams.toString(), Api.PrepReqParams(reqParams)));
                         }
@@ -2845,13 +2857,19 @@ var EntityType;
                     else {
                         const urlParams = new URLSearchParams();
                         if (parentTypeId) {
-                            urlParams.append("parentEntityTypeID", parentTypeId);
+                            urlParams.append("ParentTypeID", parentTypeId);
+                        }
+                        if (expandSettings && expandLODs) {
+                            urlParams.append("Expand", "true");
+                        }
+                        else if (expandSettings) {
+                            urlParams.append("Expand", "Schema");
                         }
-                        if (expandSettings) {
-                            urlParams.append("expandSettings", "true");
+                        else if (expandLODs) {
+                            urlParams.append("Expand", "LOD");
                         }
                         if (search) {
-                            urlParams.append("search", search);
+                            urlParams.append("Search", search);
                         }
                         reqs.push(api.GET("entitytypes?" + urlParams.toString(), Api.PrepReqParams(reqParams)));
                     }
@@ -2880,6 +2898,7 @@ var EntityType;
                         typeIds: entityTypeIds,
                         parentTypeId,
                         expandSettings,
+                        expandLODs,
                         search
                     }),
                     value: req,
@@ -2913,7 +2932,7 @@ var EntityType;
             }
             appendInternalAttrSchema(data);
             const res = yield api.POST(`entitytype/${data.ID}`, data, Api.PrepReqParams(reqParams));
-            api.Cache.Remove(GetCacheKey(data.ID));
+            api.Cache.RemoveByStartsWith(GetCacheKey(data.ID));
             api.Cache.RemoveByStartsWith(GetListCacheKey());
             return {
                 entityType: res
@@ -2979,10 +2998,15 @@ var EntityType;
      *     api.Cache.Remove(key);
      * }
      * @param typeId
+     * @param expandLODs
      * @returns
      */
-    function GetCacheKey(typeId) {
-        return `${Api.ECacheKey.EntityType}${Api.ECacheKey.Id}${typeId}`;
+    function GetCacheKey(typeId, expandLODs) {
+        let key = `${Api.ECacheKey.EntityType}${Api.ECacheKey.Id}${typeId}`;
+        if (expandLODs) {
+            key += "_LOD_" + expandLODs;
+        }
+        return key;
     }
     EntityType.GetCacheKey = GetCacheKey;
     /**
@@ -2999,7 +3023,7 @@ var EntityType;
         if (!params) {
             params = {};
         }
-        let { typeIds, expandSettings, parentTypeId, search } = params;
+        let { typeIds, expandSettings, parentTypeId, expandLODs, search } = params;
         let key = Api.ECacheKey.EntityType;
         if (!typeIds) {
             typeIds = [];
@@ -3011,7 +3035,14 @@ var EntityType;
         if (!expandSettings) {
             expandSettings = false;
         }
-        key += "_EXPAND_" + expandSettings;
+        if (!expandLODs) {
+            expandLODs = false;
+        }
+        key += "_SCHEMA_" + expandSettings;
+        key += "_LOD_" + expandLODs;
+        if (search) {
+            key += "_SEARCH_" + search;
+        }
         return key;
     }
     EntityType.GetListCacheKey = GetListCacheKey;
@@ -15907,7 +15938,7 @@ var Tracking;
 })(Tracking || (Tracking = {}));
 
 // This is updated with the package.json version on build.
-const VERSION = "6.2.1";
+const VERSION = "6.2.3";
 
 export { VERSION, Assembly, AnnDocument, CustomForm, AbstractApi, Api, BruceApi, GlobalApi, GuardianApi, ApiGetters, Calculator, Bounds, BruceEvent, CacheControl, Camera, Cartes, Carto, Color, DelayQueue, Geometry, UTC, BruceVariable, LRUCache, GeoJson, EntityAttachmentType, EntityAttachment, EntityComment, EntityLink, EntityLod, EntityLodCategory, EntityRelationType, EntityRelation, EntitySource, EntityTag, EntityType, Entity, EntityCoords, EntityAttribute, EntityHistoricData, EntityTableView, Comment, ClientFile, ProgramKey, ZoomControl, MenuItem, ProjectViewBookmark, ProjectView, ProjectViewLegacyTile, ProjectViewTile, ProjectViewLegacy, ProjectViewLegacyBookmark, ProjectViewBookmarkGroup, PendingAction, MessageBroker, HostingLocation, Style, Tileset, Permission, Session, UserGroup, User, Account, AccountInvite, AccountFeatures, AccountLimits, AccountTemplate, AccountType, EncryptUtils, MathUtils, ObjectUtils, PathUtils, UrlUtils, DataLab, DataLabGroup, ImportAssembly, ImportCad, ImportCsv, ImportJson, ImportGeoJson, ImportKml, ImportedFile, ExportBrz, ExportUsd, Markup, Uploader, Plugin, ENVIRONMENT, DataSource, Scenario, Tracking };
 //# sourceMappingURL=bruce-models.es5.js.map