@nextgis/geocoder 3.0.0-alpha.9 → 3.0.1

package/lib/geocoder.esm-browser.js

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/geocoder; version: 3.0.0-alpha.9; author: NextGIS */
+/** Bundle of @nextgis/geocoder; version: 3.0.1; author: NextGIS */
 function defined(val) {
   return val !== void 0 && val !== null;
 }
@@ -6,14 +6,6 @@ function full(val) {
   return typeof val === "string" ? !!val : defined(val);
 }
 
-function getBoundsCoordinates(b) {
-  const westNorth = [b[0], b[1]];
-  const eastNorth = [b[2], b[1]];
-  const eastSouth = [b[2], b[3]];
-  const westSouth = [b[0], b[3]];
-  return [westNorth, eastNorth, eastSouth, westSouth, westNorth];
-}
-
 function degrees2meters(lng, lat) {
   lat = lat > 85.06 ? 85.06 : lat < -85.06 ? -85.06 : lat;
   const x = lng * 2003750834e-2 / 180;
@@ -22,10 +14,23 @@ function degrees2meters(lng, lat) {
   return [x, y];
 }
 
+function getBoundsCoordinates(b) {
+  const westNorth = [b[0], b[1]];
+  const eastNorth = [b[2], b[1]];
+  const eastSouth = [b[2], b[3]];
+  const westSouth = [b[0], b[3]];
+  return [westNorth, eastNorth, eastSouth, westSouth, westNorth];
+}
+
 function isLngLatBoundsArray(array) {
   return Array.isArray(array) && array.length === 4 && array.every((x) => typeof x === "number");
 }
 
+function round(val, toFixed) {
+  const n = 1;
+  return Math.round((val + Number.EPSILON) * n) / n;
+}
+
 function objectAssign(target, ...sources) {
   for (const source of sources) {
     for (const prop of Object.getOwnPropertyNames(source)) {
@@ -80,11 +85,6 @@ function objectRemoveEmpty(obj) {
   return newObj;
 }
 
-function round(val, toFixed) {
-  const n = 1;
-  return Math.round((val + Number.EPSILON) * n) / n;
-}
-
 function isObject$1(val) {
   return Object.prototype.toString.call(val) === "[object Object]";
 }
@@ -104,27 +104,27 @@ class BaseGeocoder {
   }
 }
 
-var __defProp$h = Object.defineProperty;
-var __defProps$4 = Object.defineProperties;
-var __getOwnPropDescs$4 = Object.getOwnPropertyDescriptors;
+var __defProp$i = Object.defineProperty;
+var __defProps$5 = Object.defineProperties;
+var __getOwnPropDescs$5 = Object.getOwnPropertyDescriptors;
 var __getOwnPropSymbols$8 = Object.getOwnPropertySymbols;
 var __hasOwnProp$8 = Object.prototype.hasOwnProperty;
 var __propIsEnum$8 = Object.prototype.propertyIsEnumerable;
 var __knownSymbol$2 = (name, symbol) => (symbol = Symbol[name]) ? symbol : Symbol.for("Symbol." + name);
-var __defNormalProp$h = (obj, key, value) => key in obj ? __defProp$h(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __defNormalProp$i = (obj, key, value) => key in obj ? __defProp$i(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __spreadValues$8 = (a, b) => {
   for (var prop in b || (b = {}))
     if (__hasOwnProp$8.call(b, prop))
-      __defNormalProp$h(a, prop, b[prop]);
+      __defNormalProp$i(a, prop, b[prop]);
   if (__getOwnPropSymbols$8)
     for (var prop of __getOwnPropSymbols$8(b)) {
       if (__propIsEnum$8.call(b, prop))
-        __defNormalProp$h(a, prop, b[prop]);
+        __defNormalProp$i(a, prop, b[prop]);
     }
   return a;
 };
-var __spreadProps$4 = (a, b) => __defProps$4(a, __getOwnPropDescs$4(b));
-var __publicField$c = (obj, key, value) => __defNormalProp$h(obj, key + "" , value);
+var __spreadProps$5 = (a, b) => __defProps$5(a, __getOwnPropDescs$5(b));
+var __publicField$d = (obj, key, value) => __defNormalProp$i(obj, key + "" , value);
 var __async$7 = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
@@ -165,7 +165,7 @@ let ID$1 = 0;
 class Geocoder extends BaseGeocoder {
   constructor(options) {
     super(options);
-    __publicField$c(this, "providers", []);
+    __publicField$d(this, "providers", []);
     if (options && options.providers) {
       this.providers = options.providers;
     }
@@ -189,7 +189,7 @@ class Geocoder extends BaseGeocoder {
             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$4(__spreadValues$8({}, r), { provider, _id: ID$1++ });
+              yield __spreadProps$5(__spreadValues$8({}, r), { provider, _id: ID$1++ });
             }
           } catch (temp) {
             error = [temp];
@@ -203,7 +203,7 @@ class Geocoder extends BaseGeocoder {
           }
         } catch (err) {
           const er = err;
-          if (er.name !== "CancelError") {
+          if (er.name !== "AbortError") {
             errors.push(er);
           }
         }
@@ -232,7 +232,7 @@ class Geocoder extends BaseGeocoder {
           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$4(__spreadValues$8({}, r), { provider, _id: ID$1++ });
+              yield __spreadProps$5(__spreadValues$8({}, r), { provider, _id: ID$1++ });
             }
           } catch (temp) {
             error = [temp];
@@ -244,7 +244,7 @@ class Geocoder extends BaseGeocoder {
                 throw error[0];
             }
           }
-        } catch (er) {
+        } catch (e) {
         }
       }
     });
@@ -285,9 +285,9 @@ class Geocoder extends BaseGeocoder {
   }
 }
 
-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$b = (obj, key, value) => __defNormalProp$g(obj, typeof key !== "symbol" ? key + "" : key, value);
+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$c = (obj, key, value) => __defNormalProp$h(obj, typeof key !== "symbol" ? key + "" : key, value);
 class BaseProvider extends BaseGeocoder {
   constructor() {
     super(...arguments);
@@ -295,14 +295,253 @@ class BaseProvider extends BaseGeocoder {
      * URL endpoint for the search service.
      * This is where queries will be sent to obtain search results.
      */
-    __publicField$b(this, "searchUrl");
+    __publicField$c(this, "searchUrl");
     /**
      * Label to represent the provider.
      * Useful for user interfaces to display the source of search results.
      */
-    __publicField$b(this, "label");
+    __publicField$c(this, "label");
+  }
+}
+
+const templateRe = /\{ *([\w_-]+) *\}/g;
+function template(str, data) {
+  return str.replace(templateRe, (s, key) => {
+    let value = data[key];
+    if (value === void 0) {
+      throw new Error("No value provided for letiable " + s);
+    } else if (typeof value === "function") {
+      value = value(data);
+    }
+    return value;
+  });
+}
+
+var __defProp$g = Object.defineProperty;
+var __getOwnPropSymbols$7 = Object.getOwnPropertySymbols;
+var __hasOwnProp$7 = Object.prototype.hasOwnProperty;
+var __propIsEnum$7 = 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$7 = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp$7.call(b, prop))
+      __defNormalProp$g(a, prop, b[prop]);
+  if (__getOwnPropSymbols$7)
+    for (var prop of __getOwnPropSymbols$7(b)) {
+      if (__propIsEnum$7.call(b, prop))
+        __defNormalProp$g(a, prop, b[prop]);
+    }
+  return a;
+};
+var __async$6 = (__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) {
+  return __async$6(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 (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 (paramArray.length) {
+          url = `${url}?${paramArray.join("&")}`;
+        }
+      }
+      if (url) {
+        return connector.makeQuery(url, params, __spreadValues$7({
+          cacheName: name
+        }, requestOptions));
+      } else {
+        throw new Error("Request URL is not set");
+      }
+    } else {
+      return void 0;
+    }
+  });
+}
+
+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$b = (obj, key, value) => __defNormalProp$f(obj, typeof key !== "symbol" ? key + "" : key, value);
+const _Cache = class _Cache {
+  constructor(options = {}) {
+    __publicField$b(this, "cache", []);
+    var _a;
+    const namespace = (_a = options.namespace) != null ? _a : "default";
+    if (_Cache.instance[namespace]) {
+      return _Cache.instance[namespace];
+    }
+    _Cache.instance[namespace] = this;
+    return this;
+  }
+  clean() {
+    this.cache.length = 0;
+  }
+  all() {
+    return this.cache;
+  }
+  /**
+   * Caching only a non-empty value.
+   *
+   * Useful for get or create strategy
+   * @example
+   * ```javascript
+   * const cache = new Cache();
+   * const getItemFunc = () => fetch(url).then((data) => {
+   *  return data.json(); // undefined
+   * });
+   * const item = await cache.addFull('foo', getItemFunc);
+   * if (!item) {
+   *   await createItem(); // 'New item'
+   * }
+   *
+   * // somewhere else in the code
+   * const item = await cache.addFull('foo', getItemFunc).then((resp) => {
+   *   console.log(resp); // 'New item'
+   * });
+   * ```
+   */
+  addFull(key, valueToSet, propsOrOptions, expirationTime) {
+    if (typeof propsOrOptions === "object" && "valueToSet" in propsOrOptions) {
+      propsOrOptions.onlyFull = true;
+    }
+    return this.add(key, valueToSet, propsOrOptions, true, expirationTime);
+  }
+  add(key, valueToSet, propsOrOptions, onlyFull, expirationTime) {
+    let opt;
+    let props;
+    if (typeof propsOrOptions === "object" && "valueToSet" in propsOrOptions) {
+      opt = propsOrOptions;
+      onlyFull = opt.onlyFull;
+      expirationTime = opt.expirationTime;
+      props = opt.props;
+    } else {
+      props = propsOrOptions;
+    }
+    const exist = this._find(key, props);
+    if (!exist) {
+      let value;
+      if (valueToSet instanceof Function) {
+        value = valueToSet();
+      } else {
+        value = valueToSet;
+      }
+      const nonEmptyProps = props && JSON.parse(JSON.stringify(objectRemoveEmpty(props)));
+      expirationTime = expirationTime ? Date.now() + expirationTime : void 0;
+      const cacheItem = {
+        key,
+        value,
+        props: nonEmptyProps,
+        expirationTime
+      };
+      if (onlyFull && !full(value)) {
+        return value;
+      }
+      this.cache.push(cacheItem);
+      if (value instanceof Promise) {
+        value.catch(() => {
+          this.delete(key, props);
+        });
+        if (onlyFull) {
+          value.then((x) => {
+            if (!full(x)) {
+              this.delete(key, props);
+            }
+            return x;
+          });
+        }
+        return value;
+      }
+      return value;
+    } else {
+      return exist.value;
+    }
+  }
+  match(key, props) {
+    const cacheRecord = this._find(key, props);
+    if (cacheRecord && cacheRecord.expirationTime && Date.now() > cacheRecord.expirationTime) {
+      this.delete(cacheRecord);
+      return void 0;
+    }
+    return cacheRecord == null ? void 0 : cacheRecord.value;
+  }
+  matchAll(key, props) {
+    const now = Date.now();
+    this.cache.forEach((item) => {
+      if (item.expirationTime && now > item.expirationTime) {
+        this.delete(item);
+      }
+    });
+    if (key) {
+      return this.cache.filter((x) => this._filter(x, key, props)).map((x) => x.value);
+    }
+    return this.cache.map((x) => x.value);
+  }
+  delete(keyOrItem, props) {
+    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) return false;
+    if (!props) return true;
+    const itemProps = item.props;
+    return objectDeepEqual(itemProps || {}, objectRemoveEmpty(props));
   }
