@nextgis/geocoder 2.4.0 → 3.0.0-alpha.0

package/lib/geocoder.global.js

@@ -1,309 +1,7 @@
-/** Bundle of @nextgis/geocoder; version: 2.4.0; author: NextGIS */
+/** Bundle of @nextgis/geocoder; version: 3.0.0-alpha.0; author: NextGIS */
 var Geocoder = (function (exports) {
   'use strict';
 
-  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$e = (obj, key, value) => __defNormalProp$g(obj, typeof key !== "symbol" ? key + "" : key, value);
-  class CancelError extends Error {
-    constructor() {
-      super();
-      __publicField$e(this, "name", "CancelError");
-      Object.setPrototypeOf(this, CancelError.prototype);
-    }
-  }
-
-  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$d = (obj, key, value) => __defNormalProp$f(obj, typeof key !== "symbol" ? key + "" : key, value);
-  class PromiseControl {
-    constructor(options = {}) {
-      this.options = options;
-      __publicField$d(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$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$c = (obj, key, value) => __defNormalProp$e(obj, typeof key !== "symbol" ? key + "" : key, value);
-  class TimeoutError extends Error {
-    constructor() {
-      super();
-      __publicField$c(this, "name", "TimeoutError");
-      Object.setPrototypeOf(this, TimeoutError.prototype);
-    }
-  }
-
-  var __defProp$d = Object.defineProperty;
-  var __defNormalProp$d = (obj, key, value) => key in obj ? __defProp$d(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __publicField$b = (obj, key, value) => __defNormalProp$d(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$2 = 0;
-  _a = Symbol.toStringTag;
-  const _CancelablePromise = class _CancelablePromise {
-    constructor(executor, timeout) {
-      // @ts-ignore
-      __publicField$b(this, _a);
-      __publicField$b(this, "id", ID$2++);
-      __publicField$b(this, "_isCanceled", false);
-      __publicField$b(this, "_isPending", true);
-      __publicField$b(this, "_promise");
-      __publicField$b(this, "_cancelPromise");
-      __publicField$b(this, "_cancelHandlers", []);
-      __publicField$b(this, "_setCanceledCallback");
-      __publicField$b(this, "_parentPromise");
-      __publicField$b(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$b(_CancelablePromise, "CancelError", CancelError);
-  __publicField$b(_CancelablePromise, "TimeoutError", TimeoutError);
-  __publicField$b(_CancelablePromise, "PromiseControl", PromiseControl);
-  let CancelablePromise = _CancelablePromise;
-  Object.setPrototypeOf(CancelablePromise.prototype, Promise.prototype);
-
   function defined(val) {
     return val !== void 0 && val !== null;
   }
@@ -386,7 +84,7 @@ var Geocoder = (function (exports) {
   }
 
   function round(val, toFixed) {
-    const n = toFixed ? Number("1e+" + toFixed) : 1;
+    const n = 1;
     return Math.round((val + Number.EPSILON) * n) / n;
   }
 
@@ -409,28 +107,28 @@ var Geocoder = (function (exports) {
     }
   }
 
-  var __defProp$c = Object.defineProperty;
+  var __defProp$d = Object.defineProperty;
   var __defProps$3 = Object.defineProperties;
   var __getOwnPropDescs$3 = Object.getOwnPropertyDescriptors;
-  var __getOwnPropSymbols$5 = Object.getOwnPropertySymbols;
-  var __hasOwnProp$5 = Object.prototype.hasOwnProperty;
-  var __propIsEnum$5 = Object.prototype.propertyIsEnumerable;
+  var __getOwnPropSymbols$6 = Object.getOwnPropertySymbols;
+  var __hasOwnProp$6 = Object.prototype.hasOwnProperty;
+  var __propIsEnum$6 = Object.prototype.propertyIsEnumerable;
   var __knownSymbol$2 = (name, symbol) => (symbol = Symbol[name]) ? symbol : Symbol.for("Symbol." + name);
-  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$5 = (a, b) => {
+  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$6 = (a, b) => {
     for (var prop in b || (b = {}))
-      if (__hasOwnProp$5.call(b, prop))
-        __defNormalProp$c(a, prop, b[prop]);
-    if (__getOwnPropSymbols$5)
-      for (var prop of __getOwnPropSymbols$5(b)) {
-        if (__propIsEnum$5.call(b, prop))
-          __defNormalProp$c(a, prop, b[prop]);
+      if (__hasOwnProp$6.call(b, prop))
+        __defNormalProp$d(a, prop, b[prop]);
+    if (__getOwnPropSymbols$6)
+      for (var prop of __getOwnPropSymbols$6(b)) {
+        if (__propIsEnum$6.call(b, prop))
+          __defNormalProp$d(a, prop, b[prop]);
       }
     return a;
   };
   var __spreadProps$3 = (a, b) => __defProps$3(a, __getOwnPropDescs$3(b));
-  var __publicField$a = (obj, key, value) => __defNormalProp$c(obj, typeof key !== "symbol" ? key + "" : key, value);
-  var __async$1 = (__this, __arguments, generator) => {
+  var __publicField$a = (obj, key, value) => __defNormalProp$d(obj, key + "" , value);
+  var __async$5 = (__this, __arguments, generator) => {
     return new Promise((resolve, reject) => {
       var fulfilled = (value) => {
         try {
@@ -494,7 +192,7 @@ var Geocoder = (function (exports) {
               for (var iter = __forAwait(results), more, temp, error; more = !(temp = yield new __await$2(iter.next())).done; more = false) {
                 const r = temp.value;
                 allProvidersFailed = false;
-                yield __spreadProps$3(__spreadValues$5({}, r), { provider, _id: ID$1++ });
+                yield __spreadProps$3(__spreadValues$6({}, r), { provider, _id: ID$1++ });
               }
             } catch (temp) {
               error = [temp];
@@ -524,7 +222,7 @@ var Geocoder = (function (exports) {
       if (item.provider) {
         return item.provider.result(item);
       }
-      return CancelablePromise.resolve(void 0);
+      return Promise.resolve(void 0);
     }
     reverse(coordinates) {
       return __asyncGenerator$2(this, null, function* () {
@@ -537,7 +235,7 @@ var Geocoder = (function (exports) {
             try {
               for (var iter = __forAwait(results), more, temp, error; more = !(temp = yield new __await$2(iter.next())).done; more = false) {
                 const r = temp.value;
-                yield __spreadProps$3(__spreadValues$5({}, r), { provider, _id: ID$1++ });
+                yield __spreadProps$3(__spreadValues$6({}, r), { provider, _id: ID$1++ });
               }
             } catch (temp) {
               error = [temp];
@@ -561,7 +259,7 @@ var Geocoder = (function (exports) {
      * @returns A promise that resolves to the first reverse geocoding result, or undefined if no results are found.
      */
     reverseGeocodeFirstResult(coordinates) {
-      return __async$1(this, null, function* () {
+      return __async$5(this, null, function* () {
         for (const provider of this.providers) {
           if (typeof provider.reverse === "function") {
             try {
@@ -590,9 +288,9 @@ var Geocoder = (function (exports) {
     }
   }
 
-  var __defProp$b = Object.defineProperty;
-  var __defNormalProp$b = (obj, key, value) => key in obj ? __defProp$b(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __publicField$9 = (obj, key, value) => __defNormalProp$b(obj, typeof key !== "symbol" ? key + "" : key, value);
+  var __defProp$c = Object.defineProperty;
+  var __defNormalProp$c = (obj, key, value) => key in obj ? __defProp$c(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+  var __publicField$9 = (obj, key, value) => __defNormalProp$c(obj, typeof key !== "symbol" ? key + "" : key, value);
   class BaseProvider extends BaseGeocoder {
     constructor() {
       super(...arguments);
@@ -1081,9 +779,9 @@ var Geocoder = (function (exports) {
     return ret;
   }
 
-  var __defProp$a = Object.defineProperty;
-  var __defNormalProp$a = (obj, key, value) => key in obj ? __defProp$a(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __publicField$8 = (obj, key, value) => __defNormalProp$a(obj, typeof key !== "symbol" ? key + "" : key, value);
+  var __defProp$b = Object.defineProperty;
+  var __defNormalProp$b = (obj, key, value) => key in obj ? __defProp$b(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+  var __publicField$8 = (obj, key, value) => __defNormalProp$b(obj, typeof key !== "symbol" ? key + "" : key, value);
   const _Cache = class _Cache {
     constructor(options = {}) {
       __publicField$8(this, "cache", []);
@@ -1119,8 +817,7 @@ var Geocoder = (function (exports) {
      * // somewhere else in the code
      * const item = await cache.addFull('foo', getItemFunc).then((resp) => {
      *   console.log(resp); // 'New item'
-     * })
-     *
+     * });
      * ```
      */
     addFull(key, valueToSet, props) {
@@ -1135,13 +832,11 @@ var Geocoder = (function (exports) {
         } 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;
@@ -1150,7 +845,6 @@ var Geocoder = (function (exports) {
         if (value instanceof Promise) {
           value.catch((er) => {
             this.delete(key, props);
-            throw er;
           });
           if (onlyFull) {
             value.then((x) => {
@@ -1169,9 +863,7 @@ var Geocoder = (function (exports) {
     }
     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) {
@@ -1180,37 +872,30 @@ var Geocoder = (function (exports) {
       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$8(_Cache, "instance", {});
   let Cache = _Cache;
 
-  var __defProp$9 = Object.defineProperty;
-  var __defNormalProp$9 = (obj, key, value) => key in obj ? __defProp$9(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __publicField$7 = (obj, key, value) => __defNormalProp$9(obj, typeof key !== "symbol" ? key + "" : key, value);
+  var __defProp$a = Object.defineProperty;
+  var __defNormalProp$a = (obj, key, value) => key in obj ? __defProp$a(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+  var __publicField$7 = (obj, key, value) => __defNormalProp$a(obj, typeof key !== "symbol" ? key + "" : key, value);
   class NgwError extends Error {
     constructor(er) {
       super();
@@ -1227,9 +912,9 @@ var Geocoder = (function (exports) {
     }
   }
 
-  var __defProp$8 = Object.defineProperty;
-  var __defNormalProp$8 = (obj, key, value) => key in obj ? __defProp$8(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __publicField$6 = (obj, key, value) => __defNormalProp$8(obj, typeof key !== "symbol" ? key + "" : key, value);
+  var __defProp$9 = Object.defineProperty;
+  var __defNormalProp$9 = (obj, key, value) => key in obj ? __defProp$9(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+  var __publicField$6 = (obj, key, value) => __defNormalProp$9(obj, typeof key !== "symbol" ? key + "" : key, value);
   class ResourceNotFoundError extends NgwError {
     constructor(obj) {
       super(obj);
@@ -1268,27 +953,24 @@ var Geocoder = (function (exports) {
     return query;
   }
 
-  var __defProp$7 = Object.defineProperty;
-  var __defProps$2 = Object.defineProperties;
-  var __getOwnPropDescs$2 = Object.getOwnPropertyDescriptors;
-  var __getOwnPropSymbols$4 = Object.getOwnPropertySymbols;
-  var __hasOwnProp$4 = Object.prototype.hasOwnProperty;
-  var __propIsEnum$4 = Object.prototype.propertyIsEnumerable;
-  var __defNormalProp$7 = (obj, key, value) => key in obj ? __defProp$7(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __spreadValues$4 = (a, b) => {
+  var __defProp$8 = Object.defineProperty;
+  var __getOwnPropSymbols$5 = Object.getOwnPropertySymbols;
+  var __hasOwnProp$5 = Object.prototype.hasOwnProperty;
+  var __propIsEnum$5 = Object.prototype.propertyIsEnumerable;
+  var __defNormalProp$8 = (obj, key, value) => key in obj ? __defProp$8(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+  var __spreadValues$5 = (a, b) => {
     for (var prop in b || (b = {}))
-      if (__hasOwnProp$4.call(b, prop))
-        __defNormalProp$7(a, prop, b[prop]);
-    if (__getOwnPropSymbols$4)
-      for (var prop of __getOwnPropSymbols$4(b)) {
-        if (__propIsEnum$4.call(b, prop))
-          __defNormalProp$7(a, prop, b[prop]);
+      if (__hasOwnProp$5.call(b, prop))
+        __defNormalProp$8(a, prop, b[prop]);
+    if (__getOwnPropSymbols$5)
+      for (var prop of __getOwnPropSymbols$5(b)) {
+        if (__propIsEnum$5.call(b, prop))
+          __defNormalProp$8(a, prop, b[prop]);
       }
     return a;
   };
-  var __spreadProps$2 = (a, b) => __defProps$2(a, __getOwnPropDescs$2(b));
-  var __publicField$5 = (obj, key, value) => __defNormalProp$7(obj, typeof key !== "symbol" ? key + "" : key, value);
-  var __async = (__this, __arguments, generator) => {
+  var __publicField$5 = (obj, key, value) => __defNormalProp$8(obj, typeof key !== "symbol" ? key + "" : key, value);
+  var __async$4 = (__this, __arguments, generator) => {
     return new Promise((resolve, reject) => {
       var fulfilled = (value) => {
         try {
@@ -1329,39 +1011,27 @@ var Geocoder = (function (exports) {
      * Fetching resource would be cached to speed up next call
      */
     getOne(resource, requestOptions) {
-      const cache = this.cache;
-      const forCache = {};
-      const opt = __spreadProps$2(__spreadValues$4({}, 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$5({}, 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) => {
@@ -1383,7 +1053,7 @@ var Geocoder = (function (exports) {
      */
     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) {
@@ -1391,7 +1061,7 @@ var Geocoder = (function (exports) {
           }
         });
       }
-      return CancelablePromise.resolve(void 0);
+      return Promise.resolve(void 0);
     }
     /**
      * A fast way to retrieve resource ID for any resource definition.
@@ -1418,12 +1088,12 @@ var Geocoder = (function (exports) {
           } else {
             Object.assign(query, resourceToQuery(resource));
           }
-          return this.connector.get("resource.search", requestOptions, __spreadValues$4({
+          return this.connector.get("resource.search", requestOptions, __spreadValues$5({
             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
                 });
               }
@@ -1439,7 +1109,7 @@ var Geocoder = (function (exports) {
         if (child) {
           return this.getOne(child.resource.parent.id, requestOptions);
         }
-        return CancelablePromise.resolve(void 0);
+        return Promise.resolve(void 0);
       });
     }
     getChildrenOf(resource, requestOptions) {
@@ -1469,18 +1139,16 @@ var Geocoder = (function (exports) {
       });
     }
     _getChildrenOf(parent, requestOptions, _items = []) {
-      return this.connector.get(
-        "resource.collection",
-        __spreadValues$4({ 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(
@@ -1489,7 +1157,7 @@ var Geocoder = (function (exports) {
           }
         }
         if (recursivePromises.length) {
-          return CancelablePromise.all(recursivePromises).then(() => {
+          return Promise.all(recursivePromises).then(() => {
             return _items;
           });
         }
@@ -1497,11 +1165,12 @@ var Geocoder = (function (exports) {
       });
     }
     _cleanResourceItemCache(id) {
-      return __async(this, null, function* () {
+      return __async$4(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) {
@@ -1521,18 +1190,7 @@ var Geocoder = (function (exports) {
       });
     }
     _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) => {
@@ -1540,7 +1198,7 @@ var Geocoder = (function (exports) {
       });
     }
     _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) => {
@@ -1584,9 +1242,16 @@ var Geocoder = (function (exports) {
     }
   }
 
-  var __defProp$6 = Object.defineProperty;
-  var __defNormalProp$6 = (obj, key, value) => key in obj ? __defProp$6(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __publicField$4 = (obj, key, value) => __defNormalProp$6(obj, typeof key !== "symbol" ? key + "" : key, value);
+  class AbortError extends Error {
+    constructor(message = "AbortError") {
+      super(message);
+      this.name = "AbortError";
+    }
+  }
+
+  var __defProp$7 = Object.defineProperty;
+  var __defNormalProp$7 = (obj, key, value) => key in obj ? __defProp$7(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+  var __publicField$4 = (obj, key, value) => __defNormalProp$7(obj, typeof key !== "symbol" ? key + "" : key, value);
   class InsufficientPermissionsError extends NgwError {
     constructor(obj) {
       super(obj);
@@ -1609,64 +1274,96 @@ var Geocoder = (function (exports) {
     });
   }
 
+  var __defProp$6 = Object.defineProperty;
+  var __getOwnPropSymbols$4 = Object.getOwnPropertySymbols;
+  var __hasOwnProp$4 = Object.prototype.hasOwnProperty;
+  var __propIsEnum$4 = Object.prototype.propertyIsEnumerable;
+  var __defNormalProp$6 = (obj, key, value) => key in obj ? __defProp$6(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+  var __spreadValues$4 = (a, b) => {
+    for (var prop in b || (b = {}))
+      if (__hasOwnProp$4.call(b, prop))
+        __defNormalProp$6(a, prop, b[prop]);
+    if (__getOwnPropSymbols$4)
+      for (var prop of __getOwnPropSymbols$4(b)) {
+        if (__propIsEnum$4.call(b, prop))
+          __defNormalProp$6(a, prop, b[prop]);
+      }
+    return a;
+  };
+  var __async$3 = (__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$3(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$4({
+            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$5 = Object.defineProperty;
   var __defNormalProp$5 = (obj, key, value) => key in obj ? __defProp$5(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __publicField$3 = (obj, key, value) => __defNormalProp$5(obj, typeof key !== "symbol" ? key + "" : key, value);
+  var __publicField$3 = (obj, key, value) => __defNormalProp$5(obj, key + "" , value);
   class NetworkError extends Error {
     constructor(url) {
       super();
@@ -1760,6 +1457,8 @@ var Geocoder = (function (exports) {
   }
 
   var __defProp$4 = Object.defineProperty;
+  var __defProps$2 = Object.defineProperties;
+  var __getOwnPropDescs$2 = Object.getOwnPropertyDescriptors;
   var __getOwnPropSymbols$3 = Object.getOwnPropertySymbols;
   var __hasOwnProp$3 = Object.prototype.hasOwnProperty;
   var __propIsEnum$3 = Object.prototype.propertyIsEnumerable;
@@ -1775,8 +1474,42 @@ var Geocoder = (function (exports) {
       }
     return a;
   };
+  var __spreadProps$2 = (a, b) => __defProps$2(a, __getOwnPropDescs$2(b));
+  var __objRest = (source, exclude) => {
+    var target = {};
+    for (var prop in source)
+      if (__hasOwnProp$3.call(source, prop) && exclude.indexOf(prop) < 0)
+        target[prop] = source[prop];
+    if (source != null && __getOwnPropSymbols$3)
+      for (var prop of __getOwnPropSymbols$3(source)) {
+        if (exclude.indexOf(prop) < 0 && __propIsEnum$3.call(source, prop))
+          target[prop] = source[prop];
+      }
+    return target;
+  };
   var __publicField$2 = (obj, key, value) => __defNormalProp$4(obj, typeof key !== "symbol" ? key + "" : key, value);
+  var __async$2 = (__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 = 0;
+  let REQUEST_ID = 0;
   class NgwConnector {
     constructor(options) {
       this.options = options;
@@ -1786,7 +1519,7 @@ var Geocoder = (function (exports) {
       __publicField$2(this, "resources");
       __publicField$2(this, "cache");
       __publicField$2(this, "routeStr", "/api/component/pyramid/route");
-      __publicField$2(this, "activeRequests", []);
+      __publicField$2(this, "activeRequests", {});
       __publicField$2(this, "requestTransform");
       const exist = findConnector(options);
       this.cache = new Cache({ namespace: options.cacheId });
@@ -1843,29 +1576,27 @@ var Geocoder = (function (exports) {
      * ```
      */
     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$2(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
+            }
+          }
+        );
       });
     }
     /**
@@ -1889,20 +1620,22 @@ var Geocoder = (function (exports) {
       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$3({
-        headers: this.getAuthorizationHeaders(credentials)
-      }, options);
-      return this.makeQuery(
-        "/api/component/auth/current_user",
-        {},
-        options_
-      );
+      return __async$2(this, null, function* () {
+        if (this.user && this.user.id) {
+          return this.user;
+        }
+        if (credentials) {
+          this.options.auth = credentials;
+        }
+        const options_ = __spreadValues$3({
+          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.
@@ -1911,7 +1644,7 @@ var Geocoder = (function (exports) {
       const client = this.makeClientId(credentials);
       if (client) {
         return {
-          Authorization: "Basic " + client
+          Authorization: `Basic ${client}`
         };
       }
     }
@@ -1919,21 +1652,22 @@ var Geocoder = (function (exports) {
       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$3({}, this.activeRequests);
     }
     /**
      * Send request to NGW api router.
@@ -1965,23 +1699,10 @@ var Geocoder = (function (exports) {
      * ```
      */
     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$3({
-          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.
@@ -2071,17 +1792,67 @@ var Geocoder = (function (exports) {
      * @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$2(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(_a, ["paramList"]);
+          url = template(url, restParams);
         }
         url = encodeURI(fixUrlStr(url));
-        return this._loadData(url, options);
-      } else {
-        throw new Error("Empty `url` not allowed");
-      }
+        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$2(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$2(__spreadValues$3({}, 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
+          );
+        }
+        return createPromise();
+      });
     }
     // -------------------------------------------------------------------------
     // Resource Methods
@@ -2163,10 +1934,8 @@ var Geocoder = (function (exports) {
      */
     _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$3(__spreadValues$3({}, this.getAuthorizationHeaders()), options.headers);
@@ -2176,13 +1945,18 @@ var Geocoder = (function (exports) {
           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);
           }
@@ -2191,31 +1965,24 @@ var Geocoder = (function (exports) {
             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$2(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) {
@@ -2324,6 +2091,26 @@ var Geocoder = (function (exports) {
     return a;
   };
   var __spreadProps$1 = (a, b) => __defProps$1(a, __getOwnPropDescs$1(b));
+  var __async$1 = (__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"
@@ -2354,10 +2141,9 @@ var Geocoder = (function (exports) {
     }
   }
   function createFeatureFieldFilterQueries(opt) {
-    const queries = getQueries(
-      opt
-    );
-    return CancelablePromise.all(queries).then((itemsParts) => {
+    return __async$1(this, null, function* () {
+      const queries = getQueries(opt);
+      const itemsParts = yield Promise.all(queries);
       const ids = [];
       const items = [];
       for (const part of itemsParts) {
@@ -2390,7 +2176,9 @@ var Geocoder = (function (exports) {
     return [`${isFldStr}${field_}__${operation}`, v];
   }
   function getQueries(opt, _queries = [], _parentAllParams = []) {
+    var _a;
     const { filters } = opt;
+    const paramList = (_a = opt.paramList) != null ? _a : [];
     const logic = typeof filters[0] === "string" ? filters[0] : "all";
     const filters_ = filters.filter((x) => Array.isArray(x));
     if (logic === "any") {
@@ -2398,7 +2186,7 @@ var Geocoder = (function (exports) {
         if (isPropertyFilter(f)) {
           _queries.push(
             fetchNgwLayerItemsRequest(__spreadProps$1(__spreadValues$2({}, opt), {
-              paramList: [..._parentAllParams, createParam(f)]
+              paramList: [..._parentAllParams, ...paramList, createParam(f)]
             }))
           );
         } else {
@@ -2434,7 +2222,7 @@ var Geocoder = (function (exports) {
       } else {
         _queries.push(
           fetchNgwLayerItemsRequest(__spreadProps$1(__spreadValues$2({}, opt), {
-            paramList: [..._parentAllParams, ...filters2]
+            paramList: [..._parentAllParams, ...paramList, ...filters2]
           }))
         );
       }
@@ -2543,13 +2331,34 @@ var Geocoder = (function (exports) {
     return a;
   };
   var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+  var __async = (__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(__spreadValues$1({}, options), {
-        filters
-      })).then((data) => {
-        var _a;
+    return __async(this, null, function* () {
+      var _a;
+      const filters = options.filters;
+      if (filters) {
+        let data = yield createFeatureFieldFilterQueries(__spreadProps(__spreadValues$1({}, options), {
+          filters
+        }));
         const clientFilterValidate = (_a = options.clientFilterValidate) != null ? _a : isFilterWithAnyCase(filters);
         if (clientFilterValidate) {
           data = data.filter((y) => {
@@ -2561,10 +2370,10 @@ var Geocoder = (function (exports) {
           });
         }
         return data;
-      });
-    } else {
-      return fetchNgwLayerItemsRequest(options);
-    }
+      } else {
+        return fetchNgwLayerItemsRequest(options);
+      }
+    });
   }
   function isFilterWithAnyCase(filters) {
     if (filters[0] === "any") {
@@ -2781,14 +2590,14 @@ var Geocoder = (function (exports) {
     constructor(options) {
       super(options);
       __publicField(this, "searchUrl", "https://nominatim.openstreetmap.org");
-      __publicField(this, "_requests", []);
+      __publicField(this, "_abort", []);
       if (options && options.searchUrl) {
         this.searchUrl = options.searchUrl;
       }
     }
     abort() {
-      this._requests.forEach((x) => x.cancel());
-      this._requests = [];
+      this._abort.forEach((x) => x());
+      this._abort = [];
     }
     search(val) {
       return __asyncGenerator(this, null, function* () {
@@ -2796,39 +2605,34 @@ var Geocoder = (function (exports) {
           // `${this.baseUrl}/search?format=geojson&polygon_geojson=1${window.locale === 'ru' ? '&accept-language=ru-RU,en-US' : ''}&q=${val}`
           `${this.searchUrl}/search?format=geojson&polygon_geojson=1&q=${val}`
         );
-        const request = new CancelablePromise(
-          (resolve, reject, onCancel) => {
-            const xhr = new XMLHttpRequest();
-            xhr.open("GET", url, true);
-            xhr.onload = () => {
-              try {
-                const geojson = JSON.parse(xhr.responseText);
-                const features = geojson.features.map((x) => {
-                  return {
-                    geom: x,
-                    extent: x.bbox,
-                    text: x.properties && x.properties.display_name,
-                    query: val
-                  };
-                });
-                resolve(features);
-              } catch (er) {
-                reject(er);
-              }
-            };
-            xhr.onerror = (er) => {
+        const request = new Promise((resolve, reject) => {
+          const xhr = new XMLHttpRequest();
+          xhr.open("GET", url, true);
+          xhr.onload = () => {
+            try {
+              const geojson = JSON.parse(xhr.responseText);
+              const features = geojson.features.map((x) => {
+                return {
+                  geom: x,
+                  extent: x.bbox,
+                  text: x.properties && x.properties.display_name,
+                  query: val
+                };
+              });
+              resolve(features);
+            } catch (er) {
               reject(er);
-            };
-            onCancel(() => {
-              xhr.abort();
-            });
-            xhr.send();
-          }
-        ).catch((er) => {
+            }
+          };
+          xhr.onerror = (er) => {
+            reject(er);
+          };
+          this._abort.push(xhr.abort);
+          xhr.send();
+        }).catch((er) => {
           if (er.name === "CancelError") ;
           throw er;
         });
-        this._requests.push(request);
         const items = yield new __await(request);
         if (items) {
           for (const i of items) {
@@ -2839,7 +2643,7 @@ var Geocoder = (function (exports) {
       });
     }
     result(model) {
-      return CancelablePromise.resolve({
+      return Promise.resolve({
         text: model.text,
         extent: model.extent || [],
         geom: model.geom
@@ -2851,38 +2655,33 @@ var Geocoder = (function (exports) {
         const url = fixUrlStr(
           `${this.searchUrl}/reverse?format=geojson&lat=${lat}&lon=${lng}`
         );
-        const request = new CancelablePromise(
-          (resolve, reject, onCancel) => {
-            const xhr = new XMLHttpRequest();
-            xhr.open("GET", url, true);
-            xhr.onload = () => {
-              try {
-                const geojson = JSON.parse(xhr.responseText);
-                const feature = geojson.features[0];
-                const result = {
-                  geom: feature,
-                  extent: feature.bbox,
-                  text: feature.properties && feature.properties.display_name,
-                  query: `${lat}, ${lng}`
-                };
-                resolve(result);
-              } catch (er) {
-                reject(er);
-              }
-            };
-            xhr.onerror = (er) => {
+        const request = new Promise((resolve, reject) => {
+          const xhr = new XMLHttpRequest();
+          xhr.open("GET", url, true);
+          xhr.onload = () => {
+            try {
+              const geojson = JSON.parse(xhr.responseText);
+              const feature = geojson.features[0];
+              const result = {
+                geom: feature,
+                extent: feature.bbox,
+                text: feature.properties && feature.properties.display_name,
+                query: `${lat}, ${lng}`
+              };
+              resolve(result);
+            } catch (er) {
               reject(er);
-            };
-            onCancel(() => {
-              xhr.abort();
-            });
-            xhr.send();
-          }
-        ).catch((er) => {
+            }
+          };
+          xhr.onerror = (er) => {
+            reject(er);
+          };
+          this._abort.push(xhr.abort);
+          xhr.send();
+        }).catch((er) => {
           if (er.name === "CancelError") ;
           throw er;
         });
-        this._requests.push(request);
         const item = yield new __await(request);
         if (item) {
           item.result = () => this.result(item);