bruce-models 2.9.6 → 2.9.8

package/dist/bruce-models.es5.js

@@ -265,36 +265,32 @@ class AbstractApi {
         }
     }
     GetCacheItem(key, reqParams) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let noCache = reqParams === null || reqParams === void 0 ? void 0 : reqParams.noCache;
-            if (noCache == null) {
-                noCache = Api.DEFAULT_NO_CACHE;
-            }
-            if (noCache) {
-                return null;
-            }
-            return this.Cache.Get(key);
-        });
+        let noCache = reqParams === null || reqParams === void 0 ? void 0 : reqParams.noCache;
+        if (noCache == null) {
+            noCache = Api.DEFAULT_NO_CACHE;
+        }
+        if (noCache) {
+            return null;
+        }
+        return this.Cache.Get(key);
     }
     SetCacheItem(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let { key, value, duration, req } = params;
-            let noCache = req === null || req === void 0 ? void 0 : req.noCache;
-            if (noCache == null) {
-                noCache = Api.DEFAULT_NO_CACHE;
-            }
-            if (noCache) {
-                return;
-            }
-            if (isNaN(duration)) {
-                duration = Api.DEFAULT_CACHE_DURATION;
-            }
-            yield this.Cache.Set({
-                id: key,
-                data: value,
-                duration,
-                persistence: "memory"
-            });
+        let { key, value, duration, req } = params;
+        let noCache = req === null || req === void 0 ? void 0 : req.noCache;
+        if (noCache == null) {
+            noCache = Api.DEFAULT_NO_CACHE;
+        }
+        if (noCache) {
+            return;
+        }
+        if (isNaN(duration)) {
+            duration = Api.DEFAULT_CACHE_DURATION;
+        }
+        this.Cache.Set({
+            id: key,
+            data: value,
+            duration,
+            persistence: "memory"
         });
     }
     GetSessionId() {
@@ -2318,6 +2314,7 @@ var Entity;
     }
     Entity.CalculateName = CalculateName;
     function GetList(params) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             let { api, filter, req: reqParams, viaCdn, viaCdnCacheToken } = params;
             if (!api) {
@@ -2328,8 +2325,9 @@ var Entity;
                 requestFilter = Object.assign({}, filter.entityTypeConditions);
             }
             if (filter.layerIds != null && filter.layerIds.length > 0) {
+                const operator = (_a = filter.layerIdsOperator) !== null && _a !== void 0 ? _a : "equals";
                 requestFilter["Bruce.Layer.ID"] = {
-                    equals: filter.layerIds
+                    [operator]: filter.layerIds
                 };
             }
             if (filter.bounds) {
@@ -5141,6 +5139,8 @@ var EntityFilterGetter;
                                 pageIndex: curCell.FetchPageIndex,
                                 entityTypeId: this.typeId,
                                 layerIds: this.tagIds,
+                                // Any tag specified will be allowed.
+                                layerIdsOperator: "in",
                                 bounds: curCell.GetBounds(),
                                 sortOrder: Api.ESortOrder.Asc,
                                 entityTypeConditions: this.attrFilter
@@ -8936,40 +8936,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 {
@@ -9108,7 +9108,7 @@ var DataSource;
     DataSource.GetList = GetList;
 })(DataSource || (DataSource = {}));
 
-const VERSION = "2.9.6";
+const VERSION = "2.9.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