-}
+};
+__publicField$b(_Cache, "instance", {});
+let Cache = _Cache;
 
 var domain;
 
@@ -776,148 +1015,9 @@ function unwrapListeners(arr) {
   return ret;
 }
 
-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$a = (obj, key, value) => __defNormalProp$f(obj, typeof key !== "symbol" ? key + "" : key, value);
-const _Cache = class _Cache {
-  constructor(options = {}) {
-    __publicField$a(this, "cache", []);
-    var _a;
-    const namespace = (_a = options.namespace) != null ? _a : "default";
-    if (_Cache.instance[namespace]) {
-      return _Cache.instance[namespace];
-    }
-    _Cache.instance[namespace] = this;
-    return this;
-  }
-  clean() {
-    this.cache.length = 0;
-  }
-  all() {
-    return this.cache;
-  }
-  /**
-   * Caching only a non-empty value.
-   *
-   * Useful for get or create strategy
-   * @example
-   * ```javascript
-   * const cache = new Cache();
-   * const getItemFunc = () => fetch(url).then((data) => {
-   *  return data.json(); // undefined
-   * });
-   * const item = await cache.addFull('foo', getItemFunc);
-   * if (!item) {
-   *   await createItem(); // 'New item'
-   * }
-   *
-   * // somewhere else in the code
-   * const item = await cache.addFull('foo', getItemFunc).then((resp) => {
-   *   console.log(resp); // 'New item'
-   * });
-   * ```
-   */
-  addFull(key, valueToSet, propsOrOptions, expirationTime) {
-    if (typeof propsOrOptions === "object" && "valueToSet" in propsOrOptions) {
-      propsOrOptions.onlyFull = true;
-    }
-    return this.add(key, valueToSet, propsOrOptions, true, expirationTime);
-  }
-  add(key, valueToSet, propsOrOptions, onlyFull, expirationTime) {
-    let opt;
-    let props;
-    if (typeof propsOrOptions === "object" && "valueToSet" in propsOrOptions) {
-      opt = propsOrOptions;
-      onlyFull = opt.onlyFull;
-      expirationTime = opt.expirationTime;
-      props = opt.props;
-    } else {
-      props = propsOrOptions;
-    }
-    const exist = this._find(key, props);
-    if (!exist) {
-      let value;
-      if (valueToSet instanceof Function) {
-        value = valueToSet();
-      } else {
-        value = valueToSet;
-      }
-      const nonEmptyProps = props && JSON.parse(JSON.stringify(objectRemoveEmpty(props)));
-      expirationTime = expirationTime ? Date.now() + expirationTime : void 0;
-      const cacheItem = {
-        key,
-        value,
-        props: nonEmptyProps,
-        expirationTime
-      };
-      if (onlyFull && !full(value)) {
-        return value;
-      }
-      this.cache.push(cacheItem);
-      if (value instanceof Promise) {
-        value.catch((er) => {
-          this.delete(key, props);
-        });
-        if (onlyFull) {
-          value.then((x) => {
-            if (!full(x)) {
-              this.delete(key, props);
-            }
-            return x;
-          });
-        }
-        return value;
-      }
-      return value;
-    } else {
-      return exist.value;
-    }
-  }
-  match(key, props) {
-    const cacheRecord = this._find(key, props);
-    if (cacheRecord && cacheRecord.expirationTime && Date.now() > cacheRecord.expirationTime) {
-      this.delete(cacheRecord);
-      return void 0;
-    }
-    return cacheRecord == null ? void 0 : cacheRecord.value;
-  }
-  matchAll(key, props) {
-    const now = Date.now();
-    this.cache.forEach((item) => {
-      if (item.expirationTime && now > item.expirationTime) {
-        this.delete(item);
-      }
-    });
-    if (key) {
-      return this.cache.filter((x) => this._filter(x, key, props)).map((x) => x.value);
-    }
-    return this.cache.map((x) => x.value);
-  }
-  delete(keyOrItem, props) {
-    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) return false;
-    if (!props) return true;
-    const itemProps = item.props;
-    return objectDeepEqual(itemProps || {}, objectRemoveEmpty(props));
-  }
-};
-__publicField$a(_Cache, "instance", {});
-let Cache = _Cache;
-
 var pkg = {
 	name: "@nextgis/ngw-connector",
-	version: "3.0.0-alpha.8",
+	version: "3.0.1",
 	_priority: 12,
 	description: "A lightweight HTTP client optimized for use with NextGIS Web API",
 	main: "index.js",
@@ -926,15 +1026,15 @@ var pkg = {
 	jsdelivr: "lib/ngw-connector.global.prod.js",
 	types: "lib/index.d.ts",
 	dependencies: {
-		"@nextgis/cache": "^3.0.0-alpha.7",
-		"@nextgis/cancelable-promise": "^3.0.0-alpha.5",
-		"@nextgis/utils": "^3.0.0-alpha.5",
+		"@nextgis/cache": "3.0.0",
+		"@nextgis/cancelable-promise": "3.0.0",
+		"@nextgis/utils": "3.0.0",
 		"@types/events": "^3.0.0",
 		events: "*",
 		"form-data": "^4.0.0"
 	},
 	devDependencies: {
-		"@nextgis/build-tools": "^3.0.0-alpha.5"
+		"@nextgis/build-tools": "3.0.0"
 	},
 	scripts: {
 		clean: "rimraf ./lib",
@@ -974,30 +1074,6 @@ var pkg = {
 	gitHead: "edc68033f914f6c95c4125b9738bba6d36e990b4"
 };
 
-const CONNECTORS = [];
-function addConnector(connector) {
-  CONNECTORS.push(connector);
-}
-function findConnector(options) {
-  return CONNECTORS.find((x) => {
-    if (x.options.baseUrl === options.baseUrl) {
-      if (options.auth) {
-        if (x.options.auth) {
-          return objectDeepEqual(x.options.auth, options.auth);
-        }
-      } else {
-        return true;
-      }
-    }
-  });
-}
-function removeConnector(connector) {
-  const index = CONNECTORS.indexOf(connector);
-  if (index !== -1) {
-    CONNECTORS.splice(index, 1);
-  }
-}
-
 class AbortError extends Error {
   constructor(message = "AbortError") {
     super(message);
@@ -1007,18 +1083,18 @@ class AbortError extends Error {
 
 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$9 = (obj, key, value) => __defNormalProp$e(obj, typeof key !== "symbol" ? key + "" : key, value);
+var __publicField$a = (obj, key, value) => __defNormalProp$e(obj, typeof key !== "symbol" ? key + "" : key, value);
 class NgwError extends Error {
   constructor(er) {
     super();
-    __publicField$9(this, "name", "NgwError");
-    __publicField$9(this, "title");
-    __publicField$9(this, "message");
-    __publicField$9(this, "detail");
-    __publicField$9(this, "exception");
-    __publicField$9(this, "status_code");
-    __publicField$9(this, "data");
-    __publicField$9(this, "guru_meditation");
+    __publicField$a(this, "name", "NgwError");
+    __publicField$a(this, "title");
+    __publicField$a(this, "message");
+    __publicField$a(this, "detail");
+    __publicField$a(this, "exception");
+    __publicField$a(this, "status_code");
+    __publicField$a(this, "data");
+    __publicField$a(this, "guru_meditation");
     Object.assign(this, er);
     Object.setPrototypeOf(this, NgwError.prototype);
   }
@@ -1026,35 +1102,105 @@ class NgwError extends Error {
 
 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$8 = (obj, key, value) => __defNormalProp$d(obj, typeof key !== "symbol" ? key + "" : key, value);
+var __publicField$9 = (obj, key, value) => __defNormalProp$d(obj, typeof key !== "symbol" ? key + "" : key, value);
 class InsufficientPermissionsError extends NgwError {
   constructor(obj) {
     super(obj);
-    __publicField$8(this, "name", "InsufficientPermissionsError");
-    __publicField$8(this, "exception", "nextgisweb.core.exception.InsufficientPermissions");
+    __publicField$9(this, "name", "InsufficientPermissionsError");
+    __publicField$9(this, "exception", "nextgisweb.core.exception.InsufficientPermissions");
     Object.setPrototypeOf(this, InsufficientPermissionsError.prototype);
   }
 }
 
 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$7 = (obj, key, value) => __defNormalProp$c(obj, typeof key !== "symbol" ? key + "" : key, value);
-class ResourceNotFoundError extends NgwError {
+var __publicField$8 = (obj, key, value) => __defNormalProp$c(obj, typeof key !== "symbol" ? key + "" : key, value);
+let NetworksResponseError$1 = class NetworksResponseError extends NgwError {
   constructor(obj) {
     super(obj);
-    __publicField$7(this, "name", "ResourceNotFoundError");
-    __publicField$7(this, "exception", "nextgisweb.resource.exception.ResourceNotFound");
-    Object.setPrototypeOf(this, ResourceNotFoundError.prototype);
+    __publicField$8(this, "message", "There is no response from the server or problem connecting to server.");
+    __publicField$8(this, "title", "Network error");
+    __publicField$8(this, "detail", "Check network connectivity and try again later.");
+    Object.setPrototypeOf(this, NetworksResponseError.prototype);
+  }
+};
+
+function extractError(error) {
+  if (isObject$1(error)) {
+    if (error.name && error.message && error.title) {
+      return {
+        title: error.title,
+        message: error.message,
+        detail: error.detail || null,
+        data: error.data && error.data.data ? error.data.data : null
+      };
+    } else if (error.exception) {
+      if (error.status === void 0 || error.status === 0 || error.data === void 0) {
+        return new NetworksResponseError$1({
+          title: error.title,
+          status_code: error.status_code,
+          exception: error.exception
+        });
+      }
+    }
+    return {
+      title: typeof error.title === "string" ? error.title : "Unexpected error",
+      message: typeof error.message === "string" ? error.message : "Something went wrong."
+    };
+  }
+}
+
+function isError(error) {
+  if (isObject$1(error)) {
+    return error.status_code && error.exception && error.title;
   }
+  return false;
 }
 
 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$6 = (obj, key, value) => __defNormalProp$b(obj, typeof key !== "symbol" ? key + "" : key, value);
+var __publicField$7 = (obj, key, value) => __defNormalProp$b(obj, key + "" , value);
+class NetworkError extends Error {
+  constructor(url) {
+    super();
+    __publicField$7(this, "name", "NetworkError");
+    Object.setPrototypeOf(this, NetworkError.prototype);
+    this.message = `Unable to request ${url}.
+    Possibly invalid NGW URL entered or CORS not configured to get request from ${location.origin}`;
+  }
+}
+
+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$6 = (obj, key, value) => __defNormalProp$a(obj, typeof key !== "symbol" ? key + "" : key, value);
+class ResourceNotFoundError extends NgwError {
+  constructor(obj) {
+    super(obj);
+    __publicField$6(this, "name", "ResourceNotFoundError");
+    __publicField$6(this, "exception", "nextgisweb.resource.exception.ResourceNotFound");
+    Object.setPrototypeOf(this, ResourceNotFoundError.prototype);
+  }
+}
+
+var errors = /*#__PURE__*/Object.freeze({
+  __proto__: null,
+  AbortError: AbortError,
+  InsufficientPermissionsError: InsufficientPermissionsError,
+  NetworkError: NetworkError,
+  NetworksResponseError: NetworksResponseError$1,
+  NgwError: NgwError,
+  ResourceNotFoundError: ResourceNotFoundError,
+  extractError: extractError,
+  isError: isError
+});
+
+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$5 = (obj, key, value) => __defNormalProp$9(obj, typeof key !== "symbol" ? key + "" : key, value);
 class BaseAPIError extends Error {
   constructor(message) {
     super(message || "Something went wrong.");
-    __publicField$6(this, "title");
+    __publicField$5(this, "title");
     this.name = "BaseAPIError";
     this.title = "Unknown API error";
     if (Error.captureStackTrace) {
@@ -1066,7 +1212,7 @@ class NetworksResponseError extends BaseAPIError {
   // prettier-ignore
   constructor(message) {
     super(message || "There is no response from the server or problem connecting to server.");
-    __publicField$6(this, "detail");
+    __publicField$5(this, "detail");
     this.title = "Network error";
     this.detail = "Check network connectivity and try again later.";
   }
@@ -1080,8 +1226,8 @@ class InvalidResponseError extends BaseAPIError {
 class ServerResponseError extends BaseAPIError {
   constructor(data) {
     super(data.message);
-    __publicField$6(this, "detail");
-    __publicField$6(this, "data");
+    __publicField$5(this, "detail");
+    __publicField$5(this, "data");
     this.title = data.title || this.title;
     this.detail = data.detail || null;
     this.data = data;
@@ -1091,8 +1237,8 @@ class LunkwillError extends Error {
   // prettier-ignore
   constructor(message, data = {}) {
     super(message || "Unexpected error while processing long-running request.");
-    __publicField$6(this, "title");
-    __publicField$6(this, "data");
+    __publicField$5(this, "title");
+    __publicField$5(this, "data");
     this.name = "LunkwillError";
     this.title = "Long-running request error";
     this.data = data;
@@ -1112,35 +1258,35 @@ class LunkwillRequestFailed extends LunkwillError {
   }
 }
 
-var __defProp$a = Object.defineProperty;
-var __getOwnPropSymbols$7 = Object.getOwnPropertySymbols;
-var __hasOwnProp$7 = Object.prototype.hasOwnProperty;
-var __propIsEnum$7 = 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$7 = (a, b) => {
+var __defProp$8 = Object.defineProperty;
+var __getOwnPropSymbols$6 = Object.getOwnPropertySymbols;
+var __hasOwnProp$6 = Object.prototype.hasOwnProperty;
+var __propIsEnum$6 = 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$6 = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$7.call(b, prop))
-      __defNormalProp$a(a, prop, b[prop]);
-  if (__getOwnPropSymbols$7)
-    for (var prop of __getOwnPropSymbols$7(b)) {
-      if (__propIsEnum$7.call(b, prop))
-        __defNormalProp$a(a, prop, b[prop]);
+    if (__hasOwnProp$6.call(b, prop))
+      __defNormalProp$8(a, prop, b[prop]);
+  if (__getOwnPropSymbols$6)
+    for (var prop of __getOwnPropSymbols$6(b)) {
+      if (__propIsEnum$6.call(b, prop))
+        __defNormalProp$8(a, prop, b[prop]);
     }
   return a;
 };
 var __objRest$2 = (source, exclude) => {
   var target = {};
   for (var prop in source)
-    if (__hasOwnProp$7.call(source, prop) && exclude.indexOf(prop) < 0)
+    if (__hasOwnProp$6.call(source, prop) && exclude.indexOf(prop) < 0)
       target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols$7)
-    for (var prop of __getOwnPropSymbols$7(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum$7.call(source, prop))
+  if (source != null && __getOwnPropSymbols$6)
+    for (var prop of __getOwnPropSymbols$6(source)) {
+      if (exclude.indexOf(prop) < 0 && __propIsEnum$6.call(source, prop))
         target[prop] = source[prop];
     }
   return target;
 };
-var __async$6 = (__this, __arguments, generator) => {
+var __async$5 = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
       try {
@@ -1165,7 +1311,7 @@ function lunkwillCheckResponse(lwResp) {
   return ct !== void 0 && ct !== null && ct.includes("application/vnd.lunkwill.request-summary+json");
 }
 function responseJson(response) {
-  return __async$6(this, null, function* () {
+  return __async$5(this, null, function* () {
     try {
       return response.json();
     } catch (e) {
@@ -1174,7 +1320,7 @@ function responseJson(response) {
   });
 }
 function lunkwillResponseUrl(lwResp) {
-  return __async$6(this, null, function* () {
+  return __async$5(this, null, function* () {
     const lwData = yield responseJson(lwResp);
     let delay = lwData.delay_ms;
     const retry = lwData.retry_ms !== void 0 ? lwData.retry_ms : 2e3;
@@ -1218,7 +1364,7 @@ function lunkwillResponseUrl(lwResp) {
   });
 }
 function lunkwillFetch(lwRespUrl) {
-  return __async$6(this, null, function* () {
+  return __async$5(this, null, function* () {
     try {
       return yield window.fetch(lwRespUrl, { credentials: "same-origin" });
     } catch (e) {
@@ -1266,14 +1412,14 @@ function generateUrl(path, query) {
   return path + urlParams;
 }
 function request(path, options, cacheEngine) {
-  return __async$6(this, null, function* () {
-    var _b;
+  return __async$5(this, null, function* () {
+    var _b, _c;
     const defaults = {
       method: "GET",
       credentials: "same-origin",
       headers: {}
     };
-    const _a = __spreadValues$7(__spreadValues$7({}, defaults), options), {
+    const _a = __spreadValues$6(__spreadValues$6({}, defaults), options), {
       withCredentials,
       responseType,
       cacheProps,
@@ -1292,6 +1438,7 @@ function request(path, options, cacheEngine) {
       "query",
       "json"
     ]);
+    opt.method = (_b = opt.method) == null ? void 0 : _b.toUpperCase();
     if (withCredentials) {
       opt.credentials = "include";
     }
@@ -1309,12 +1456,12 @@ function request(path, options, cacheEngine) {
       opt.headers = headers;
     }
     const url = generateUrl(path, query);
-    const makeRequest = () => __async$6(this, null, function* () {
+    const makeRequest = () => __async$5(null, null, function* () {
       let response;
       try {
         response = yield fetch(url, opt);
       } catch (e) {
-        if (e.name === "AbortError") {
+        if (opt.signal && opt.signal.aborted) {
           throw e;
         }
         throw new NetworksResponseError();
@@ -1349,49 +1496,61 @@ function request(path, options, cacheEngine) {
       }
       return body;
     });
-    if (cacheEngine && cache && ((_b = opt.method) == null ? void 0 : _b.toUpperCase()) === "GET") {
-      const cacheOptions = cacheProps ? cacheProps : __spreadValues$7({}, objectRemoveEmpty({
-        withCredentials,
-        responseType
-      }));
-      return cacheEngine.add(cacheName || url, makeRequest, cacheOptions, false);
+    if (cacheEngine) {
+      if (((_c = opt.method) == null ? void 0 : _c.toUpperCase()) === "GET") {
+        if (cache !== false) {
+          const props = cacheProps ? cacheProps : __spreadValues$6({}, objectRemoveEmpty({
+            withCredentials,
+            responseType
+          }));
+          return cacheEngine.add(cacheName || url, makeRequest, {
+            props,
+            expirationTime: cache ? void 0 : 500
+          });
+        }
+      } else {
+        const ignoredForClean = ["api/feature_layer/identify"];
+        if (ignoredForClean.every((part) => !path.includes(part))) {
+          cacheEngine.clean();
+        }
+      }
     }
     return makeRequest();
   });
 }
 
-var __defProp$9 = Object.defineProperty;
-var __defProps$3 = Object.defineProperties;
-var __getOwnPropDescs$3 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$6 = Object.getOwnPropertySymbols;
-var __hasOwnProp$6 = Object.prototype.hasOwnProperty;
-var __propIsEnum$6 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$9 = (obj, key, value) => key in obj ? __defProp$9(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$6.call(b, prop))
-      __defNormalProp$9(a, prop, b[prop]);
-  if (__getOwnPropSymbols$6)
-    for (var prop of __getOwnPropSymbols$6(b)) {
-      if (__propIsEnum$6.call(b, prop))
-        __defNormalProp$9(a, prop, b[prop]);
+var __defProp$7 = Object.defineProperty;
+var __defProps$4 = Object.defineProperties;
+var __getOwnPropDescs$4 = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$5 = Object.getOwnPropertySymbols;
+var __hasOwnProp$5 = Object.prototype.hasOwnProperty;
+var __propIsEnum$5 = 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$5 = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp$5.call(b, prop))
+      __defNormalProp$7(a, prop, b[prop]);
+  if (__getOwnPropSymbols$5)
+    for (var prop of __getOwnPropSymbols$5(b)) {
+      if (__propIsEnum$5.call(b, prop))
+        __defNormalProp$7(a, prop, b[prop]);
     }
   return a;
 };
-var __spreadProps$3 = (a, b) => __defProps$3(a, __getOwnPropDescs$3(b));
+var __spreadProps$4 = (a, b) => __defProps$4(a, __getOwnPropDescs$4(b));
 var __objRest$1 = (source, exclude) => {
   var target = {};
   for (var prop in source)
-    if (__hasOwnProp$6.call(source, prop) && exclude.indexOf(prop) < 0)
+    if (__hasOwnProp$5.call(source, prop) && exclude.indexOf(prop) < 0)
       target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols$6)
-    for (var prop of __getOwnPropSymbols$6(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum$6.call(source, prop))
+  if (source != null && __getOwnPropSymbols$5)
+    for (var prop of __getOwnPropSymbols$5(source)) {
+      if (exclude.indexOf(prop) < 0 && __propIsEnum$5.call(source, prop))
         target[prop] = source[prop];
     }
   return target;
 };
-var __async$5 = (__this, __arguments, generator) => {
+var __async$4 = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
       try {
@@ -1442,7 +1601,7 @@ function routeURL(name, baseUrl, routeData, ...rest) {
 }
 function route(name, connector, ...rest) {
   const result = {
-    url: (opt) => __async$5(this, null, function* () {
+    url: (opt) => __async$4(null, null, function* () {
       var _a;
       const routeData = yield connector.connect();
       const template = routeURL(
@@ -1456,45 +1615,37 @@ function route(name, connector, ...rest) {
   };
   const methods = ["get", "post", "put", "delete", "patch"];
   for (const method of methods) {
-    const methodResp = (requestOptions) => __async$5(this, null, function* () {
+    const methodResp = (requestOptions) => {
       var _b;
       const _a = requestOptions || {}, { headers: optHeaders } = _a, restOpt = __objRest$1(_a, ["headers"]);
-      const routeData = yield connector.connect();
-      const template = routeURL(
-        name,
-        (_b = connector.options.baseUrl) != null ? _b : "",
-        routeData,
-        ...rest
-      );
-      const headers = objectRemoveEmpty(__spreadValues$6(__spreadValues$6({}, connector.getAuthorizationHeaders()), optHeaders != null ? optHeaders : {}));
-      return request(
-        template,
-        __spreadProps$3(__spreadValues$6({
-          headers
-        }, restOpt), {
-          method
-        }),
-        connector.cache
-      );
-    });
+      if ((_b = requestOptions == null ? void 0 : requestOptions.signal) == null ? void 0 : _b.aborted) {
+        throw new AbortError();
+      }
+      return connector.connect().then((routeData) => {
+        var _a2;
+        const template = routeURL(
+          name,
+          (_a2 = connector.options.baseUrl) != null ? _a2 : "",
+          routeData,
+          ...rest
+        );
+        const headers = objectRemoveEmpty(__spreadValues$5(__spreadValues$5({}, connector.getAuthorizationHeaders()), optHeaders != null ? optHeaders : {}));
+        return request(
+          template,
+          __spreadProps$4(__spreadValues$5({
+            headers
+          }, restOpt), {
+            method
+          }),
+          connector.cache
+        );
+      });
+    };
     result[method] = methodResp;
   }
   return result;
 }
 
-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$5 = (obj, key, value) => __defNormalProp$8(obj, key + "" , value);
-class NetworkError extends Error {
-  constructor(url) {
-    super();
-    __publicField$5(this, "name", "NetworkError");
-    Object.setPrototypeOf(this, NetworkError.prototype);
-    this.message = `Unable to request ${url}.
-    Possibly invalid NGW URL entered or CORS not configured to get request from ${location.origin}`;
-  }
-}
-
 function isObject(val) {
   return Object.prototype.toString.call(val) === "[object Object]";
 }
@@ -1511,7 +1662,7 @@ let loadData;
     const getResponseText = () => {
       try {
         return JSON.parse(xhr.responseText);
-      } catch (er) {
+      } catch (e) {
         return xhr.responseText;
       }
     };
@@ -1581,52 +1732,63 @@ let loadData;
   };
 }
 
-const templateRe = /\{ *([\w_-]+) *\}/g;
-function template(str, data) {
-  return str.replace(templateRe, (s, key) => {
-    let value = data[key];
-    if (value === void 0) {
-      throw new Error("No value provided for letiable " + s);
-    } else if (typeof value === "function") {
-      value = value(data);
+const CONNECTORS = [];
+function addConnector(connector) {
+  CONNECTORS.push(connector);
+}
+function findConnector(options) {
+  return CONNECTORS.find((x) => {
+    if (x.options.baseUrl === options.baseUrl) {
+      if (options.auth) {
+        if (x.options.auth) {
+          return objectDeepEqual(x.options.auth, options.auth);
+        }
+      } else {
+        return true;
+      }
     }
-    return value;
   });
 }
+function removeConnector(connector) {
+  const index = CONNECTORS.indexOf(connector);
+  if (index !== -1) {
+    CONNECTORS.splice(index, 1);
+  }
+}
 
-var __defProp$7 = Object.defineProperty;
-var __defProps$2 = Object.defineProperties;
-var __getOwnPropDescs$2 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$5 = Object.getOwnPropertySymbols;
-var __hasOwnProp$5 = Object.prototype.hasOwnProperty;
-var __propIsEnum$5 = 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$5 = (a, b) => {
+var __defProp$6 = Object.defineProperty;
+var __defProps$3 = Object.defineProperties;
+var __getOwnPropDescs$3 = Object.getOwnPropertyDescriptors;
+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$5.call(b, prop))
-      __defNormalProp$7(a, prop, b[prop]);
-  if (__getOwnPropSymbols$5)
-    for (var prop of __getOwnPropSymbols$5(b)) {
-      if (__propIsEnum$5.call(b, prop))
-        __defNormalProp$7(a, prop, b[prop]);
+    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 __spreadProps$2 = (a, b) => __defProps$2(a, __getOwnPropDescs$2(b));
+var __spreadProps$3 = (a, b) => __defProps$3(a, __getOwnPropDescs$3(b));
 var __objRest = (source, exclude) => {
   var target = {};
   for (var prop in source)
-    if (__hasOwnProp$5.call(source, prop) && exclude.indexOf(prop) < 0)
+    if (__hasOwnProp$4.call(source, prop) && exclude.indexOf(prop) < 0)
       target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols$5)
-    for (var prop of __getOwnPropSymbols$5(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum$5.call(source, prop))
+  if (source != null && __getOwnPropSymbols$4)
+    for (var prop of __getOwnPropSymbols$4(source)) {
+      if (exclude.indexOf(prop) < 0 && __propIsEnum$4.call(source, prop))
         target[prop] = source[prop];
     }
   return target;
 };
-var __publicField$4 = (obj, key, value) => __defNormalProp$7(obj, typeof key !== "symbol" ? key + "" : key, value);
-var __async$4 = (__this, __arguments, generator) => {
+var __publicField$4 = (obj, key, value) => __defNormalProp$6(obj, typeof key !== "symbol" ? key + "" : key, value);
+var __async$3 = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
       try {
@@ -1656,12 +1818,16 @@ class NgwConnector {
     __publicField$4(this, "user");
     __publicField$4(this, "cache");
     __publicField$4(this, "withCredentials");
+    // Dedicated cache for route requests, as these are executed before any other requests.
+    // This cache does not need to be cleared during the session.
+    __publicField$4(this, "routeCache");
     __publicField$4(this, "client", `NextGIS-NGW-Connector/${pkg.version}`);
     __publicField$4(this, "routeStr", "/api/component/pyramid/route");
     __publicField$4(this, "activeRequests", {});
     __publicField$4(this, "requestTransform");
     const exist = findConnector(options);
     this.cache = new Cache({ namespace: options.cacheId });
+    this.routeCache = new Cache({ namespace: "routecache" });
     if (exist) {
       return exist;
     } else {
@@ -1711,7 +1877,9 @@ class NgwConnector {
    * ```
    */
   connect() {
-    return __async$4(this, null, function* () {
+    return __async$3(this, arguments, function* ({
+      signal
+    } = {}) {
       const auth = this.options.auth;
       if (auth) {
         const { login, password } = auth;
@@ -1720,18 +1888,9 @@ class NgwConnector {
         }
       }
       const routeUrl = `${this.routeStr}?client=${this.client}`;
-      return yield this.makeQuery(
-        routeUrl,
-        {},
-        {
-          cacheName: "route",
-          cache: true,
-          cacheProps: {
-            id: this.id,
-            auth,
-            baseUrl: this.options.baseUrl
-          }
-        }
+      return this.routeCache.add(
+        this.options.baseUrl || String(this.id),
+        () => this.makeQuery(routeUrl, null, { signal, cache: false })
       );
     });
   }
@@ -1752,18 +1911,19 @@ class NgwConnector {
     removeConnector(this);
     this.options.auth = void 0;
     this.user = void 0;
+    this.routeCache.clean();
     this.clearCache();
     this.emitter.emit("logout");
   }
   getUserInfo(credentials, options) {
-    return __async$4(this, null, function* () {
+    return __async$3(this, null, function* () {
       if (this.user && this.user.id) {
         return this.user;
       }
       if (credentials) {
         this.options.auth = credentials;
       }
-      const options_ = __spreadValues$5({
+      const options_ = __spreadValues$4({
         headers: this.getAuthorizationHeaders(credentials),
         cache: true
       }, options);
@@ -1790,7 +1950,7 @@ class NgwConnector {
     credentials = credentials || this.options.auth;
     if (credentials) {
       const { login, password } = credentials;
-      const encodedStr = [login, password].map(encodeURIComponent).join(":");
+      const encodedStr = `${login}:${password}`;
       {
         return window.btoa(encodedStr);
       }
@@ -1804,7 +1964,7 @@ class NgwConnector {
     this.activeRequests = {};
   }
   getActiveApiRequests() {
-    return __spreadValues$5({}, this.activeRequests);
+    return __spreadValues$4({}, this.activeRequests);
   }
   route(name, ...rest) {
     return route(name, this, ...rest);
@@ -1816,7 +1976,7 @@ class NgwConnector {
    * @param options - Request options
    */
   makeQuery(_0, _1) {
-    return __async$4(this, arguments, function* (url, params, options = {}) {
+    return __async$3(this, arguments, function* (url, params, options = {}) {
       var _b;
       url = (this.options.baseUrl ? this.options.baseUrl : "") + url;
       if (!url) {
@@ -1827,7 +1987,7 @@ class NgwConnector {
         url = template(url, restParams);
       }
       url = encodeURI(fixUrlStr(url));
-      options = __spreadValues$5({ withCredentials: this.withCredentials }, options);
+      options = __spreadValues$4({ withCredentials: this.withCredentials }, options);
       const {
         cache,
         signal: externalSignal,
@@ -1849,7 +2009,7 @@ class NgwConnector {
         });
       }
       options.signal = internalSignal;
-      const createPromise = () => __async$4(this, null, function* () {
+      const createPromise = () => __async$3(this, null, function* () {
         const id = REQUEST_ID++;
         this.activeRequests[id] = internalAbortController;
         try {
@@ -1858,8 +2018,8 @@ class NgwConnector {
           this._cleanActiveRequest(id);
         }
       });
-      if (method === "GET") {
-        const cacheOptions = cacheProps ? cacheProps : __spreadProps$2(__spreadValues$5({}, objectRemoveEmpty({
+      if (method === "GET" && cache !== false) {
+        const cacheOptions = cacheProps ? cacheProps : __spreadProps$3(__spreadValues$4({}, objectRemoveEmpty({
           headers,
           withCredentials,
           responseType,
@@ -1882,7 +2042,7 @@ class NgwConnector {
       var _a;
       if (this.user) {
         options = options || {};
-        options.headers = __spreadValues$5(__spreadValues$5({}, this.getAuthorizationHeaders()), options.headers);
+        options.headers = __spreadValues$4(__spreadValues$4({}, this.getAuthorizationHeaders()), options.headers);
       }
       if (this.requestTransform) {
         const [transUrl, transOptions] = this.requestTransform(url, options);
@@ -1913,7 +2073,7 @@ class NgwConnector {
     });
   }
   _login(credentials, options) {
-    return __async$4(this, null, function* () {
+    return __async$3(this, null, function* () {
       try {
         const data = yield this.getUserInfo(credentials, options);
         this.user = data;
@@ -1941,10 +2101,7 @@ class NgwConnector {
     return er;
   }
 }
-__publicField$4(NgwConnector, "errors", {
-  NgwError,
-  ResourceNotFoundError
-});
+__publicField$4(NgwConnector, "errors", errors);
 
 function resourceCompare(res1, res2) {
   return objectDeepEqual(res1, res2);
@@ -1958,7 +2115,10 @@ function resourceToQuery(resource, prefix = "") {
     if (exclude.indexOf(key) === -1) {
       if (isObject(value)) {
         if (key === "owner_user") {
-          const children = resourceToQuery(value, key);
+          const children = resourceToQuery(
+            value,
+            key
+          );
           Object.assign(query, children);
         } else if (key === "parent" && "id" in value) {
           query.parent_id = value.id;
@@ -1971,24 +2131,27 @@ function resourceToQuery(resource, prefix = "") {
   return query;
 }
 
-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) => {
+var __defProp$5 = 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;
+var __defNormalProp$5 = (obj, key, value) => key in obj ? __defProp$5(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$3 = (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]);
+    if (__hasOwnProp$3.call(b, prop))
+      __defNormalProp$5(a, prop, b[prop]);
+  if (__getOwnPropSymbols$3)
+    for (var prop of __getOwnPropSymbols$3(b)) {
+      if (__propIsEnum$3.call(b, prop))
+        __defNormalProp$5(a, prop, b[prop]);
     }
   return a;
 };
-var __publicField$3 = (obj, key, value) => __defNormalProp$6(obj, typeof key !== "symbol" ? key + "" : key, value);
-var __async$3 = (__this, __arguments, generator) => {
+var __spreadProps$2 = (a, b) => __defProps$2(a, __getOwnPropDescs$2(b));
+var __publicField$3 = (obj, key, value) => __defNormalProp$5(obj, typeof key !== "symbol" ? key + "" : key, value);
+var __async$2 = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
       try {
@@ -2029,7 +2192,7 @@ class ResourcesControl {
    * Fetching resource would be cached to speed up next call
    */
   getOne(resource, requestOptions) {
-    const opt = __spreadValues$4({}, requestOptions);
+    const opt = __spreadValues$3({}, requestOptions);
     if (typeof resource === "string") ; else if (typeof resource === "number") ; else if (isObject(resource)) {
       if (resource.id !== void 0) {
         resource.id;
@@ -2106,9 +2269,11 @@ class ResourcesControl {
         } else {
           Object.assign(query, resourceToQuery(resource));
         }
-        return this.connector.get("resource.search", requestOptions, __spreadValues$4({
-          serialization: "full"
-        }, query)).then((resources) => {
+        return this.connector.route("resource.search").get(__spreadProps$2(__spreadValues$3({}, requestOptions), {
+          query: __spreadValues$3({
+            serialization: "full"
+          }, query)
+        })).then((resources) => {
           if ((requestOptions == null ? void 0 : requestOptions.cache) && resources) {
             for (const x of resources) {
               this.cache.add("resource.item", Promise.resolve(x), {
@@ -2124,7 +2289,8 @@ class ResourcesControl {
   }
   getParent(resource, requestOptions) {
     return this.getOne(resource, requestOptions).then((child) => {
-      if (child) {
+      var _a, _b;
+      if ((_b = (_a = child == null ? void 0 : child.resource) == null ? void 0 : _a.parent) == null ? void 0 : _b.id) {
         return this.getOne(child.resource.parent.id, requestOptions);
       }
       return Promise.resolve(void 0);
@@ -2156,10 +2322,21 @@ class ResourcesControl {
       }
     });
   }
-  _getChildrenOf(parent, requestOptions, _items = []) {
-    return this.connector.get("resource.collection", requestOptions, {
-      parent
-    }).then((items) => {
+  _getChildrenOf(_0, _1) {
+    return __async$2(this, arguments, function* (parentDef, requestOptions, _items = []) {
+      let parent = void 0;
+      if (typeof parentDef === "string") {
+        parent = yield this.getId(parentDef, requestOptions);
+      } else if (typeof parentDef === "object") {
+        parent = parentDef.id;
+      } else {
+        parent = parentDef;
+      }
+      const items = yield this.connector.route("resource.collection").get(__spreadProps$2(__spreadValues$3({}, requestOptions), {
+        query: {
+          parent
+        }
+      }));
       const recursivePromises = [];
       for (const item of items) {
         if (requestOptions == null ? void 0 : requestOptions.cache) {
@@ -2183,7 +2360,7 @@ class ResourcesControl {
     });
   }
   _cleanResourceItemCache(id) {
-    return __async$3(this, null, function* () {
+    return __async$2(this, null, function* () {
       var _a;
       const all = this.cache.all();
       const toDelete = [];
@@ -2208,7 +2385,7 @@ class ResourcesControl {
     });
   }
   _fetchResourceById(id, requestOptions) {
-    return this.connector.get("resource.item", requestOptions, { id });
+    return this.connector.route("resource.item", { id }).get(requestOptions);
   }
   _fetchResourceBy(resource, requestOptions) {
     return this.getMany(resource, requestOptions).then((resources) => {
@@ -2236,93 +2413,6 @@ class ResourcesControl {
   }
 }
 
-var __defProp$5 = Object.defineProperty;
-var __getOwnPropSymbols$3 = Object.getOwnPropertySymbols;
-var __hasOwnProp$3 = Object.prototype.hasOwnProperty;
-var __propIsEnum$3 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$5 = (obj, key, value) => key in obj ? __defProp$5(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$3 = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp$3.call(b, prop))
-      __defNormalProp$5(a, prop, b[prop]);
-  if (__getOwnPropSymbols$3)
-    for (var prop of __getOwnPropSymbols$3(b)) {
-      if (__propIsEnum$3.call(b, prop))
-        __defNormalProp$5(a, prop, b[prop]);
-    }
-  return a;
-};
-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());
-  });
-};
-function apiRequest(opt) {
-  return __async$2(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 (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 (paramArray.length) {
-          url = `${url}?${paramArray.join("&")}`;
-        }
-      }
-      if (url) {
-        return connector.makeQuery(url, params, __spreadValues$3({
-          cacheName: name
-        }, requestOptions));
-      } else {
-        throw new Error("Request URL is not set");
-      }
-    } else {
-      return void 0;
-    }
-  });
-}
-
 var __defProp$4 = Object.defineProperty;
 var __defNormalProp$4 = (obj, key, value) => key in obj ? __defProp$4(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField$2 = (obj, key, value) => __defNormalProp$4(obj, key + "" , value);
@@ -2650,19 +2740,17 @@ var __async$1 = (__this, __arguments, generator) => {
 };
 const FEATURE_REQUEST_PARAMS = {
   srs: 4326,
-  geom_format: "geojson"
+  geom_format: "geojson",
+  dt_format: "iso"
 };
 function updateItemRequestParam(params, options) {
   const { extensions, geom, fields, srs, ilike, like } = options;
-  const extensionsStr = extensions ? extensions.join(",") : "";
-  if (extensionsStr !== "*") {
-    params.extensions = extensionsStr;
-  }
-  if (fields !== void 0 && fields !== null) {
-    params.fields = Array.isArray(fields) ? fields.join(",") : "";
+  params.extensions = extensions ? extensions : [];
+  if (fields) {
+    params.fields = fields;
   }
   if (geom !== void 0) {
-    params.geom = geom ? "yes" : "no";
+    params.geom = geom;
     if (!geom) {
       delete params.srs;
       delete params.geom_format;
@@ -2677,6 +2765,15 @@ function updateItemRequestParam(params, options) {
     params.srs = srs;
   }
 }
+function paramListToQuery(paramList) {
+  return paramList.reduce(
+    (acc, [key, value]) => {
+      acc[key] = value;
+      return acc;
+    },
+    {}
+  );
+}
 function createFeatureFieldFilterQueries(opt) {
   return __async$1(this, null, function* () {
     const queries = getQueries(opt);
@@ -2727,13 +2824,7 @@ function getQueries(opt, _queries = [], _parentAllParams = []) {
           }))
         );
       } else {
-        getQueries(
-          __spreadProps$1(__spreadValues$2({}, opt), {
-            filters: f
-          }),
-          _queries,
-          [..._parentAllParams]
-        );
+        getQueries(__spreadProps$1(__spreadValues$2({}, opt), { filters: f }), _queries, [..._parentAllParams]);
       }
     }
   } else if (logic === "all") {
@@ -2748,13 +2839,10 @@ function getQueries(opt, _queries = [], _parentAllParams = []) {
     }
     if (propertiesFilterList.length) {
       for (const x of propertiesFilterList) {
-        getQueries(
-          __spreadProps$1(__spreadValues$2({}, opt), {
-            filters: x
-          }),
-          _queries,
-          [..._parentAllParams, ...filters2]
-        );
+        getQueries(__spreadProps$1(__spreadValues$2({}, opt), { filters: x }), _queries, [
+          ..._parentAllParams,
+          ...filters2
+        ]);
       }
     } else {
       _queries.push(
@@ -2777,6 +2865,7 @@ function fetchNgwLayerItemsRequest(options) {
   const params = __spreadValues$2({}, FEATURE_REQUEST_PARAMS);
   const {
     limit,
+    query,
     cache,
     signal,
     offset,
@@ -2787,12 +2876,8 @@ function fetchNgwLayerItemsRequest(options) {
     intersects,
     resourceId
   } = options;
-  if (limit) {
-    if (limit !== Number.POSITIVE_INFINITY) {
-      params.limit = limit;
-    }
-  } else {
-    params.limit = 7e3;
+  if (typeof limit === "number" && limit !== Number.POSITIVE_INFINITY) {
+    params.limit = limit;
   }
   if (offset) {
     params.offset = offset;
@@ -2811,16 +2896,9 @@ function fetchNgwLayerItemsRequest(options) {
     params.intersects = intersects;
   }
   if (paramList) {
-    params.paramList = paramList;
-  }
-  const reqParams = __spreadValues$2({
-    id: resourceId
-  }, params);
-  return connector.get(
-    "feature_layer.feature.collection",
-    { cache, signal },
-    reqParams
-  );
+    Object.assign(params, paramListToQuery(paramList));
+  }
+  return connector.route("feature_layer.feature.collection", { id: Number(resourceId) }).get({ query: __spreadValues$2(__spreadValues$2({}, params), query), cache, signal });
 }
 
 function prepareNgwFieldsToPropertiesFilter(fields) {
@@ -3022,7 +3100,7 @@ const _NgwProvider = class _NgwProvider extends BaseProvider {
             yield item;
           }
         } catch (er) {
-          if (er && "name" in er && er.name !== "CancelError") {
+          if (er && "name" in er && er.name !== "AbortError") {
             console.warn(er);
           }
         }
@@ -3031,15 +3109,16 @@ const _NgwProvider = class _NgwProvider extends BaseProvider {
   }
   result(item) {
     const signal = this._makeSignal();
-    const req = this.connector.get(
-      "feature_layer.feature.item_extent",
-      { signal },
-      {
-        id: item.resourceId,
-        fid: item.featureId
-      }
-    ).then((x) => {
-      const e = x.extent;
+    const req = this.connector.route("feature_layer.feature.item_extent", {
+      id: item.resourceId,
+      fid: item.featureId
+    }).get({ signal }).then((x) => {
+      const e = x.extent || {
+        minLon: 0,
+        minLat: 0,
+        maxLon: 0,
+        maxLat: 0
+      };
       return {
         text: item.text,
         extent: [e.minLon, e.minLat, e.maxLon, e.maxLat]