@nextgis/ngw-map 2.3.0 → 2.4.1

package/lib/ngw-map.cjs.js

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/ngw-map; version: 2.3.0; author: NextGIS */
+/** Bundle of @nextgis/ngw-map; version: 2.4.1; author: NextGIS */
 'use strict';
 
 Object.defineProperty(exports, '__esModule', { value: true });

package/lib/ngw-map.esm-browser.js

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/ngw-map; version: 2.3.0; author: NextGIS */
+/** Bundle of @nextgis/ngw-map; version: 2.4.1; author: NextGIS */
 var domain;
 
 // This constructor is used to store event handlers. Instantiating this is
@@ -1403,7 +1403,10 @@ class ResourcesControl {
       }
       return CancelablePromise.resolve(void 0);
     };
-    return cache.addFull("resource", makeRequest, forCache);
+    if (requestOptions == null ? void 0 : requestOptions.cache) {
+      return cache.addFull("resource", makeRequest, forCache);
+    }
+    return makeRequest();
   }
   getOneOrFail(resource, requestOptions) {
     return this.getOne(resource, requestOptions).then((res) => {
@@ -1564,14 +1567,17 @@ class ResourcesControl {
   }
   _fetchResourceById(id, requestOptions) {
     const promise = () => this.connector.get("resource.item", requestOptions, { id });
-    return this.cache.add("resource.item", promise, {
-      id
-    }).catch((er) => {
-      if (!(er instanceof ResourceNotFoundError)) {
-        throw er;
-      }
-      return void 0;
-    });
+    if (requestOptions == null ? void 0 : requestOptions.cache) {
+      return this.cache.add("resource.item", promise, {
+        id
+      }).catch((er) => {
+        if (!(er instanceof ResourceNotFoundError)) {
+          throw er;
+        }
+        return void 0;
+      });
+    }
+    return promise();
   }
   _fetchResourceBy(resource, requestOptions) {
     return this.getMany(resource, requestOptions).then((resources) => {
@@ -1651,7 +1657,7 @@ function template(str, data) {
 function apiRequest(opt) {
   const params = opt.params;
   return new CancelablePromise((resolve, reject) => {
-    opt.connector.connect().then((apiItems) => {
+    return opt.connector.connect().then((apiItems) => {
       let apiItem = apiItems && apiItems[opt.name];
       if (apiItem) {
         apiItem = [...apiItem];
@@ -2463,7 +2469,9 @@ function createParam(pf) {
   return [`${isFldStr}${field_}__${operation}`, v];
 }
 function getQueries(opt, _queries = [], _parentAllParams = []) {
+  var _a;
   const { filters } = opt;
+  const paramList = (_a = opt.paramList) != null ? _a : [];
   const logic = typeof filters[0] === "string" ? filters[0] : "all";
   const filters_ = filters.filter((x) => Array.isArray(x));
   if (logic === "any") {
@@ -2471,7 +2479,7 @@ function getQueries(opt, _queries = [], _parentAllParams = []) {
       if (isPropertyFilter(f)) {
         _queries.push(
           fetchNgwLayerItemsRequest(__spreadProps$c(__spreadValues$q({}, opt), {
-            paramList: [..._parentAllParams, createParam(f)]
+            paramList: [..._parentAllParams, ...paramList, createParam(f)]
           }))
         );
       } else {
@@ -2507,7 +2515,7 @@ function getQueries(opt, _queries = [], _parentAllParams = []) {
     } else {
       _queries.push(
         fetchNgwLayerItemsRequest(__spreadProps$c(__spreadValues$q({}, opt), {
-          paramList: [..._parentAllParams, ...filters2]
+          paramList: [..._parentAllParams, ...paramList, ...filters2]
         }))
       );
     }