@nextgis/ngw-map 2.4.0 → 3.0.0-alpha.0

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

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/ngw-map; version: 2.4.0; author: NextGIS */
+/** Bundle of @nextgis/ngw-map; version: 3.0.0-alpha.0; author: NextGIS */
 var domain;
 
 // This constructor is used to store event handlers. Instantiating this is
@@ -471,308 +471,6 @@ function unwrapListeners(arr) {
   return ret;
 }
 
-var __defProp$N = Object.defineProperty;
-var __defNormalProp$N = (obj, key, value) => key in obj ? __defProp$N(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField$z = (obj, key, value) => __defNormalProp$N(obj, typeof key !== "symbol" ? key + "" : key, value);
-class CancelError extends Error {
-  constructor() {
-    super();
-    __publicField$z(this, "name", "CancelError");
-    Object.setPrototypeOf(this, CancelError.prototype);
-  }
-}
-
-var __defProp$M = Object.defineProperty;
-var __defNormalProp$M = (obj, key, value) => key in obj ? __defProp$M(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField$y = (obj, key, value) => __defNormalProp$M(obj, typeof key !== "symbol" ? key + "" : key, value);
-class PromiseControl {
-  constructor(options = {}) {
-    this.options = options;
-    __publicField$y(this, "_promises", /* @__PURE__ */ new Map());
-  }
-  get isLoaded() {
-    return this._promises.size > 0;
-  }
-  remove(promise) {
-    if (this._promises.has(promise)) {
-      this._promises.delete(promise);
-      this._onStop();
-    }
-  }
-  get(promise) {
-    return this._promises.get(promise);
-  }
-  add(promise, name) {
-    const key = name ? name : promise;
-    const exist = this._promises.get(key);
-    if (this.options.onStart && !this.isLoaded) {
-      this.options.onStart();
-    }
-    if (exist) {
-      return exist;
-    }
-    this._promises.set(key, promise);
-    promise.finally(() => {
-      this.remove(key);
-    });
-    return promise;
-  }
-  abort() {
-    if (this.isLoaded) {
-      this._promises.forEach((x) => {
-        if (x.cancel) {
-          x.cancel();
-        }
-      });
-      this._promises.clear();
-      this._onStop();
-    }
-  }
-  waitFunc(func, name = "") {
-    name = name || func.name;
-    const exist = this.get(name);
-    if (exist) {
-      return exist;
-    }
-    return this.add(func(), name);
-  }
-  WaitForMe(name = "") {
-    const get = this.get.bind(this);
-    const add = this.add.bind(this);
-    return function(target, key, descriptor) {
-      const originalMethod = descriptor.value;
-      name = name || key;
-      descriptor.value = function(...args) {
-        const exist = get(name);
-        if (exist) {
-          return exist;
-        }
-        const result = add(originalMethod.apply(this, args), name);
-        return result;
-      };
-      return descriptor;
-    };
-  }
-  /** @deprecated use {@link PromiseControl.WaitForMe } instead */
-  GetOrCreateDecorator(name = "") {
-    return this.WaitForMe(name);
-  }
-  _onStop() {
-    if (this.options.onStop && !this.isLoaded) {
-      this.options.onStop();
-    }
-  }
-}
-
-var __defProp$L = Object.defineProperty;
-var __defNormalProp$L = (obj, key, value) => key in obj ? __defProp$L(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField$x = (obj, key, value) => __defNormalProp$L(obj, typeof key !== "symbol" ? key + "" : key, value);
-class TimeoutError extends Error {
-  constructor() {
-    super();
-    __publicField$x(this, "name", "TimeoutError");
-    Object.setPrototypeOf(this, TimeoutError.prototype);
-  }
-}
-
-var __defProp$K = Object.defineProperty;
-var __defNormalProp$K = (obj, key, value) => key in obj ? __defProp$K(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField$w = (obj, key, value) => __defNormalProp$K(obj, typeof key !== "symbol" ? key + "" : key, value);
-var _a;
-const handleCallback = (resolve, reject, callback, r) => {
-  try {
-    resolve(callback(r));
-  } catch (e) {
-    reject(e);
-  }
-};
-let ID$3 = 0;
-_a = Symbol.toStringTag;
-const _CancelablePromise = class _CancelablePromise {
-  constructor(executor, timeout) {
-    // @ts-ignore
-    __publicField$w(this, _a);
-    __publicField$w(this, "id", ID$3++);
-    __publicField$w(this, "_isCanceled", false);
-    __publicField$w(this, "_isPending", true);
-    __publicField$w(this, "_promise");
-    __publicField$w(this, "_cancelPromise");
-    __publicField$w(this, "_cancelHandlers", []);
-    __publicField$w(this, "_setCanceledCallback");
-    __publicField$w(this, "_parentPromise");
-    __publicField$w(this, "_children", []);
-    this._cancelPromise = new Promise((resolve_, reject_) => {
-      this._setCanceledCallback = (er) => resolve_(er || new CancelError());
-    });
-    const promises = [
-      this._cancelPromise,
-      new Promise((resolve, reject) => {
-        const onResolve = (value) => {
-          if (value instanceof _CancelablePromise) {
-            this.attach(value);
-          } else {
-            this._isPending = false;
-          }
-          resolve(value);
-        };
-        const onReject = (error) => {
-          this._isPending = false;
-          reject(error);
-        };
-        const onCancel = (handler) => {
-          if (!this._isPending) {
-            throw new Error(
-              "The `onCancel` handler was attached after the promise settled."
-            );
-          }
-          this._cancelHandlers.push(handler);
-        };
-        return executor(onResolve, onReject, onCancel);
-      })
-    ];
-    if (timeout) {
-      promises.push(
-        new Promise((resolve, reject) => {
-          setTimeout(() => {
-            if (this._isPending) {
-              try {
-                this.cancel();
-              } finally {
-                reject(new TimeoutError());
-              }
-            }
-          }, timeout);
-        })
-      );
-    }
-    this._promise = Promise.race(promises);
-  }
-  static createControl(opt) {
-    return new PromiseControl(opt);
-  }
-  static resolve(value) {
-    return new _CancelablePromise((resolve) => resolve(value));
-  }
-  static reject(value) {
-    return new _CancelablePromise((resolve, reject) => reject(value));
-  }
-  static all(values) {
-    return new _CancelablePromise((resolve, reject) => {
-      Promise.all(values).then(resolve).catch(reject);
-    }).catch((er) => {
-      if (er instanceof this.CancelError) {
-        for (const v of values) {
-          const v_ = v;
-          if ("cancel" in v_) {
-            v_.cancel();
-          }
-        }
-      }
-      throw er;
-    });
-  }
-  attach(p) {
-    if (this._isCanceled) {
-      p.cancel();
-    } else {
-      this._children.push(p);
-    }
-  }
-  then(onfulfilled, onrejected) {
-    const p = new _CancelablePromise((resolve, reject) => {
-      if (this._promise) {
-        const reject_ = (r) => {
-          if (onrejected) {
-            handleCallback(resolve, reject, onrejected, r);
-          } else {
-            reject(r);
-          }
-        };
-        this._promise.then((r) => {
-          if (this._isCanceled) {
-            reject_(r);
-          } else {
-            if (onfulfilled) {
-              handleCallback(resolve, reject, onfulfilled, r);
-            } else {
-              resolve(r);
-            }
-          }
-        }, reject_);
-      }
-    });
-    p._parentPromise = this;
-    this._children.push(p);
-    return p;
-  }
-  catch(onrejected) {
-    if (this._isCanceled && onrejected) {
-      onrejected(new CancelError());
-    }
-    return this.then(void 0, onrejected);
-  }
-  finally(onfinally) {
-    if (this._promise) {
-      return this._promise.finally(onfinally);
-    }
-    if (this._isCanceled) {
-      return Promise.reject(new CancelError());
-    }
-    return Promise.reject(onfinally);
-  }
-  cancel() {
-    if (this._isCanceled || !this._isPending) {
-      return this;
-    }
-    this._isCanceled = true;
-    const parent = this._getTopParent();
-    if (parent) {
-      parent.cancel();
-    }
-    if (this._children) {
-      this._children.forEach((x) => x.cancel());
-    }
-    if (this._isPending) {
-      if (this._cancelHandlers.length) {
-        try {
-          for (const handler of this._cancelHandlers) {
-            handler();
-          }
-        } catch (error) {
-        }
-      }
-      if (this._setCanceledCallback) {
-        this._setCanceledCallback();
-      }
-    }
-    this._destroy();
-    return this;
-  }
-  _getTopParent() {
-    let parent = this._parentPromise;
-    let hasParent = !!parent;
-    while (hasParent) {
-      if (parent && parent._parentPromise) {
-        parent = parent._parentPromise;
-        hasParent = !!parent;
-      } else {
-        hasParent = false;
-      }
-    }
-    return parent;
-  }
-  _destroy() {
-    this._setCanceledCallback = void 0;
-    this._cancelPromise = void 0;
-    this._promise = void 0;
-  }
-};
-__publicField$w(_CancelablePromise, "CancelError", CancelError);
-__publicField$w(_CancelablePromise, "TimeoutError", TimeoutError);
-__publicField$w(_CancelablePromise, "PromiseControl", PromiseControl);
-let CancelablePromise = _CancelablePromise;
-Object.setPrototypeOf(CancelablePromise.prototype, Promise.prototype);
-
 const svgPath = {
   brill: '<path d="m6 0-5 6 5 6 5-6z"/>',
   circle: '<circle cx="6" cy="6" r="6"/>',
@@ -1111,7 +809,7 @@ function objectRemoveEmpty(obj) {
 }
 
 function round(val, toFixed) {
-  const n = toFixed ? Number("1e+" + toFixed) : 1;
+  const n = 1;
   return Math.round((val + Number.EPSILON) * n) / n;
 }
 
@@ -1126,9 +824,9 @@ function fixUrlStr(url) {
   return url.replace(/([^:]\/)\/+/g, "$1");
 }
 
-var __defProp$J = Object.defineProperty;
-var __defNormalProp$J = (obj, key, value) => key in obj ? __defProp$J(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField$v = (obj, key, value) => __defNormalProp$J(obj, typeof key !== "symbol" ? key + "" : key, value);
+var __defProp$K = Object.defineProperty;
+var __defNormalProp$K = (obj, key, value) => key in obj ? __defProp$K(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField$v = (obj, key, value) => __defNormalProp$K(obj, typeof key !== "symbol" ? key + "" : key, value);
 const _Cache = class _Cache {
   constructor(options = {}) {
     __publicField$v(this, "cache", []);
@@ -1164,8 +862,7 @@ const _Cache = class _Cache {
    * // somewhere else in the code
    * const item = await cache.addFull('foo', getItemFunc).then((resp) => {
    *   console.log(resp); // 'New item'
-   * })
-   *
+   * });
    * ```
    */
   addFull(key, valueToSet, props) {
@@ -1180,13 +877,11 @@ const _Cache = class _Cache {
       } else {
         value = valueToSet;
       }
-      const props_ = props && JSON.parse(JSON.stringify(objectRemoveEmpty(props)));
+      const nonEmptyProps = props && JSON.parse(JSON.stringify(objectRemoveEmpty(props)));
       const cacheItem = {
         key,
         value,
-        props: props_,
-        // TODO: remove backward compatibility use only props
-        options: props_
+        props: nonEmptyProps
       };
       if (onlyFull && !full(value)) {
         return value;
@@ -1195,7 +890,6 @@ const _Cache = class _Cache {
       if (value instanceof Promise) {
         value.catch((er) => {
           this.delete(key, props);
-          throw er;
         });
         if (onlyFull) {
           value.then((x) => {
@@ -1214,9 +908,7 @@ const _Cache = class _Cache {
   }
   match(key, props) {
     const cacheRecord = this._find(key, props);
-    if (cacheRecord) {
-      return cacheRecord.value;
-    }
+    return cacheRecord == null ? void 0 : cacheRecord.value;
   }
   matchAll(key, props) {
     if (key) {
@@ -1225,37 +917,30 @@ const _Cache = class _Cache {
     return this.cache.map((x) => x.value);
   }
   delete(keyOrItem, props) {
-    let exist = [];
-    if (typeof keyOrItem === "string") {
-      exist = this.cache.filter((x) => this._filter(x, keyOrItem, props));
-    } else {
-      exist.push(keyOrItem);
-    }
-    for (const e of exist) {
-      const index = this.cache.indexOf(e);
-      this.cache.splice(index, 1);
+    const itemsToDelete = typeof keyOrItem === "string" ? this.cache.filter((x) => this._filter(x, keyOrItem, props)) : [keyOrItem];
+    for (const item of itemsToDelete) {
+      const index = this.cache.indexOf(item);
+      if (index !== -1) {
+        this.cache.splice(index, 1);
+      }
     }
   }
   _find(key, props) {
     return this.cache.find((x) => this._filter(x, key, props));
   }
   _filter(item, key, props) {
-    if (item.key === key) {
-      if (props) {
-        const itemProps = item.props || item.options;
-        return objectDeepEqual(itemProps || {}, objectRemoveEmpty(props));
-      }
-      return true;
-    }
-    return false;
+    if (item.key !== key) return false;
+    if (!props) return true;
+    const itemProps = item.props;
+    return objectDeepEqual(itemProps || {}, objectRemoveEmpty(props));
   }
 };
 __publicField$v(_Cache, "instance", {});
 let Cache = _Cache;
 
-var __defProp$I = Object.defineProperty;
-var __defNormalProp$I = (obj, key, value) => key in obj ? __defProp$I(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField$u = (obj, key, value) => __defNormalProp$I(obj, typeof key !== "symbol" ? key + "" : key, value);
+var __defProp$J = Object.defineProperty;
+var __defNormalProp$J = (obj, key, value) => key in obj ? __defProp$J(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField$u = (obj, key, value) => __defNormalProp$J(obj, typeof key !== "symbol" ? key + "" : key, value);
 class NgwError extends Error {
   constructor(er) {
     super();
@@ -1272,9 +957,9 @@ class NgwError extends Error {
   }
 }
 
-var __defProp$H = Object.defineProperty;
-var __defNormalProp$H = (obj, key, value) => key in obj ? __defProp$H(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField$t = (obj, key, value) => __defNormalProp$H(obj, typeof key !== "symbol" ? key + "" : key, value);
+var __defProp$I = Object.defineProperty;
+var __defNormalProp$I = (obj, key, value) => key in obj ? __defProp$I(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField$t = (obj, key, value) => __defNormalProp$I(obj, typeof key !== "symbol" ? key + "" : key, value);
 class ResourceNotFoundError extends NgwError {
   constructor(obj) {
     super(obj);
@@ -1313,27 +998,24 @@ function resourceToQuery(resource, prefix = "") {
   return query;
 }
 
-var __defProp$G = Object.defineProperty;
-var __defProps$d = Object.defineProperties;
-var __getOwnPropDescs$d = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$u = Object.getOwnPropertySymbols;
-var __hasOwnProp$u = Object.prototype.hasOwnProperty;
-var __propIsEnum$u = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$G = (obj, key, value) => key in obj ? __defProp$G(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$t = (a, b) => {
+var __defProp$H = Object.defineProperty;
+var __getOwnPropSymbols$w = Object.getOwnPropertySymbols;
+var __hasOwnProp$w = Object.prototype.hasOwnProperty;
+var __propIsEnum$w = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$H = (obj, key, value) => key in obj ? __defProp$H(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$v = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$u.call(b, prop))
-      __defNormalProp$G(a, prop, b[prop]);
-  if (__getOwnPropSymbols$u)
-    for (var prop of __getOwnPropSymbols$u(b)) {
-      if (__propIsEnum$u.call(b, prop))
-        __defNormalProp$G(a, prop, b[prop]);
+    if (__hasOwnProp$w.call(b, prop))
+      __defNormalProp$H(a, prop, b[prop]);
+  if (__getOwnPropSymbols$w)
+    for (var prop of __getOwnPropSymbols$w(b)) {
+      if (__propIsEnum$w.call(b, prop))
+        __defNormalProp$H(a, prop, b[prop]);
     }
   return a;
 };
-var __spreadProps$d = (a, b) => __defProps$d(a, __getOwnPropDescs$d(b));
-var __publicField$s = (obj, key, value) => __defNormalProp$G(obj, typeof key !== "symbol" ? key + "" : key, value);
-var __async$l = (__this, __arguments, generator) => {
+var __publicField$s = (obj, key, value) => __defNormalProp$H(obj, typeof key !== "symbol" ? key + "" : key, value);
+var __async$s = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
       try {
@@ -1374,39 +1056,27 @@ class ResourcesControl {
    * Fetching resource would be cached to speed up next call
    */
   getOne(resource, requestOptions) {
-    const cache = this.cache;
-    const forCache = {};
-    const opt = __spreadProps$d(__spreadValues$t({}, requestOptions), { cache: false });
-    if (typeof resource === "string") {
-      forCache.keyname = resource;
-    } else if (typeof resource === "number") {
-      forCache.id = resource;
-    } else if (isObject(resource)) {
+    const opt = __spreadValues$v({}, requestOptions);
+    if (typeof resource === "string") ; else if (typeof resource === "number") ; else if (isObject(resource)) {
       if (resource.id !== void 0) {
-        forCache.id = resource.id;
+        resource.id;
       } else {
         if (resource.keyname) {
-          forCache.keyname = resource.keyname;
+          resource.keyname;
         }
         if (resource.display_name) {
-          forCache.display_name = resource.display_name;
+          resource.display_name;
         }
       }
     }
-    const makeRequest = () => {
-      if (typeof resource === "string") {
-        return this._fetchResourceBy({ keyname: resource }, opt);
-      } else if (typeof resource === "number") {
-        return this._fetchResourceById(resource, opt);
-      } else if (isObject(resource)) {
-        return this._fetchResourceBy(resource, opt);
-      }
-      return CancelablePromise.resolve(void 0);
-    };
-    if (requestOptions == null ? void 0 : requestOptions.cache) {
-      return cache.addFull("resource", makeRequest, forCache);
+    if (typeof resource === "string") {
+      return this._fetchResourceBy({ keyname: resource }, opt);
+    } else if (typeof resource === "number") {
+      return this._fetchResourceById(resource, opt);
+    } else if (isObject(resource)) {
+      return this._fetchResourceBy(resource, opt);
     }
-    return makeRequest();
+    return Promise.resolve(void 0);
   }
   getOneOrFail(resource, requestOptions) {
     return this.getOne(resource, requestOptions).then((res) => {
@@ -1428,7 +1098,7 @@ class ResourcesControl {
    */
   getId(resource, requestOptions) {
     if (typeof resource === "number") {
-      return CancelablePromise.resolve(resource);
+      return Promise.resolve(resource);
     } else if (typeof resource === "string" || isObject(resource)) {
       return this.getOne(resource, requestOptions).then((res) => {
         if (res) {
@@ -1436,7 +1106,7 @@ class ResourcesControl {
         }
       });
     }
-    return CancelablePromise.resolve(void 0);
+    return Promise.resolve(void 0);
   }
   /**
    * A fast way to retrieve resource ID for any resource definition.
@@ -1463,12 +1133,12 @@ class ResourcesControl {
         } else {
           Object.assign(query, resourceToQuery(resource));
         }
-        return this.connector.get("resource.search", requestOptions, __spreadValues$t({
+        return this.connector.get("resource.search", requestOptions, __spreadValues$v({
           serialization: "full"
         }, query)).then((resources) => {
-          if (resources) {
+          if ((requestOptions == null ? void 0 : requestOptions.cache) && resources) {
             for (const x of resources) {
-              this.cache.add("resource.item", CancelablePromise.resolve(x), {
+              this.cache.add("resource.item", Promise.resolve(x), {
                 id: x.resource.id
               });
             }
@@ -1484,7 +1154,7 @@ class ResourcesControl {
       if (child) {
         return this.getOne(child.resource.parent.id, requestOptions);
       }
-      return CancelablePromise.resolve(void 0);
+      return Promise.resolve(void 0);
     });
   }
   getChildrenOf(resource, requestOptions) {
@@ -1514,18 +1184,16 @@ class ResourcesControl {
     });
   }
   _getChildrenOf(parent, requestOptions, _items = []) {
-    return this.connector.get(
-      "resource.collection",
-      __spreadValues$t({ cache: true }, requestOptions),
-      {
-        parent
-      }
-    ).then((items) => {
+    return this.connector.get("resource.collection", requestOptions, {
+      parent
+    }).then((items) => {
       const recursivePromises = [];
       for (const item of items) {
-        this.cache.add("resource.item", CancelablePromise.resolve(item), {
-          id: item.resource.id
-        });
+        if (requestOptions == null ? void 0 : requestOptions.cache) {
+          this.cache.add("resource.item", Promise.resolve(item), {
+            id: item.resource.id
+          });
+        }
         _items.push(item);
         if ((requestOptions == null ? void 0 : requestOptions.recursive) && item.resource.children) {
           recursivePromises.push(
@@ -1534,7 +1202,7 @@ class ResourcesControl {
         }
       }
       if (recursivePromises.length) {
-        return CancelablePromise.all(recursivePromises).then(() => {
+        return Promise.all(recursivePromises).then(() => {
           return _items;
         });
       }
@@ -1542,11 +1210,12 @@ class ResourcesControl {
     });
   }
   _cleanResourceItemCache(id) {
-    return __async$l(this, null, function* () {
+    return __async$s(this, null, function* () {
+      var _a;
       const all = this.cache.all();
       const toDelete = [];
       for (const c of all) {
-        const cid = c.options && c.options.id;
+        const cid = (_a = c.props) == null ? void 0 : _a.id;
         if (["resource.item", "resource"].includes(c.key) && cid !== void 0) {
           if (typeof cid === "number") {
             if (cid === id) {
@@ -1566,18 +1235,7 @@ class ResourcesControl {
     });
   }
   _fetchResourceById(id, requestOptions) {
-    const promise = () => this.connector.get("resource.item", requestOptions, { id });
-    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();
+    return this.connector.get("resource.item", requestOptions, { id });
   }
   _fetchResourceBy(resource, requestOptions) {
     return this.getMany(resource, requestOptions).then((resources) => {
@@ -1585,7 +1243,7 @@ class ResourcesControl {
     });
   }
   _resourceCacheFilter(resource) {
-    return CancelablePromise.all(this.cache.matchAll("resource.item")).then(
+    return Promise.all(this.cache.matchAll("resource.item")).then(
       (resources) => {
         const items = [];
         resources.filter((x) => {
@@ -1629,9 +1287,16 @@ function removeConnector(connector) {
   }
 }
 
-var __defProp$F = Object.defineProperty;
-var __defNormalProp$F = (obj, key, value) => key in obj ? __defProp$F(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField$r = (obj, key, value) => __defNormalProp$F(obj, typeof key !== "symbol" ? key + "" : key, value);
+class AbortError extends Error {
+  constructor(message = "AbortError") {
+    super(message);
+    this.name = "AbortError";
+  }
+}
+
+var __defProp$G = Object.defineProperty;
+var __defNormalProp$G = (obj, key, value) => key in obj ? __defProp$G(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField$r = (obj, key, value) => __defNormalProp$G(obj, typeof key !== "symbol" ? key + "" : key, value);
 class InsufficientPermissionsError extends NgwError {
   constructor(obj) {
     super(obj);
@@ -1654,64 +1319,96 @@ function template(str, data) {
   });
 }
 
+var __defProp$F = Object.defineProperty;
+var __getOwnPropSymbols$v = Object.getOwnPropertySymbols;
+var __hasOwnProp$v = Object.prototype.hasOwnProperty;
+var __propIsEnum$v = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$F = (obj, key, value) => key in obj ? __defProp$F(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$u = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp$v.call(b, prop))
+      __defNormalProp$F(a, prop, b[prop]);
+  if (__getOwnPropSymbols$v)
+    for (var prop of __getOwnPropSymbols$v(b)) {
+      if (__propIsEnum$v.call(b, prop))
+        __defNormalProp$F(a, prop, b[prop]);
+    }
+  return a;
+};
+var __async$r = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
 function apiRequest(opt) {
-  const params = opt.params;
-  return new CancelablePromise((resolve, reject) => {
-    return opt.connector.connect().then((apiItems) => {
-      let apiItem = apiItems && apiItems[opt.name];
-      if (apiItem) {
-        apiItem = [...apiItem];
-        let url = apiItem.shift();
-        if (apiItem.length) {
-          const replaceParams = {};
-          for (let fry = 0; fry < apiItem.length; fry++) {
-            const arg = apiItem[fry];
-            replaceParams[fry] = "{" + arg + "}";
-            if (params[arg] === void 0) {
-              throw new Error(
-                "`" + arg + "` url api argument is not specified"
-              );
-            }
-          }
-          if (url) {
-            url = template(url, replaceParams);
+  return __async$r(this, null, function* () {
+    const { params, name, connector, requestOptions } = opt;
+    const apiItems = yield connector.connect();
+    let apiItem = apiItems && apiItems[name];
+    if (apiItem) {
+      apiItem = [...apiItem];
+      let url = apiItem.shift();
+      if (apiItem.length) {
+        const replaceParams = {};
+        for (let fry = 0; fry < apiItem.length; fry++) {
+          const arg = apiItem[fry];
+          replaceParams[fry] = `{${arg}}`;
+          if (params[arg] === void 0) {
+            throw new Error(`\`${arg}\` URL API argument is not specified`);
           }
         }
-        if (params) {
-          const paramArray = [];
-          const paramList = params.paramList;
-          if (Array.isArray(paramList)) {
-            delete params.paramList;
-            paramList.forEach((x) => {
-              paramArray.push(`${x[0]}=${x[1]}`);
-            });
-          }
-          for (const p in params) {
-            if (apiItem.indexOf(p) === -1) {
-              paramArray.push(`${p}=${params[p]}`);
-            }
-          }
-          if (paramArray.length) {
-            url = url + "?" + paramArray.join("&");
+        if (url) {
+          url = template(url, replaceParams);
+        }
+      }
+      if (params) {
+        const paramArray = [];
+        const paramList = params.paramList;
+        if (Array.isArray(paramList)) {
+          paramList.forEach(([key, value]) => {
+            paramArray.push(`${key}=${value}`);
+          });
+        }
+        for (const p in params) {
+          if (apiItem.indexOf(p) === -1) {
+            paramArray.push(`${p}=${params[p]}`);
           }
         }
-        if (url) {
-          resolve(opt.connector.makeQuery(url, params, opt.requestOptions));
-        } else {
-          reject(new Error("request url is not set"));
+        if (paramArray.length) {
+          url = `${url}?${paramArray.join("&")}`;
         }
+      }
+      if (url) {
+        return connector.makeQuery(url, params, __spreadValues$u({
+          cacheName: name
+        }, requestOptions));
       } else {
-        resolve(void 0);
+        throw new Error("Request URL is not set");
       }
-    }).catch((er) => {
-      reject(er);
-    });
+    } else {
+      return void 0;
+    }
   });
 }
 
 var __defProp$E = Object.defineProperty;
 var __defNormalProp$E = (obj, key, value) => key in obj ? __defProp$E(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField$q = (obj, key, value) => __defNormalProp$E(obj, typeof key !== "symbol" ? key + "" : key, value);
+var __publicField$q = (obj, key, value) => __defNormalProp$E(obj, key + "" , value);
 class NetworkError extends Error {
   constructor(url) {
     super();
@@ -1805,23 +1502,59 @@ let loadData;
 }
 
 var __defProp$D = Object.defineProperty;
-var __getOwnPropSymbols$t = Object.getOwnPropertySymbols;
-var __hasOwnProp$t = Object.prototype.hasOwnProperty;
-var __propIsEnum$t = Object.prototype.propertyIsEnumerable;
+var __defProps$d = Object.defineProperties;
+var __getOwnPropDescs$d = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$u = Object.getOwnPropertySymbols;
+var __hasOwnProp$u = Object.prototype.hasOwnProperty;
+var __propIsEnum$u = Object.prototype.propertyIsEnumerable;
 var __defNormalProp$D = (obj, key, value) => key in obj ? __defProp$D(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$s = (a, b) => {
+var __spreadValues$t = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$t.call(b, prop))
+    if (__hasOwnProp$u.call(b, prop))
       __defNormalProp$D(a, prop, b[prop]);
-  if (__getOwnPropSymbols$t)
-    for (var prop of __getOwnPropSymbols$t(b)) {
-      if (__propIsEnum$t.call(b, prop))
+  if (__getOwnPropSymbols$u)
+    for (var prop of __getOwnPropSymbols$u(b)) {
+      if (__propIsEnum$u.call(b, prop))
         __defNormalProp$D(a, prop, b[prop]);
     }
   return a;
 };
+var __spreadProps$d = (a, b) => __defProps$d(a, __getOwnPropDescs$d(b));
+var __objRest$2 = (source, exclude) => {
+  var target = {};
+  for (var prop in source)
+    if (__hasOwnProp$u.call(source, prop) && exclude.indexOf(prop) < 0)
+      target[prop] = source[prop];
+  if (source != null && __getOwnPropSymbols$u)
+    for (var prop of __getOwnPropSymbols$u(source)) {
+      if (exclude.indexOf(prop) < 0 && __propIsEnum$u.call(source, prop))
+        target[prop] = source[prop];
+    }
+  return target;
+};
 var __publicField$p = (obj, key, value) => __defNormalProp$D(obj, typeof key !== "symbol" ? key + "" : key, value);
+var __async$q = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
 let ID$2 = 0;
+let REQUEST_ID = 0;
 class NgwConnector {
   constructor(options) {
     this.options = options;
@@ -1831,7 +1564,7 @@ class NgwConnector {
     __publicField$p(this, "resources");
     __publicField$p(this, "cache");
     __publicField$p(this, "routeStr", "/api/component/pyramid/route");
-    __publicField$p(this, "activeRequests", []);
+    __publicField$p(this, "activeRequests", {});
     __publicField$p(this, "requestTransform");
     const exist = findConnector(options);
     this.cache = new Cache({ namespace: options.cacheId });
@@ -1888,29 +1621,27 @@ class NgwConnector {
    * ```
    */
   connect() {
-    const auth = this.options.auth;
-    const makeConnect = () => new CancelablePromise((resolve, reject) => {
-      const makeQuery = () => {
-        return this.makeQuery(this.routeStr, {}, {}).then((route) => {
-          resolve(route);
-        }).catch((er) => {
-          reject(er);
-        });
-      };
+    return __async$q(this, null, function* () {
+      const auth = this.options.auth;
       if (auth) {
         const { login, password } = auth;
         if (login && password) {
-          return this._login({ login, password }).then(() => {
-            return makeQuery();
-          }).catch((er) => reject(er));
+          yield this._login({ login, password });
         }
       }
-      return makeQuery();
-    });
-    return this.cache.add("route", makeConnect, {
-      id: this.id,
-      auth,
-      baseUrl: this.options.baseUrl
+      return yield this.makeQuery(
+        this.routeStr,
+        {},
+        {
+          cacheName: "route",
+          cache: true,
+          cacheProps: {
+            id: this.id,
+            auth,
+            baseUrl: this.options.baseUrl
+          }
+        }
+      );
     });
   }
   /**
@@ -1934,20 +1665,22 @@ class NgwConnector {
     this.emitter.emit("logout");
   }
   getUserInfo(credentials, options) {
-    if (this.user && this.user.id) {
-      return CancelablePromise.resolve(this.user);
-    }
-    if (credentials) {
-      this.options.auth = credentials;
-    }
-    const options_ = __spreadValues$s({
-      headers: this.getAuthorizationHeaders(credentials)
-    }, options);
-    return this.makeQuery(
-      "/api/component/auth/current_user",
-      {},
-      options_
-    );
+    return __async$q(this, null, function* () {
+      if (this.user && this.user.id) {
+        return this.user;
+      }
+      if (credentials) {
+        this.options.auth = credentials;
+      }
+      const options_ = __spreadValues$t({
+        headers: this.getAuthorizationHeaders(credentials)
+      }, options);
+      return this.makeQuery(
+        "/api/component/auth/current_user",
+        {},
+        options_
+      );
+    });
   }
   /**
    * Obtaining the required Headers for authentication of requests in the NGW.
@@ -1956,7 +1689,7 @@ class NgwConnector {
     const client = this.makeClientId(credentials);
     if (client) {
       return {
-        Authorization: "Basic " + client
+        Authorization: `Basic ${client}`
       };
     }
   }
@@ -1964,21 +1697,22 @@ class NgwConnector {
     credentials = credentials || this.options.auth;
     if (credentials) {
       const { login, password } = credentials;
-      const str = unescape(encodeURIComponent(`${login}:${password}`));
+      const str = `${login}:${password}`;
+      const encodedStr = encodeURIComponent(str);
       {
-        return window.btoa(str);
+        return window.btoa(encodedStr);
       }
     }
   }
   /** Stop all api requests */
   abort() {
-    for (const req of this.activeRequests) {
-      req.cancel();
+    for (const abortController of Object.values(this.activeRequests)) {
+      abortController.abort();
     }
-    this.activeRequests = [];
+    this.activeRequests = {};
   }
   getActiveApiRequests() {
-    return [...this.activeRequests];
+    return __spreadValues$t({}, this.activeRequests);
   }
   /**
    * Send request to NGW api router.
@@ -2010,23 +1744,10 @@ class NgwConnector {
    * ```
    */
   apiRequest(name, params_ = {}, requestOptions = {}) {
-    var _a, _b;
-    const { method, headers, withCredentials, responseType } = requestOptions;
+    var _a;
     params_ = (_a = requestOptions.params) != null ? _a : params_;
     const params = objectRemoveEmpty(params_);
-    const makeApiRequest = () => apiRequest({ name, params, requestOptions, connector: this });
-    if (requestOptions.cache && method === "GET") {
-      return this.cache.add(name, makeApiRequest, __spreadValues$s({
-        params
-      }, objectRemoveEmpty({
-        headers,
-        withCredentials,
-        responseType,
-        baseUrl: this.options.baseUrl,
-        userId: (_b = this.user) == null ? void 0 : _b.id
-      })));
-    }
-    return makeApiRequest();
+    return apiRequest({ name, params, requestOptions, connector: this });
   }
   /**
    * Shortcut method for send POST request to NGW.
@@ -2116,17 +1837,67 @@ class NgwConnector {
    * @param params - Query params
    * @param options - Request options
    */
-  makeQuery(url, params, options = {}) {
-    url = (this.options.baseUrl ? this.options.baseUrl : "") + url;
-    if (url) {
+  makeQuery(_0, _1) {
+    return __async$q(this, arguments, function* (url, params, options = {}) {
+      var _b;
+      url = (this.options.baseUrl ? this.options.baseUrl : "") + url;
+      if (!url) {
+        throw new Error("Empty `url` not allowed");
+      }
       if (params) {
-        url = template(url, params);
+        const _a = params, restParams = __objRest$2(_a, ["paramList"]);
+        url = template(url, restParams);
+      }
+      url = encodeURI(fixUrlStr(url));
+      const {
+        cache,
+        signal: externalSignal,
+        method = "GET",
+        headers,
+        cacheName,
+        cacheProps,
+        responseType,
+        withCredentials
+      } = options;
+      const internalAbortController = new AbortController();
+      const internalSignal = internalAbortController.signal;
+      if (externalSignal) {
+        if (externalSignal.aborted) {
+          throw new AbortError();
+        }
+        externalSignal.addEventListener("abort", () => {
+          internalAbortController.abort();
+        });
+      }
+      options.signal = internalSignal;
+      const createPromise = () => __async$q(this, null, function* () {
+        const id = REQUEST_ID++;
+        this.activeRequests[id] = internalAbortController;
+        try {
+          return this._loadData(url, options);
+        } finally {
+          this._cleanActiveRequest(id);
+        }
+      });
+      if (cache && method === "GET") {
+        const cacheOptions = cacheProps ? cacheProps : __spreadProps$d(__spreadValues$t({}, objectRemoveEmpty({
+          headers,
+          withCredentials,
+          responseType,
+          baseUrl: this.options.baseUrl,
+          userId: (_b = this.user) == null ? void 0 : _b.id
+        })), {
+          params
+        });
+        return this.cache.add(
+          cacheName || url,
+          createPromise,
+          cacheOptions,
+          false
+        );
       }
-      url = encodeURI(fixUrlStr(url));
-      return this._loadData(url, options);
-    } else {
-      throw new Error("Empty `url` not allowed");
-    }
+      return createPromise();
+    });
   }
   // -------------------------------------------------------------------------
   // Resource Methods
@@ -2208,26 +1979,29 @@ class NgwConnector {
    */
   _loadData(url, options) {
     options.responseType = options.responseType || "json";
-    if (options.signal && options.signal.aborted) {
-      return CancelablePromise.reject(new CancelablePromise.CancelError());
-    }
-    const request = new CancelablePromise((resolve, reject, onCancel) => {
+    return new Promise((resolve, reject) => {
+      var _a;
       if (this.user) {
         options = options || {};
-        options.headers = __spreadValues$s(__spreadValues$s({}, this.getAuthorizationHeaders()), options.headers);
+        options.headers = __spreadValues$t(__spreadValues$t({}, this.getAuthorizationHeaders()), options.headers);
       }
       if (this.requestTransform) {
         const [transUrl, transOptions] = this.requestTransform(url, options);
         url = transUrl;
         options = transOptions;
       }
-      loadData(url, resolve, options, reject, onCancel);
-    }).then((resp) => {
-      this._cleanActiveRequests(request);
-      return resp;
+      let runOnAbort = void 0;
+      loadData(url, resolve, options, reject, (handler) => {
+        runOnAbort = handler;
+      });
+      (_a = options.signal) == null ? void 0 : _a.addEventListener("abort", () => {
+        if (runOnAbort !== void 0) {
+          runOnAbort();
+        }
+        reject(new AbortError());
+      });
     }).catch((httpError) => {
-      this._cleanActiveRequests(request);
-      if (httpError instanceof CancelablePromise.CancelError) ; else {
+      if (httpError.name !== "AbortError") {
         {
           console.warn("DEV WARN", httpError);
         }
@@ -2236,31 +2010,24 @@ class NgwConnector {
           throw er;
         }
       }
+      throw httpError;
     });
-    if (options.signal && typeof options.signal.addEventListener === "function") {
-      options.signal.addEventListener("abort", () => {
-        request.cancel();
-        this._cleanActiveRequests(request);
-      });
-    }
-    this.activeRequests.push(request);
-    return request;
   }
   _login(credentials, options) {
-    return this.getUserInfo(credentials, options).then((data) => {
-      this.user = data;
-      this.emitter.emit("login", data);
-      return data;
-    }).catch((er) => {
-      this.emitter.emit("login:error", er);
-      throw er;
+    return __async$q(this, null, function* () {
+      try {
+        const data = yield this.getUserInfo(credentials, options);
+        this.user = data;
+        this.emitter.emit("login", data);
+        return data;
+      } catch (er) {
+        this.emitter.emit("login:error", er);
+        throw er;
+      }
     });
   }
-  _cleanActiveRequests(request) {
-    const activeRequestIndex = this.activeRequests.indexOf(request);
-    if (activeRequestIndex !== -1) {
-      this.activeRequests.splice(activeRequestIndex, 1);
-    }
+  _cleanActiveRequest(requestId) {
+    delete this.activeRequests[requestId];
   }
   _handleHttpError(er) {
     if (er) {
@@ -2281,17 +2048,17 @@ __publicField$p(NgwConnector, "errors", {
 });
 
 var __defProp$C = Object.defineProperty;
-var __getOwnPropSymbols$s = Object.getOwnPropertySymbols;
-var __hasOwnProp$s = Object.prototype.hasOwnProperty;
-var __propIsEnum$s = Object.prototype.propertyIsEnumerable;
+var __getOwnPropSymbols$t = Object.getOwnPropertySymbols;
+var __hasOwnProp$t = Object.prototype.hasOwnProperty;
+var __propIsEnum$t = Object.prototype.propertyIsEnumerable;
 var __defNormalProp$C = (obj, key, value) => key in obj ? __defProp$C(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$r = (a, b) => {
+var __spreadValues$s = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$s.call(b, prop))
+    if (__hasOwnProp$t.call(b, prop))
       __defNormalProp$C(a, prop, b[prop]);
-  if (__getOwnPropSymbols$s)
-    for (var prop of __getOwnPropSymbols$s(b)) {
-      if (__propIsEnum$s.call(b, prop))
+  if (__getOwnPropSymbols$t)
+    for (var prop of __getOwnPropSymbols$t(b)) {
+      if (__propIsEnum$t.call(b, prop))
         __defNormalProp$C(a, prop, b[prop]);
     }
   return a;
@@ -2339,7 +2106,7 @@ function isPropertyFilter(filter) {
   return false;
 }
 function featureFilter(feature, filters) {
-  const properties = __spreadValues$r({}, feature.properties);
+  const properties = __spreadValues$s({}, feature.properties);
   if (properties) {
     properties.$id = feature.id;
     return propertiesFilter(properties, filters);
@@ -2377,22 +2144,42 @@ function propertiesFilter(properties, filters) {
 var __defProp$B = Object.defineProperty;
 var __defProps$c = Object.defineProperties;
 var __getOwnPropDescs$c = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$r = Object.getOwnPropertySymbols;
-var __hasOwnProp$r = Object.prototype.hasOwnProperty;
-var __propIsEnum$r = Object.prototype.propertyIsEnumerable;
+var __getOwnPropSymbols$s = Object.getOwnPropertySymbols;
+var __hasOwnProp$s = Object.prototype.hasOwnProperty;
+var __propIsEnum$s = Object.prototype.propertyIsEnumerable;
 var __defNormalProp$B = (obj, key, value) => key in obj ? __defProp$B(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$q = (a, b) => {
+var __spreadValues$r = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$r.call(b, prop))
+    if (__hasOwnProp$s.call(b, prop))
       __defNormalProp$B(a, prop, b[prop]);
-  if (__getOwnPropSymbols$r)
-    for (var prop of __getOwnPropSymbols$r(b)) {
-      if (__propIsEnum$r.call(b, prop))
+  if (__getOwnPropSymbols$s)
+    for (var prop of __getOwnPropSymbols$s(b)) {
+      if (__propIsEnum$s.call(b, prop))
         __defNormalProp$B(a, prop, b[prop]);
     }
   return a;
 };
 var __spreadProps$c = (a, b) => __defProps$c(a, __getOwnPropDescs$c(b));
+var __async$p = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
 const FEATURE_REQUEST_PARAMS = {
   srs: 4326,
   geom_format: "geojson"
@@ -2433,10 +2220,9 @@ function updateItemRequestParam(params, options) {
   }
 }
 function createFeatureFieldFilterQueries(opt) {
-  const queries = getQueries(
-    opt
-  );
-  return CancelablePromise.all(queries).then((itemsParts) => {
+  return __async$p(this, null, function* () {
+    const queries = getQueries(opt);
+    const itemsParts = yield Promise.all(queries);
     const ids = [];
     const items = [];
     for (const part of itemsParts) {
@@ -2469,20 +2255,22 @@ 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") {
     for (const f of filters_) {
       if (isPropertyFilter(f)) {
         _queries.push(
-          fetchNgwLayerItemsRequest(__spreadProps$c(__spreadValues$q({}, opt), {
-            paramList: [..._parentAllParams, createParam(f)]
+          fetchNgwLayerItemsRequest(__spreadProps$c(__spreadValues$r({}, opt), {
+            paramList: [..._parentAllParams, ...paramList, createParam(f)]
           }))
         );
       } else {
         getQueries(
-          __spreadProps$c(__spreadValues$q({}, opt), {
+          __spreadProps$c(__spreadValues$r({}, opt), {
             filters: f
           }),
           _queries,
@@ -2503,7 +2291,7 @@ function getQueries(opt, _queries = [], _parentAllParams = []) {
     if (propertiesFilterList.length) {
       for (const x of propertiesFilterList) {
         getQueries(
-          __spreadProps$c(__spreadValues$q({}, opt), {
+          __spreadProps$c(__spreadValues$r({}, opt), {
             filters: x
           }),
           _queries,
@@ -2512,8 +2300,8 @@ function getQueries(opt, _queries = [], _parentAllParams = []) {
       }
     } else {
       _queries.push(
-        fetchNgwLayerItemsRequest(__spreadProps$c(__spreadValues$q({}, opt), {
-          paramList: [..._parentAllParams, ...filters2]
+        fetchNgwLayerItemsRequest(__spreadProps$c(__spreadValues$r({}, opt), {
+          paramList: [..._parentAllParams, ...paramList, ...filters2]
         }))
       );
     }
@@ -2528,7 +2316,7 @@ function createWktFromCoordArray(coord) {
   return `POLYGON((${polygon.join(", ")}))`;
 }
 function fetchNgwLayerItemsRequest(options) {
-  const params = __spreadValues$q({}, FEATURE_REQUEST_PARAMS);
+  const params = __spreadValues$r({}, FEATURE_REQUEST_PARAMS);
   const {
     limit,
     cache,
@@ -2567,7 +2355,7 @@ function fetchNgwLayerItemsRequest(options) {
   if (paramList) {
     params.paramList = paramList;
   }
-  const reqParams = __spreadValues$q({
+  const reqParams = __spreadValues$r({
     id: resourceId
   }, params);
   return connector.get(
@@ -2580,52 +2368,90 @@ function fetchNgwLayerItemsRequest(options) {
 var __defProp$A = Object.defineProperty;
 var __defProps$b = Object.defineProperties;
 var __getOwnPropDescs$b = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$q = Object.getOwnPropertySymbols;
-var __hasOwnProp$q = Object.prototype.hasOwnProperty;
-var __propIsEnum$q = Object.prototype.propertyIsEnumerable;
+var __getOwnPropSymbols$r = Object.getOwnPropertySymbols;
+var __hasOwnProp$r = Object.prototype.hasOwnProperty;
+var __propIsEnum$r = Object.prototype.propertyIsEnumerable;
 var __defNormalProp$A = (obj, key, value) => key in obj ? __defProp$A(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$p = (a, b) => {
+var __spreadValues$q = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$q.call(b, prop))
+    if (__hasOwnProp$r.call(b, prop))
       __defNormalProp$A(a, prop, b[prop]);
-  if (__getOwnPropSymbols$q)
-    for (var prop of __getOwnPropSymbols$q(b)) {
-      if (__propIsEnum$q.call(b, prop))
+  if (__getOwnPropSymbols$r)
+    for (var prop of __getOwnPropSymbols$r(b)) {
+      if (__propIsEnum$r.call(b, prop))
         __defNormalProp$A(a, prop, b[prop]);
     }
   return a;
 };
 var __spreadProps$b = (a, b) => __defProps$b(a, __getOwnPropDescs$b(b));
+var __async$o = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
 function fetchNgwLayerItem(options) {
-  const params = __spreadValues$p({}, FEATURE_REQUEST_PARAMS);
-  updateItemRequestParam(params, options);
-  const queryParams = __spreadValues$p({
-    id: options.resourceId,
-    fid: options.featureId
-  }, params);
-  const cache = options.cache || true;
-  return options.connector.get("feature_layer.feature.item", { cache }, queryParams).then((resp) => {
-    return __spreadProps$b(__spreadValues$p({}, resp), {
-      toGeojson: () => {
-        if (resp.geom) {
-          return CancelablePromise.resolve(createGeoJsonFeature(resp));
-        } else {
-          return fetchNgwLayerItem(__spreadProps$b(__spreadValues$p({}, options), {
-            geom: true,
-            fields: null,
-            extensions: null
-          })).then((onlyGeomItem) => {
-            const geom = onlyGeomItem.geom;
-            return createGeoJsonFeature(__spreadProps$b(__spreadValues$p({}, resp), { geom }));
-          });
-        }
+  return __async$o(this, null, function* () {
+    const params = __spreadValues$q({}, FEATURE_REQUEST_PARAMS);
+    updateItemRequestParam(params, options);
+    const queryParams = __spreadValues$q({
+      id: options.resourceId,
+      fid: options.featureId
+    }, params);
+    const resp = yield options.connector.get(
+      "feature_layer.feature.item",
+      options,
+      queryParams
+    );
+    const toGeojson = () => __async$o(this, null, function* () {
+      if (resp.geom) {
+        return createGeoJsonFeature(resp);
+      } else {
+        const onlyGeomItem = yield fetchNgwLayerItem(__spreadProps$b(__spreadValues$q({}, options), {
+          geom: true,
+          fields: null,
+          extensions: null
+        }));
+        const geom = onlyGeomItem.geom;
+        return createGeoJsonFeature(__spreadProps$b(__spreadValues$q({}, resp), { geom }));
       }
     });
+    return __spreadProps$b(__spreadValues$q({}, resp), {
+      toGeojson
+    });
   });
 }
 
 var __defProp$z = Object.defineProperty;
+var __getOwnPropSymbols$q = Object.getOwnPropertySymbols;
+var __hasOwnProp$q = Object.prototype.hasOwnProperty;
+var __propIsEnum$q = Object.prototype.propertyIsEnumerable;
 var __defNormalProp$z = (obj, key, value) => key in obj ? __defProp$z(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$p = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp$q.call(b, prop))
+      __defNormalProp$z(a, prop, b[prop]);
+  if (__getOwnPropSymbols$q)
+    for (var prop of __getOwnPropSymbols$q(b)) {
+      if (__propIsEnum$q.call(b, prop))
+        __defNormalProp$z(a, prop, b[prop]);
+    }
+  return a;
+};
 var __publicField$o = (obj, key, value) => __defNormalProp$z(obj, typeof key !== "symbol" ? key + "" : key, value);
 class BookmarkItem {
   constructor(options) {
@@ -2643,11 +2469,11 @@ class BookmarkItem {
       this.name = String(item.id);
     }
   }
-  extent() {
+  extent(opt) {
     if (this._extent) {
-      return CancelablePromise.resolve(this._extent);
+      return Promise.resolve(this._extent);
     }
-    return this.options.connector.get("feature_layer.feature.item_extent", null, {
+    return this.options.connector.get("feature_layer.feature.item_extent", opt, {
       id: this.resourceId,
       fid: this.item.id
     }).then((resp) => {
@@ -2657,18 +2483,18 @@ class BookmarkItem {
       return lonLat;
     });
   }
-  geoJson() {
+  geoJson(opt) {
     if (this.item.geom) {
-      return CancelablePromise.resolve(createGeoJsonFeature(this.item));
+      return Promise.resolve(createGeoJsonFeature(this.item));
     } else {
-      return fetchNgwLayerItem({
+      return fetchNgwLayerItem(__spreadValues$p({
         resourceId: this.resourceId,
         featureId: this.item.id,
         connector: this.options.connector,
         geom: true,
         fields: null,
         extensions: null
-      }).then((onlyGeomItem) => {
+      }, opt)).then((onlyGeomItem) => {
         const geom = onlyGeomItem.geom;
         this.item.geom = geom;
         return createGeoJsonFeature(this.item);
@@ -2678,22 +2504,20 @@ class BookmarkItem {
 }
 
 function treeEvery(item, filter, relation, itemPrepare) {
-  return !!treeWrapper(item, filter, relation, treeEvery_, itemPrepare);
+  return !!treeWrapper(item, filter, relation, treeEvery_);
 }
 function treeSome(item, filter, relation, itemPrepare) {
-  return !!treeWrapper(item, filter, relation, treeFind_, itemPrepare);
+  return !!treeWrapper(item, filter, relation, treeFind_);
 }
 function treeFind(item, filter, relation, itemPrepare) {
-  return treeWrapper(item, filter, relation, treeFind_, itemPrepare);
+  return treeWrapper(item, filter, relation, treeFind_);
 }
 function treeFilter(item, filter, relation, itemPrepare) {
   return treeWrapper(
     item,
     filter,
     relation,
-    treeFilter_,
-    itemPrepare
-  );
+    treeFilter_);
 }
 function getChildren(item, relation = "children") {
   let children = [];
@@ -2710,13 +2534,6 @@ function getChildren(item, relation = "children") {
 }
 function treeWrapper(item, filter = (x) => !!x, relation = "children", treeFunction, itemPrepare) {
   const filterFunction = typeof filter === "function" ? filter : (i) => propertiesFilter(i, filter);
-  if (itemPrepare) {
-    return treeFunction(
-      item,
-      (i) => filterFunction(itemPrepare(i)),
-      relation
-    );
-  }
   return treeFunction(item, filterFunction, relation);
 }
 function treeFind_(item, filterFunc = (x) => !!x, relation, _filtered = []) {
@@ -2983,7 +2800,7 @@ var __spreadValues$o = (a, b) => {
     }
   return a;
 };
-var __publicField$l = (obj, key, value) => __defNormalProp$w(obj, typeof key !== "symbol" ? key + "" : key, value);
+var __publicField$l = (obj, key, value) => __defNormalProp$w(obj, key + "" , value);
 const _CheckProperty = class _CheckProperty extends BaseProperty {
   constructor(name, item, options) {
     super(name, item, __spreadValues$o(__spreadValues$o({}, _CheckProperty.options), options));
@@ -3307,9 +3124,10 @@ function getNgwWebmapExtent(webmap) {
 function fetchNgwLayerExtent({
   resourceId,
   connector,
-  cache = true
+  cache = true,
+  signal
 }) {
-  return connector.get("layer.extent", { cache }, { id: resourceId }).then((resp) => {
+  return connector.get("layer.extent", { cache, signal }, { id: resourceId }).then((resp) => {
     if (resp) {
       const { maxLat, maxLon, minLat, minLon } = resp.extent;
       const extentArray = [minLon, minLat, maxLon, maxLat];
@@ -3321,11 +3139,12 @@ function fetchNgwLayerItemExtent({
   resourceId,
   featureId,
   connector,
-  cache = true
+  cache = true,
+  signal
 }) {
   return connector.get(
     "feature_layer.feature.item_extent",
-    { cache },
+    { cache, signal },
     { id: resourceId, fid: featureId }
   ).then((resp) => {
     if (resp) {
@@ -3336,7 +3155,10 @@ function fetchNgwLayerItemExtent({
   });
 }
 function fetchNgwExtent(options) {
-  return options.connector.getResource(options.resourceId).then((resource) => {
+  return options.connector.getResource(options.resourceId, {
+    signal: options.signal,
+    cache: options.cache
+  }).then((resource) => {
     if (resource) {
       return fetchNgwResourceExtent(resource, options.connector, options);
     }
@@ -3344,11 +3166,11 @@ function fetchNgwExtent(options) {
 }
 function fetchNgwResourceExtent(item, connector, options) {
   if (item.webmap) {
-    return CancelablePromise.resolve(getNgwWebmapExtent(item.webmap));
+    return Promise.resolve(getNgwWebmapExtent(item.webmap));
   } else {
     const resource = item.resource;
     if (resource.cls && resource.cls.indexOf("style") !== -1) {
-      return connector.getResource(resource.parent.id).then((res) => {
+      return connector.getResource(resource.parent.id, options).then((res) => {
         if (res) {
           return fetchNgwLayerExtent(__spreadProps$a(__spreadValues$l({}, options), {
             resourceId: res.resource.id,
@@ -3368,7 +3190,7 @@ function fetchNgwResourceExtent(item, connector, options) {
 var __defProp$s = Object.defineProperty;
 var __defNormalProp$s = (obj, key, value) => key in obj ? __defProp$s(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField$i = (obj, key, value) => __defNormalProp$s(obj, typeof key !== "symbol" ? key + "" : key, value);
-var __async$k = (__this, __arguments, generator) => {
+var __async$n = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
       try {
@@ -3396,12 +3218,12 @@ class NgwResource {
   }
   /** @deprecated use {@link NgwResource.getBounds} instead */
   getExtent() {
-    return __async$k(this, null, function* () {
+    return __async$n(this, null, function* () {
       return this.getBounds();
     });
   }
   getBounds(options) {
-    return __async$k(this, null, function* () {
+    return __async$n(this, null, function* () {
       if (this._extent) {
         return this._extent;
       }
@@ -3417,7 +3239,7 @@ class NgwResource {
   }
 }
 
-var __async$j = (__this, __arguments, generator) => {
+var __async$m = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
       try {
@@ -3438,7 +3260,7 @@ var __async$j = (__this, __arguments, generator) => {
   });
 };
 function resourceIdFromLayerOptions(options, connector) {
-  return __async$j(this, null, function* () {
+  return __async$m(this, null, function* () {
     const resource = options.resource;
     const item = resource;
     let { keyname, resourceId } = options;
@@ -3540,7 +3362,7 @@ var __objRest$1 = (source, exclude) => {
   return target;
 };
 var __publicField$h = (obj, key, value) => __defNormalProp$r(obj, typeof key !== "symbol" ? key + "" : key, value);
-var __async$i = (__this, __arguments, generator) => {
+var __async$l = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
       try {
@@ -3592,7 +3414,7 @@ function createQmsAdapter(webMapOrOptions, url = URL, createOpt = {}) {
       }
     }
     addLayer(options) {
-      return __async$i(this, null, function* () {
+      return __async$l(this, null, function* () {
         if (!this.qms && options.qmsId) {
           try {
             this.qms = yield loadJson(
@@ -3700,7 +3522,7 @@ var __spreadValues$i = (a, b) => {
 };
 var __spreadProps$9 = (a, b) => __defProps$9(a, __getOwnPropDescs$9(b));
 var __superGet$2 = (cls, obj, key) => __reflectGet$2(__getProtoOf$2(cls), key, obj);
-var __async$h = (__this, __arguments, generator) => {
+var __async$k = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
       try {
@@ -3721,7 +3543,7 @@ var __async$h = (__this, __arguments, generator) => {
   });
 };
 function createBasemapLayerAdapter(_0) {
-  return __async$h(this, arguments, function* ({
+  return __async$k(this, arguments, function* ({
     webMap,
     item
   }) {
@@ -3742,7 +3564,7 @@ function createBasemapLayerAdapter(_0) {
         if (TileAdapter) {
           class BasemapTileAdapter extends TileAdapter {
             addLayer(opt) {
-              return __async$h(this, null, function* () {
+              return __async$k(this, null, function* () {
                 return __superGet$2(BasemapTileAdapter.prototype, this, "addLayer").call(this, __spreadProps$9(__spreadValues$i({}, opt), { url }));
               });
             }
@@ -3782,11 +3604,12 @@ function createPopupContent(feature, item) {
 function fetchNgwLayerCount({
   connector,
   resourceId,
-  cache = true
+  cache = true,
+  signal
 }) {
   return connector.get(
     "feature_layer.feature.count",
-    { cache },
+    { cache, signal },
     {
       id: resourceId
     }
@@ -3840,13 +3663,34 @@ var __spreadValues$h = (a, b) => {
   return a;
 };
 var __spreadProps$8 = (a, b) => __defProps$8(a, __getOwnPropDescs$8(b));
+var __async$j = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
 function fetchNgwLayerItems(options) {
-  const filters = options.filters;
-  if (filters) {
-    return createFeatureFieldFilterQueries(__spreadProps$8(__spreadValues$h({}, options), {
-      filters
-    })).then((data) => {
-      var _a;
+  return __async$j(this, null, function* () {
+    var _a;
+    const filters = options.filters;
+    if (filters) {
+      let data = yield createFeatureFieldFilterQueries(__spreadProps$8(__spreadValues$h({}, options), {
+        filters
+      }));
       const clientFilterValidate = (_a = options.clientFilterValidate) != null ? _a : isFilterWithAnyCase(filters);
       if (clientFilterValidate) {
         data = data.filter((y) => {
@@ -3858,10 +3702,10 @@ function fetchNgwLayerItems(options) {
         });
       }
       return data;
-    });
-  } else {
-    return fetchNgwLayerItemsRequest(options);
-  }
+    } else {
+      return fetchNgwLayerItemsRequest(options);
+    }
+  });
 }
 function isFilterWithAnyCase(filters) {
   if (filters[0] === "any") {
@@ -3879,8 +3723,29 @@ function isFilterWithAnyCase(filters) {
   return false;
 }
 
+var __async$i = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
 function fetchNgwLayerFeatures(options) {
-  return fetchNgwLayerItems(options).then((x) => {
+  return __async$i(this, null, function* () {
+    const x = yield fetchNgwLayerItems(options);
     const features = [];
     x.forEach((y) => {
       features.push(createGeoJsonFeature(y));
@@ -3940,7 +3805,7 @@ var __spreadValues$g = (a, b) => {
 var __spreadProps$7 = (a, b) => __defProps$7(a, __getOwnPropDescs$7(b));
 var __publicField$f = (obj, key, value) => __defNormalProp$n(obj, typeof key !== "symbol" ? key + "" : key, value);
 var __superGet$1 = (cls, obj, key) => __reflectGet$1(__getProtoOf$1(cls), key, obj);
-var __async$g = (__this, __arguments, generator) => {
+var __async$h = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
       try {
@@ -3961,7 +3826,7 @@ var __async$g = (__this, __arguments, generator) => {
   });
 };
 function createGeoJsonAdapter(props) {
-  return __async$g(this, null, function* () {
+  return __async$h(this, null, function* () {
     var _a, _b;
     const {
       item,
@@ -3977,29 +3842,35 @@ function createGeoJsonAdapter(props) {
     const _loadedIds = [];
     let _fullDataLoad = false;
     let _lastFilterArgs;
-    let _dataPromise;
+    let internalAbortController;
     const resourceId = yield resourceIdFromLayerOptions(options, connector);
     if ((_b = (_a = options.adapterOptions) == null ? void 0 : _a.popupOptions) == null ? void 0 : _b.fromProperties) {
       options.adapterOptions.popupOptions.createPopupContent = ({ feature }) => {
         return feature && createPopupContent(feature, item);
       };
     }
-    const getData = (filters, filterOpt) => __async$g(this, null, function* () {
+    const getData = (filters, filterOpt) => __async$h(this, null, function* () {
       abort();
+      internalAbortController = new AbortController();
+      const internalSignal = internalAbortController.signal;
+      if (filterOpt == null ? void 0 : filterOpt.signal) {
+        filterOpt.signal.addEventListener("abort", internalAbortController.abort);
+      }
+      filterOpt = filterOpt || {};
+      filterOpt.signal = internalSignal;
       _lastFilterArgs = { filters, options: filterOpt };
-      _dataPromise = fetchNgwLayerFeatureCollection(__spreadValues$g({
+      return fetchNgwLayerFeatureCollection(__spreadValues$g({
         resourceId,
         filters,
         connector,
         cache: true
       }, filterOpt));
-      return yield _dataPromise;
     });
     let removed = false;
     const abort = () => {
-      if (_dataPromise) {
-        _dataPromise.cancel();
-        _dataPromise = void 0;
+      if (internalAbortController) {
+        internalAbortController.abort();
+        internalAbortController = void 0;
       }
     };
     class NgwGeoJsonAdapter extends GeoJsonAdapter {
@@ -4012,7 +3883,7 @@ function createGeoJsonAdapter(props) {
         __publicField$f(this, "__disableMapMoveListener");
       }
       addLayer(opt) {
-        return __async$g(this, null, function* () {
+        return __async$h(this, null, function* () {
           let needUpdate = !opt.data;
           const waitFullLoad = opt.waitFullLoad !== void 0 ? opt.waitFullLoad : true;
           if (options.id !== void 0) {
@@ -4057,7 +3928,7 @@ function createGeoJsonAdapter(props) {
         return this.getBounds();
       }
       getBounds() {
-        return __async$g(this, null, function* () {
+        return __async$h(this, null, function* () {
           const hasData = this.getLayers && this.getLayers().length;
           const strategy = this.options.strategy;
           if ((strategy == null ? void 0 : strategy.startsWith("BBOX")) || hasData) {
@@ -4083,7 +3954,7 @@ function createGeoJsonAdapter(props) {
         return fetchNgwLayerCount({ connector, resourceId, cache: true });
       }
       updateLayer(filterArgs) {
-        return __async$g(this, null, function* () {
+        return __async$h(this, null, function* () {
           var _a2;
           filterArgs = filterArgs || _lastFilterArgs || {};
           if ((_a2 = this.options.strategy) == null ? void 0 : _a2.startsWith("BBOX")) {
@@ -4149,7 +4020,7 @@ function createGeoJsonAdapter(props) {
         });
       }
       propertiesFilter(filters, opt) {
-        return __async$g(this, null, function* () {
+        return __async$h(this, null, function* () {
           abort();
           if (this.filter && _fullDataLoad) {
             this.filter((e) => {
@@ -4223,7 +4094,7 @@ function createGeoJsonAdapter(props) {
   });
 }
 
-var __async$f = (__this, __arguments, generator) => {
+var __async$g = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
       try {
@@ -4244,7 +4115,7 @@ var __async$f = (__this, __arguments, generator) => {
   });
 };
 function createWebMapAdapter(_0) {
-  return __async$f(this, arguments, function* ({
+  return __async$g(this, arguments, function* ({
     layerOptions: options,
     webMap,
     connector
@@ -4372,7 +4243,7 @@ var __spreadValues$f = (a, b) => {
 };
 var __spreadProps$6 = (a, b) => __defProps$6(a, __getOwnPropDescs$6(b));
 var __publicField$e = (obj, key, value) => __defNormalProp$m(obj, typeof key !== "symbol" ? key + "" : key, value);
-var __async$e = (__this, __arguments, generator) => {
+var __async$f = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
       try {
@@ -4393,7 +4264,7 @@ var __async$e = (__this, __arguments, generator) => {
   });
 };
 function createRasterAdapter(_0) {
-  return __async$e(this, arguments, function* ({
+  return __async$f(this, arguments, function* ({
     layerOptions,
     webMap,
     connector,
@@ -4449,7 +4320,7 @@ function createRasterAdapter(_0) {
           return super.addLayer(__spreadValues$f(__spreadValues$f({}, this.options), addOptions));
         }
         getLegend(options) {
-          return __async$e(this, null, function* () {
+          return __async$f(this, null, function* () {
             const ngwLegend = yield connector.get("render.legend_symbols", __spreadValues$f({
               params: { id: resourceId },
               cache: true
@@ -4469,7 +4340,7 @@ function createRasterAdapter(_0) {
           });
         }
         getIdentificationIds() {
-          return __async$e(this, null, function* () {
+          return __async$f(this, null, function* () {
             if (this.item) {
               if (adapter === "MVT") {
                 return [this.item.resource.id];
@@ -4510,7 +4381,7 @@ var __spreadValues$e = (a, b) => {
   return a;
 };
 var __spreadProps$5 = (a, b) => __defProps$5(a, __getOwnPropDescs$5(b));
-var __async$d = (__this, __arguments, generator) => {
+var __async$e = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
       try {
@@ -4546,7 +4417,7 @@ const supportCls = [
   "tmsclient_layer"
 ];
 function createAdapterFromFirstStyle(_0) {
-  return __async$d(this, arguments, function* ({
+  return __async$e(this, arguments, function* ({
     layerOptions,
     webMap,
     connector,
@@ -4565,7 +4436,7 @@ function createAdapterFromFirstStyle(_0) {
   });
 }
 function createAsyncAdapter(options, webMap, connector) {
-  return __async$d(this, null, function* () {
+  return __async$e(this, null, function* () {
     let adapter;
     let item;
     const adapterType = options.adapter;
@@ -4762,7 +4633,7 @@ var __spreadValues$c = (a, b) => {
   return a;
 };
 var __publicField$d = (obj, key, value) => __defNormalProp$j(obj, typeof key !== "symbol" ? key + "" : key, value);
-var __async$c = (__this, __arguments, generator) => {
+var __async$d = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
       try {
@@ -4812,7 +4683,7 @@ const _NgwWebmapItem = class _NgwWebmapItem extends Item {
     }
   }
   static create(webMap, item, options, connector, parent) {
-    return __async$c(this, null, function* () {
+    return __async$d(this, null, function* () {
       const ngwWebmapItem = new _NgwWebmapItem(
         webMap,
         item,
@@ -4841,15 +4712,14 @@ const _NgwWebmapItem = class _NgwWebmapItem extends Item {
     return this.layer;
   }
   getLegend(options) {
-    return __async$c(this, null, function* () {
+    return __async$d(this, null, function* () {
       var _a;
       const id = (_a = this.layer) == null ? void 0 : _a.id;
       if (id !== void 0) {
         const connector = this.connector;
         if (connector) {
           const ngwLegend = yield connector.get("render.legend_symbols", __spreadValues$c({
-            params: { id: this.item.resourceId },
-            cache: true
+            params: { id: this.item.resourceId }
           }, options));
           const legend = {
             layerId: id,
@@ -5040,7 +4910,7 @@ var __spreadValues$b = (a, b) => {
   return a;
 };
 var __publicField$c = (obj, key, value) => __defNormalProp$i(obj, typeof key !== "symbol" ? key + "" : key, value);
-var __async$b = (__this, __arguments, generator) => {
+var __async$c = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
       try {
@@ -5061,7 +4931,7 @@ var __async$b = (__this, __arguments, generator) => {
   });
 };
 function createOnFirstShowAdapter(_0) {
-  return __async$b(this, arguments, function* ({
+  return __async$c(this, arguments, function* ({
     webMap,
     adapterOptions = {},
     onLayerAdded,
@@ -5087,7 +4957,7 @@ function createOnFirstShowAdapter(_0) {
         return this._removed;
       }
       showLayer() {
-        return __async$b(this, null, function* () {
+        return __async$c(this, null, function* () {
           this.options.visibility = true;
           if (this.layer.length) {
             for (const x of this.layer) {
@@ -5099,7 +4969,7 @@ function createOnFirstShowAdapter(_0) {
         });
       }
       hideLayer() {
-        return __async$b(this, null, function* () {
+        return __async$c(this, null, function* () {
           this.options.visibility = false;
           if (this.layer) {
             for (const x of this.layer) {
@@ -5109,7 +4979,7 @@ function createOnFirstShowAdapter(_0) {
         });
       }
       loadLayer() {
-        return __async$b(this, null, function* () {
+        return __async$c(this, null, function* () {
           if (!this.layer.length && !this._creatingInProgress) {
             this._creatingInProgress = true;
             const Adapter = yield createAdapter(this);
@@ -5143,7 +5013,7 @@ function createOnFirstShowAdapter(_0) {
   });
 }
 
-var __async$a = (__this, __arguments, generator) => {
+var __async$b = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
       try {
@@ -5164,7 +5034,7 @@ var __async$a = (__this, __arguments, generator) => {
   });
 };
 function createOnFirstShowNgwAdapter(_0) {
-  return __async$a(this, arguments, function* ({
+  return __async$b(this, arguments, function* ({
     webMap,
     connector,
     item,
@@ -5217,7 +5087,7 @@ var __spreadValues$a = (a, b) => {
   return a;
 };
 var __publicField$b = (obj, key, value) => __defNormalProp$h(obj, typeof key !== "symbol" ? key + "" : key, value);
-var __async$9 = (__this, __arguments, generator) => {
+var __async$a = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
       try {
@@ -5268,7 +5138,7 @@ class NgwWebmapLayerAdapter {
     }
   }
   addLayer(options) {
-    return __async$9(this, null, function* () {
+    return __async$a(this, null, function* () {
       var _a, _b;
       this.options = __spreadValues$a(__spreadValues$a({}, this.options), options);
       this.layer = yield this._getWebMapLayerItem();
@@ -5301,21 +5171,21 @@ class NgwWebmapLayerAdapter {
     delete this._webmapLayersIds;
   }
   showLayer() {
-    return __async$9(this, null, function* () {
+    return __async$a(this, null, function* () {
       if (this.layer && this.layer.properties) {
         return this.layer.properties.property("visibility").set(true);
       }
     });
   }
   hideLayer() {
-    return __async$9(this, null, function* () {
+    return __async$a(this, null, function* () {
       if (this.layer && this.layer.properties) {
         return this.layer.properties.property("visibility").set(false);
       }
     });
   }
   setOpacity(val) {
-    return __async$9(this, null, function* () {
+    return __async$a(this, null, function* () {
       if (this.layer && this.layer.properties) {
         return this.layer.properties.property("opacity").set(val);
       }
@@ -5340,22 +5210,22 @@ class NgwWebmapLayerAdapter {
       return webmap.bookmark_resource.id;
     }
   }
-  fetchBookmarks() {
+  fetchBookmarks(options) {
     const bookmarkResId = this.getBookmarksResourceId();
     const connector = this.options.connector;
     if (bookmarkResId) {
-      return connector.getResourceOrFail(bookmarkResId).then((item) => {
+      return connector.getResourceOrFail(bookmarkResId, options).then((item) => {
         var _a;
         const labelField = (_a = item.feature_layer) == null ? void 0 : _a.fields.find(
           (x) => x.label_field
         );
         const keyname = labelField && labelField.keyname;
-        return fetchNgwLayerItems({
+        return fetchNgwLayerItems(__spreadValues$a({
           connector,
           resourceId: bookmarkResId,
           geom: false,
           fields: keyname ? [keyname] : void 0
-        }).then((items) => {
+        }, options)).then((items) => {
           const bookmarks = [];
           for (const i of items) {
             const bookmark = new BookmarkItem({
@@ -5374,24 +5244,24 @@ class NgwWebmapLayerAdapter {
       "Webmap was not loaded correctly, it is impossible to extract bookmarks"
     );
   }
-  getLegend() {
-    return __async$9(this, null, function* () {
+  getLegend(options) {
+    return __async$a(this, null, function* () {
       const legends = [];
       let deps = this.getDependLayers();
       deps = deps.sort((a, b) => b.id - a.id);
       for (const d of deps) {
-        const layerLegend = yield d.getLegend();
+        const layerLegend = yield d.getLegend(options);
         legends.push(...layerLegend);
       }
       return legends;
     });
   }
-  getIdentificationIds() {
-    return __async$9(this, null, function* () {
+  getIdentificationIds(options) {
+    return __async$a(this, null, function* () {
       const visibleLayers = [];
       let ids = this._webmapLayersIds;
       if (!ids) {
-        ids = yield this._getWebMapIds();
+        ids = yield this._getWebMapIds(options);
         this._webmapLayersIds = ids;
       }
       if (ids && ids.length) {
@@ -5413,7 +5283,7 @@ class NgwWebmapLayerAdapter {
     });
   }
   _getWebMapLayerItem() {
-    return __async$9(this, null, function* () {
+    return __async$a(this, null, function* () {
       if (this.resourceId) {
         const webmap = yield this.getWebMapConfig(this.resourceId);
         if (webmap && webmap.root_item) {
@@ -5446,7 +5316,7 @@ class NgwWebmapLayerAdapter {
     });
   }
   getWebMapConfig(id) {
-    return __async$9(this, null, function* () {
+    return __async$a(this, null, function* () {
       const data = yield this.options.connector.getResource(id);
       if (data) {
         this.response = data;
@@ -5540,8 +5410,8 @@ class NgwWebmapLayerAdapter {
     }
     return item;
   }
-  _getWebMapIds() {
-    return __async$9(this, null, function* () {
+  _getWebMapIds(options) {
+    return __async$a(this, null, function* () {
       const webMapItem = this.layer;
       if (webMapItem && webMapItem.item.item_type === "root") {
         const layers = webMapItem.tree.getDescendants();
@@ -5550,7 +5420,7 @@ class NgwWebmapLayerAdapter {
           const item = x.item;
           if (item.item_type === "layer") {
             const id = item.layer_style_id;
-            const promise = this.options.connector.getResource(id).then((y) => {
+            const promise = this.options.connector.getResource(id, options).then((y) => {
               if (y) {
                 const parentId = Number(y.resource.parent.id);
                 item.parentId = parentId;
@@ -5584,7 +5454,7 @@ var __spreadValues$9 = (a, b) => {
   return a;
 };
 var __publicField$a = (obj, key, value) => __defNormalProp$g(obj, typeof key !== "symbol" ? key + "" : key, value);
-var __async$8 = (__this, __arguments, generator) => {
+var __async$9 = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
       try {
@@ -5629,7 +5499,7 @@ class NgwKit {
     classAdapters[cls] = adapter;
   }
   onLoadSync(webMap) {
-    return __async$8(this, null, function* () {
+    return __async$9(this, null, function* () {
       if (this.options.resourceId && this.url) {
         const resourceIds = [this.options.resourceId];
         if (resourceIds.length) {
@@ -5712,7 +5582,7 @@ class IdentifyItem {
   }
   identify(options = {}) {
     if (this._item) {
-      return CancelablePromise.resolve(this._item);
+      return Promise.resolve(this._item);
     }
     return fetchNgwLayerItem(__spreadValues$8({
       connector: this.connector,
@@ -5727,30 +5597,30 @@ class IdentifyItem {
       return resp;
     });
   }
-  resource() {
+  resource(opt) {
     if (this._resource) {
-      return CancelablePromise.resolve(this._resource.feature_layer);
+      return Promise.resolve(this._resource.feature_layer);
     }
-    return this.connector.getResource(this.layerId).then((resp) => {
+    return this.connector.getResource(this.layerId, opt).then((resp) => {
       this._resource = resp;
       return this._resource.feature_layer;
     });
   }
-  getBounds() {
+  getBounds(opt) {
     if (this._extent) {
-      return CancelablePromise.resolve(this._extent);
+      return Promise.resolve(this._extent);
     }
-    return fetchNgwLayerItemExtent({
+    return fetchNgwLayerItemExtent(__spreadValues$8({
       connector: this.connector,
       featureId: this.id,
       resourceId: this.layerId
-    });
+    }, opt));
   }
-  geojson() {
+  geojson(options) {
     if (this._geojson) {
-      return CancelablePromise.resolve(this._geojson);
+      return Promise.resolve(this._geojson);
     }
-    return this.identify().then((resp) => {
+    return this.identify(options).then((resp) => {
       return resp.toGeojson().then((geojson) => {
         this._geojson = geojson;
         return geojson;
@@ -5759,8 +5629,29 @@ class IdentifyItem {
   }
 }
 
+var __async$8 = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
 function fetchNgwLayerFeature(options) {
-  return fetchNgwLayerItem(options).then((item) => {
+  return __async$8(this, null, function* () {
+    const item = yield fetchNgwLayerItem(options);
     return createGeoJsonFeature(item);
   });
 }
@@ -5845,7 +5736,7 @@ function fetchIdentifyGeoJson(options) {
         const withGeom = item.features.find((x) => x.geom);
         if (withGeom && withGeom.geom) {
           const geom = withGeom.geom;
-          return CancelablePromise.resolve(
+          return Promise.resolve(
             createGeoJsonFeature(__spreadProps$4(__spreadValues$7({}, withGeom), {
               geom
             }))
@@ -5858,7 +5749,7 @@ function fetchIdentifyGeoJson(options) {
   if (params && params.length) {
     return fetchNgwLayerFeature(__spreadValues$7(__spreadProps$4(__spreadValues$7({}, requestOptions), { connector }), params[0]));
   }
-  return CancelablePromise.resolve(void 0);
+  return Promise.resolve(void 0);
 }
 function fetchIdentifyItem(options) {
   const { connector, identify } = options;
@@ -5868,7 +5759,7 @@ function fetchIdentifyItem(options) {
       connector
     }, options.requestOptions), params[0]));
   }
-  return CancelablePromise.resolve(void 0);
+  return Promise.resolve(void 0);
 }
 function featureLayerIdentify(options) {
   const { geom, signal, cache, layers } = options;
@@ -5912,9 +5803,9 @@ function getPolygonCoordinates(geom) {
 function sendIdentifyRequest(ev, options) {
   deprecatedMapClick(ev);
   const [lng, lat] = ev.lngLat;
-  const { geom, radius, signal, cache } = options;
+  const { geom, radius } = options;
   const geom_ = geom != null ? geom : getCirclePolygonCoordinates(lng, lat, radius);
-  return featureLayerIdentify(__spreadProps$4(__spreadValues$7({}, options), { geom: geom_, signal, cache }));
+  return featureLayerIdentify(__spreadProps$4(__spreadValues$7({}, options), { geom: geom_ }));
 }
 function createIdentifyItem(opt) {
   return new IdentifyItem(opt);
@@ -7124,7 +7015,7 @@ const _WebMapMain = class _WebMapMain {
     __publicField$3(this, "_mapState", []);
     __publicField$3(this, "_extent");
     __publicField$3(this, "_eventsStatus", {});
-    __publicField$3(this, "_coordFromMapClickPromise");
+    __publicField$3(this, "_coordFromMapClickAbort");
     __publicField$3(this, "_mapEvents", {});
     this.mapAdapter = mapOptions.mapAdapter;
     this._starterKits = mapOptions.starterKits || [];
@@ -7439,36 +7330,34 @@ const _WebMapMain = class _WebMapMain {
     return { stop };
   }
   stopGetCoordFromMapClick() {
-    if (this._coordFromMapClickPromise) {
-      this._coordFromMapClickPromise.cancel();
+    if (this._coordFromMapClickAbort) {
+      this._coordFromMapClickAbort();
+      this._coordFromMapClickAbort = void 0;
     }
   }
   getCoordFromMapClick() {
-    if (!this._coordFromMapClickPromise) {
-      this._coordFromMapClickPromise = new CancelablePromise(
-        (resolve, reject, onCancel) => {
-          const cursor = this.getCursor() || "grab";
-          this._removeEventListeners({ include: ["click"] });
-          this.setCursor("crosshair");
-          const onCancel_ = () => {
-            this.setCursor(cursor);
-            this._addEventsListeners({ include: ["click"] });
-            this.mapAdapter.emitter.off("click", onMapClick);
-            this._coordFromMapClickPromise = void 0;
-          };
-          const onMapClick = (e) => {
-            onCancel_();
-            deprecatedMapClick(e);
-            resolve(e.lngLat);
-          };
-          this.mapAdapter.emitter.once("click", onMapClick);
-          onCancel(onCancel_);
-        }
-      );
+    if (!this._coordFromMapClickAbort) {
+      return new Promise((resolve, reject) => {
+        const cursor = this.getCursor() || "grab";
+        this._removeEventListeners({ include: ["click"] });
+        this.setCursor("crosshair");
+        const onCancel_ = () => {
+          this.setCursor(cursor);
+          this._addEventsListeners({ include: ["click"] });
+          this.mapAdapter.emitter.off("click", onMapClick);
+          this._coordFromMapClickAbort = void 0;
+        };
+        const onMapClick = (e) => {
+          onCancel_();
+          deprecatedMapClick(e);
+          resolve(e.lngLat);
+        };
+        this.mapAdapter.emitter.once("click", onMapClick);
+        this._coordFromMapClickAbort = onCancel_;
+      });
     } else {
       return this.getCoordFromMapClick();
     }
-    return this._coordFromMapClickPromise;
   }
   _emitStatusEvent(eventName, data) {
     const _eventName = eventName;
@@ -9283,26 +9172,35 @@ const _NgwMap = class _NgwMap extends WebMap {
     }, options));
   }
   fetchIdentifyItem(identify, requestOptions) {
+    const abortController = new AbortController();
+    const abortSignal = abortController.signal;
+    if (requestOptions == null ? void 0 : requestOptions.signal) {
+      requestOptions.signal.addEventListener("abort", abortController.abort);
+    }
+    requestOptions = requestOptions || {};
+    requestOptions.signal = abortSignal;
     const promise = fetchIdentifyItem({
       identify,
       connector: this.connector,
       requestOptions
       // multiple,
     });
-    this._addPromise("identify", promise);
+    this._addPromise("identify", promise, abortController);
     return promise;
   }
   fetchIdentifyGeoJson(identify, multiple = false) {
+    const abortController = new AbortController();
     const promise = fetchIdentifyGeoJson({
       identify,
       connector: this.connector,
-      multiple
+      multiple,
+      requestOptions: { signal: abortController.signal }
     });
     if (promise && "then" in promise) {
-      this._addPromise("identify", promise);
+      this._addPromise("identify", promise, abortController);
       return promise;
     } else {
-      return CancelablePromise.resolve(promise);
+      return Promise.resolve(promise);
     }
   }
   /**
@@ -9476,7 +9374,7 @@ const _NgwMap = class _NgwMap extends WebMap {
     args.forEach((name) => {
       const group = this._promises[name];
       if (group) {
-        group.forEach((x) => x.cancel());
+        group.forEach((x) => x[1].abort());
         this._promises[name] = [];
       }
     });
@@ -9543,11 +9441,13 @@ const _NgwMap = class _NgwMap extends WebMap {
           }, highlightDuration);
         }
       }
+      const abortController = new AbortController();
       const selectPromise = sendIdentifyRequest(ev, {
         layers: ids,
         connector: this.connector,
         radius,
-        geom
+        geom,
+        signal: abortController.signal
       }).then((resp) => {
         const identify = __spreadProps(__spreadValues({}, resp), {
           resources: ids,
@@ -9558,22 +9458,22 @@ const _NgwMap = class _NgwMap extends WebMap {
         this._emitStatusEvent("ngw:select", identifyEvent);
         return identifyEvent;
       });
-      this._addPromise("select", selectPromise);
+      this._addPromise("select", selectPromise, abortController);
       return selectPromise;
     });
   }
-  _addPromise(groupName, promise) {
+  _addPromise(groupName, promise, abortController) {
     const group = this._promises[groupName];
-    if (group && group.indexOf(promise) === -1) {
+    if (group && group.findIndex((g) => g[0] === promise) === -1) {
       const removeFromGroup = () => {
-        const index = group.indexOf(promise);
+        const index = group.findIndex((g) => g[0] === promise);
         if (index !== -1) {
           group.splice(index, 1);
         }
       };
       promise.then(removeFromGroup);
       promise.catch(removeFromGroup);
-      group.push(promise);
+      group.push([promise, abortController]);
     }
   }
   _isFitFromResource() {