@nextgis/ngw-map 2.3.0 → 2.4.1

package/lib/ngw-map.esm-bundler.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 */
 import { EventEmitter } from 'events';
 import CancelablePromise from '@nextgis/cancelable-promise';
 import { getIcon } from '@nextgis/icons';

package/lib/ngw-map.global.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 NgwMap = (function (exports) {
   'use strict';
 
@@ -1406,7 +1406,10 @@ var NgwMap = (function (exports) {
         }
         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) => {
@@ -1567,14 +1570,17 @@ var NgwMap = (function (exports) {
     }
     _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) => {
@@ -1654,7 +1660,7 @@ var NgwMap = (function (exports) {
   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];
@@ -2466,7 +2472,9 @@ var NgwMap = (function (exports) {
     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") {
@@ -2474,7 +2482,7 @@ var NgwMap = (function (exports) {
         if (isPropertyFilter(f)) {
           _queries.push(
             fetchNgwLayerItemsRequest(__spreadProps$c(__spreadValues$q({}, opt), {
-              paramList: [..._parentAllParams, createParam(f)]
+              paramList: [..._parentAllParams, ...paramList, createParam(f)]
             }))
           );
         } else {
@@ -2510,7 +2518,7 @@ var NgwMap = (function (exports) {
       } else {
         _queries.push(
           fetchNgwLayerItemsRequest(__spreadProps$c(__spreadValues$q({}, opt), {
-            paramList: [..._parentAllParams, ...filters2]
+            paramList: [..._parentAllParams, ...paramList, ...filters2]
           }))
         );
       }