@nextgis/geocoder 1.16.8 → 1.18.3

package/lib/geocoder.global.js

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/geocoder; version: 1.16.8; author: NextGIS */
+/** Bundle of @nextgis/geocoder; version: 1.18.3; author: NextGIS */
 var Geocoder = (function (exports) {
     'use strict';
 
@@ -16,7 +16,7 @@ var Geocoder = (function (exports) {
     OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
     PERFORMANCE OF THIS SOFTWARE.
     ***************************************************************************** */
-    /* global Reflect, Promise */
+    /* global Reflect, Promise, SuppressedError, Symbol */
 
     var extendStatics = function(d, b) {
         extendStatics = Object.setPrototypeOf ||
@@ -60,7 +60,7 @@ var Geocoder = (function (exports) {
         function verb(n) { return function (v) { return step([n, v]); }; }
         function step(op) {
             if (f) throw new TypeError("Generator is already executing.");
-            while (_) try {
+            while (g && (g = 0, op[0] && (_ = 0)), _) try {
                 if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
                 if (y = 0, t) op = [op[0] & 2, t.value];
                 switch (op[0]) {
@@ -126,599 +126,672 @@ var Geocoder = (function (exports) {
         return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
         function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
         function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
-    }
+    }
+
+    typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
+        var e = new Error(message);
+        return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
+    };
 
-    var CancelError = /** @class */ (function (_super) {
-        __extends(CancelError, _super);
-        function CancelError() {
-            var _this = _super.call(this) || this;
-            _this.name = 'CancelError';
-            Object.setPrototypeOf(_this, CancelError.prototype);
-            return _this;
-        }
-        return CancelError;
+    var CancelError = /** @class */ (function (_super) {
+        __extends(CancelError, _super);
+        function CancelError() {
+            var _this = _super.call(this) || this;
+            _this.name = 'CancelError';
+            Object.setPrototypeOf(_this, CancelError.prototype);
+            return _this;
+        }
+        return CancelError;
     }(Error));
 
-    var PromiseControl = /** @class */ (function () {
-        function PromiseControl(options) {
-            if (options === void 0) { options = {}; }
-            this.options = options;
-            this._promises = new Map();
-        }
-        Object.defineProperty(PromiseControl.prototype, "isLoaded", {
-            get: function () {
-                return this._promises.size > 0;
-            },
-            enumerable: false,
-            configurable: true
-        });
-        PromiseControl.prototype.remove = function (promise) {
-            if (this._promises.has(promise)) {
-                this._promises.delete(promise);
-                this._onStop();
-            }
-        };
-        PromiseControl.prototype.get = function (promise) {
-            return this._promises.get(promise);
-        };
-        PromiseControl.prototype.add = function (promise, name) {
-            var _this = this;
-            var key = name ? name : promise;
-            var 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(function () {
-                _this.remove(key);
-            });
-            return promise;
-        };
-        PromiseControl.prototype.abort = function () {
-            if (this.isLoaded) {
-                this._promises.forEach(function (x) {
-                    if (x.cancel) {
-                        x.cancel();
-                    }
-                });
-                this._promises.clear();
-                this._onStop();
-            }
-        };
-        PromiseControl.prototype.waitFunc = function (func, name) {
-            if (name === void 0) { name = ''; }
-            name = name || func.name;
-            var exist = this.get(name);
-            if (exist) {
-                return exist;
-            }
-            return this.add(func(), name);
-        };
-        PromiseControl.prototype.WaitForMe = function (name) {
-            if (name === void 0) { name = ''; }
-            var get = this.get.bind(this);
-            var add = this.add.bind(this);
-            return function (target, key, descriptor) {
-                var originalMethod = descriptor.value;
-                name = name || key;
-                descriptor.value = function () {
-                    var args = [];
-                    for (var _i = 0; _i < arguments.length; _i++) {
-                        args[_i] = arguments[_i];
-                    }
-                    var exist = get(name);
-                    if (exist) {
-                        return exist;
-                    }
-                    var result = add(originalMethod.apply(this, args), name);
-                    return result;
-                };
-                return descriptor;
-            };
-        };
-        /** @deprecated use {@link PromiseControl.WaitForMe } instead */
-        PromiseControl.prototype.GetOrCreateDecorator = function (name) {
-            if (name === void 0) { name = ''; }
-            return this.WaitForMe(name);
-        };
-        PromiseControl.prototype._onStop = function () {
-            if (this.options.onStop && !this.isLoaded) {
-                this.options.onStop();
-            }
-        };
-        return PromiseControl;
+    var PromiseControl = /** @class */ (function () {
+        function PromiseControl(options) {
+            if (options === void 0) { options = {}; }
+            this.options = options;
+            this._promises = new Map();
+        }
+        Object.defineProperty(PromiseControl.prototype, "isLoaded", {
+            get: function () {
+                return this._promises.size > 0;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        PromiseControl.prototype.remove = function (promise) {
+            if (this._promises.has(promise)) {
+                this._promises.delete(promise);
+                this._onStop();
+            }
+        };
+        PromiseControl.prototype.get = function (promise) {
+            return this._promises.get(promise);
+        };
+        PromiseControl.prototype.add = function (promise, name) {
+            var _this = this;
+            var key = name ? name : promise;
+            var 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(function () {
+                _this.remove(key);
+            });
+            return promise;
+        };
+        PromiseControl.prototype.abort = function () {
+            if (this.isLoaded) {
+                this._promises.forEach(function (x) {
+                    if (x.cancel) {
+                        x.cancel();
+                    }
+                });
+                this._promises.clear();
+                this._onStop();
+            }
+        };
+        PromiseControl.prototype.waitFunc = function (func, name) {
+            if (name === void 0) { name = ''; }
+            name = name || func.name;
+            var exist = this.get(name);
+            if (exist) {
+                return exist;
+            }
+            return this.add(func(), name);
+        };
+        PromiseControl.prototype.WaitForMe = function (name) {
+            if (name === void 0) { name = ''; }
+            var get = this.get.bind(this);
+            var add = this.add.bind(this);
+            return function (target, key, descriptor) {
+                var originalMethod = descriptor.value;
+                name = name || key;
+                descriptor.value = function () {
+                    var args = [];
+                    for (var _i = 0; _i < arguments.length; _i++) {
+                        args[_i] = arguments[_i];
+                    }
+                    var exist = get(name);
+                    if (exist) {
+                        return exist;
+                    }
+                    var result = add(originalMethod.apply(this, args), name);
+                    return result;
+                };
+                return descriptor;
+            };
+        };
+        /** @deprecated use {@link PromiseControl.WaitForMe } instead */
+        PromiseControl.prototype.GetOrCreateDecorator = function (name) {
+            if (name === void 0) { name = ''; }
+            return this.WaitForMe(name);
+        };
+        PromiseControl.prototype._onStop = function () {
+            if (this.options.onStop && !this.isLoaded) {
+                this.options.onStop();
+            }
+        };
+        return PromiseControl;
     }());
 
-    var TimeoutError = /** @class */ (function (_super) {
-        __extends(TimeoutError, _super);
-        function TimeoutError() {
-            var _this = _super.call(this) || this;
-            _this.name = 'TimeoutError';
-            Object.setPrototypeOf(_this, TimeoutError.prototype);
-            return _this;
-        }
-        return TimeoutError;
+    var TimeoutError = /** @class */ (function (_super) {
+        __extends(TimeoutError, _super);
+        function TimeoutError() {
+            var _this = _super.call(this) || this;
+            _this.name = 'TimeoutError';
+            Object.setPrototypeOf(_this, TimeoutError.prototype);
+            return _this;
+        }
+        return TimeoutError;
     }(Error));
 
-    var handleCallback = function (resolve, reject, callback, r) {
-        try {
-            resolve(callback(r));
-        }
-        catch (e) {
-            reject(e);
-        }
-    };
-    var ID$2 = 0;
-    /**
-     * Promise that can be canceled
-     *
-     * @example
-     * Catch `CancelError`
-     * ```javascript
-     * import CancelablePromise from "@nextgis/cancelable-promise";
-     *
-     * const promise = new CancelablePromise((resolve, reject) => {
-     *  setTimeout(() => resolve(), 100);
-     * }).catch((er) => {
-     *  if (er.name === "CancelError") {
-     *    // handle cancel error
-     *  }
-     *  throw er;
-     * });
-     *
-     * promise.cancel();
-     * ```
-     * @example
-     * Handle `onCancel` callback
-     * ```javascript
-     * import CancelablePromise from "@nextgis/cancelable-promise";
-     *
-     * const promise = new CancelablePromise((resolve, reject, onCancel) => {
-     *   const xhr = new XMLHttpRequest();
-     *   xhr.open("GET", url, true);
-     *   xhr.onload = () => {
-     *     resolve(xhr.responseText);
-     *   };
-     *   xhr.onerror = (er) => {
-     *     reject(er);
-     *   };
-     *
-     *   onCancel(() => {
-     *     xhr.abort();
-     *   });
-     *
-     *   xhr.send();
-     * });
-     *
-     * promise.cancel();
-     * ```
-     */
-    var CancelablePromise$1 = /** @class */ (function () {
-        function CancelablePromise(executor, timeout) {
-            var _this = this;
-            this.id = ID$2++;
-            this._isCanceled = false;
-            this._isPending = true;
-            this._cancelHandlers = [];
-            this._children = [];
-            this._cancelPromise = new Promise(function (resolve_, reject_) {
-                _this._setCanceledCallback = function (er) { return resolve_(er || new CancelError()); };
-            });
-            var promises = [
-                this._cancelPromise,
-                new Promise(function (resolve, reject) {
-                    var onResolve = function (value) {
-                        if (value instanceof CancelablePromise) {
-                            _this.attach(value);
-                        }
-                        else {
-                            _this._isPending = false;
-                        }
-                        // TODO: fix types, `undefined` not allowed since 19.12.2020
-                        resolve(value);
-                    };
-                    var onReject = function (error) {
-                        _this._isPending = false;
-                        reject(error);
-                    };
-                    var onCancel = function (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(function (resolve, reject) {
-                    setTimeout(function () {
-                        if (_this._isPending) {
-                            try {
-                                _this.cancel();
-                            }
-                            finally {
-                                reject(new TimeoutError());
-                            }
-                        }
-                    }, timeout);
-                }));
-            }
-            this._promise = Promise.race(promises);
-        }
-        CancelablePromise.createControl = function (opt) {
-            return new PromiseControl(opt);
-        };
-        CancelablePromise.resolve = function (value) {
-            return new CancelablePromise(function (resolve) { return resolve(value); });
-        };
-        CancelablePromise.reject = function (value) {
-            return new CancelablePromise(function (resolve, reject) { return reject(value); });
-        };
-        CancelablePromise.all = function (values) {
-            var _this = this;
-            return new CancelablePromise(function (resolve, reject) {
-                Promise.all(values).then(resolve).catch(reject);
-            }).catch(function (er) {
-                if (er instanceof _this.CancelError) {
-                    for (var _i = 0, values_1 = values; _i < values_1.length; _i++) {
-                        var v = values_1[_i];
-                        var v_ = v;
-                        if ('cancel' in v_) {
-                            v_.cancel();
-                        }
-                    }
-                }
-                throw er;
-            });
-        };
-        CancelablePromise.prototype.attach = function (p) {
-            if (this._isCanceled) {
-                p.cancel();
-            }
-            else {
-                this._children.push(p);
-            }
-        };
-        CancelablePromise.prototype.then = function (onfulfilled, onrejected) {
-            var _this = this;
-            var p = new CancelablePromise(function (resolve, reject) {
-                if (_this._promise) {
-                    var reject_1 = function (r) {
-                        if (onrejected) {
-                            handleCallback(resolve, reject, onrejected, r);
-                        }
-                        else {
-                            reject(r);
-                        }
-                    };
-                    _this._promise.then(function (r) {
-                        if (_this._isCanceled) {
-                            reject_1(r);
-                        }
-                        else {
-                            if (onfulfilled) {
-                                handleCallback(resolve, reject, onfulfilled, r);
-                            }
-                            else {
-                                resolve(r);
-                            }
-                        }
-                    }, reject_1);
-                }
-            });
-            p._parentPromise = this;
-            this._children.push(p);
-            return p;
-        };
-        CancelablePromise.prototype.catch = function (onrejected) {
-            if (this._isCanceled && onrejected) {
-                onrejected(new CancelError());
-            }
-            return this.then(undefined, onrejected);
-        };
-        CancelablePromise.prototype.finally = function (onfinally) {
-            if (this._promise) {
-                return this._promise.finally(onfinally);
-            }
-            if (this._isCanceled) {
-                return Promise.reject(new CancelError());
-            }
-            return Promise.reject(onfinally);
-        };
-        CancelablePromise.prototype.cancel = function () {
-            // No reason to run cancel action if promise is already complete
-            if (this._isCanceled || !this._isPending) {
-                return this;
-            }
-            this._isCanceled = true;
-            var parent = this._getTopParent();
-            if (parent) {
-                parent.cancel();
-            }
-            if (this._children) {
-                this._children.forEach(function (x) { return x.cancel(); });
-            }
-            if (this._isPending) {
-                if (this._cancelHandlers.length) {
-                    try {
-                        for (var _i = 0, _a = this._cancelHandlers; _i < _a.length; _i++) {
-                            var handler = _a[_i];
-                            handler();
-                        }
-                    }
-                    catch (error) {
-                        // this._setCanceledCallback(error);
-                    }
-                }
-                if (this._setCanceledCallback) {
-                    this._setCanceledCallback();
-                }
-            }
-            this._destroy();
-            return this;
-        };
-        CancelablePromise.prototype._getTopParent = function () {
-            var parent = this._parentPromise;
-            var hasParent = !!parent;
-            while (hasParent) {
-                if (parent && parent._parentPromise) {
-                    parent = parent._parentPromise;
-                    hasParent = !!parent;
-                }
-                else {
-                    hasParent = false;
-                }
-            }
-            return parent;
-        };
-        CancelablePromise.prototype._destroy = function () {
-            this._setCanceledCallback = undefined;
-            this._cancelPromise = undefined;
-            this._promise = undefined;
-        };
-        CancelablePromise.CancelError = CancelError;
-        CancelablePromise.TimeoutError = TimeoutError;
-        CancelablePromise.PromiseControl = PromiseControl;
-        return CancelablePromise;
-    }());
+    var handleCallback = function (resolve, reject, callback, r) {
+        try {
+            resolve(callback(r));
+        }
+        catch (e) {
+            reject(e);
+        }
+    };
+    var ID$2 = 0;
+    /**
+     * Promise that can be canceled
+     *
+     * @example
+     * Catch `CancelError`
+     * ```javascript
+     * import CancelablePromise from "@nextgis/cancelable-promise";
+     *
+     * const promise = new CancelablePromise((resolve, reject) => {
+     *  setTimeout(() => resolve(), 100);
+     * }).catch((er) => {
+     *  if (er.name === "CancelError") {
+     *    // handle cancel error
+     *  }
+     *  throw er;
+     * });
+     *
+     * promise.cancel();
+     * ```
+     * @example
+     * Handle `onCancel` callback
+     * ```javascript
+     * import CancelablePromise from "@nextgis/cancelable-promise";
+     *
+     * const promise = new CancelablePromise((resolve, reject, onCancel) => {
+     *   const xhr = new XMLHttpRequest();
+     *   xhr.open("GET", url, true);
+     *   xhr.onload = () => {
+     *     resolve(xhr.responseText);
+     *   };
+     *   xhr.onerror = (er) => {
+     *     reject(er);
+     *   };
+     *
+     *   onCancel(() => {
+     *     xhr.abort();
+     *   });
+     *
+     *   xhr.send();
+     * });
+     *
+     * promise.cancel();
+     * ```
+     */
+    var CancelablePromise$1 = /** @class */ (function () {
+        function CancelablePromise(executor, timeout) {
+            var _this = this;
+            this.id = ID$2++;
+            this._isCanceled = false;
+            this._isPending = true;
+            this._cancelHandlers = [];
+            this._children = [];
+            this._cancelPromise = new Promise(function (resolve_, reject_) {
+                _this._setCanceledCallback = function (er) { return resolve_(er || new CancelError()); };
+            });
+            var promises = [
+                this._cancelPromise,
+                new Promise(function (resolve, reject) {
+                    var onResolve = function (value) {
+                        if (value instanceof CancelablePromise) {
+                            _this.attach(value);
+                        }
+                        else {
+                            _this._isPending = false;
+                        }
+                        // TODO: fix types, `undefined` not allowed since 19.12.2020
+                        resolve(value);
+                    };
+                    var onReject = function (error) {
+                        _this._isPending = false;
+                        reject(error);
+                    };
+                    var onCancel = function (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(function (resolve, reject) {
+                    setTimeout(function () {
+                        if (_this._isPending) {
+                            try {
+                                _this.cancel();
+                            }
+                            finally {
+                                reject(new TimeoutError());
+                            }
+                        }
+                    }, timeout);
+                }));
+            }
+            this._promise = Promise.race(promises);
+        }
+        CancelablePromise.createControl = function (opt) {
+            return new PromiseControl(opt);
+        };
+        CancelablePromise.resolve = function (value) {
+            return new CancelablePromise(function (resolve) { return resolve(value); });
+        };
+        CancelablePromise.reject = function (value) {
+            return new CancelablePromise(function (resolve, reject) { return reject(value); });
+        };
+        CancelablePromise.all = function (values) {
+            var _this = this;
+            return new CancelablePromise(function (resolve, reject) {
+                Promise.all(values).then(resolve).catch(reject);
+            }).catch(function (er) {
+                if (er instanceof _this.CancelError) {
+                    for (var _i = 0, values_1 = values; _i < values_1.length; _i++) {
+                        var v = values_1[_i];
+                        var v_ = v;
+                        if ('cancel' in v_) {
+                            v_.cancel();
+                        }
+                    }
+                }
+                throw er;
+            });
+        };
+        CancelablePromise.prototype.attach = function (p) {
+            if (this._isCanceled) {
+                p.cancel();
+            }
+            else {
+                this._children.push(p);
+            }
+        };
+        CancelablePromise.prototype.then = function (onfulfilled, onrejected) {
+            var _this = this;
+            var p = new CancelablePromise(function (resolve, reject) {
+                if (_this._promise) {
+                    var reject_1 = function (r) {
+                        if (onrejected) {
+                            handleCallback(resolve, reject, onrejected, r);
+                        }
+                        else {
+                            reject(r);
+                        }
+                    };
+                    _this._promise.then(function (r) {
+                        if (_this._isCanceled) {
+                            reject_1(r);
+                        }
+                        else {
+                            if (onfulfilled) {
+                                handleCallback(resolve, reject, onfulfilled, r);
+                            }
+                            else {
+                                resolve(r);
+                            }
+                        }
+                    }, reject_1);
+                }
+            });
+            p._parentPromise = this;
+            this._children.push(p);
+            return p;
+        };
+        CancelablePromise.prototype.catch = function (onrejected) {
+            if (this._isCanceled && onrejected) {
+                onrejected(new CancelError());
+            }
+            return this.then(undefined, onrejected);
+        };
+        CancelablePromise.prototype.finally = function (onfinally) {
+            if (this._promise) {
+                return this._promise.finally(onfinally);
+            }
+            if (this._isCanceled) {
+                return Promise.reject(new CancelError());
+            }
+            return Promise.reject(onfinally);
+        };
+        CancelablePromise.prototype.cancel = function () {
+            // No reason to run cancel action if promise is already complete
+            if (this._isCanceled || !this._isPending) {
+                return this;
+            }
+            this._isCanceled = true;
+            var parent = this._getTopParent();
+            if (parent) {
+                parent.cancel();
+            }
+            if (this._children) {
+                this._children.forEach(function (x) { return x.cancel(); });
+            }
+            if (this._isPending) {
+                if (this._cancelHandlers.length) {
+                    try {
+                        for (var _i = 0, _a = this._cancelHandlers; _i < _a.length; _i++) {
+                            var handler = _a[_i];
+                            handler();
+                        }
+                    }
+                    catch (error) {
+                        // this._setCanceledCallback(error);
+                    }
+                }
+                if (this._setCanceledCallback) {
+                    this._setCanceledCallback();
+                }
+            }
+            this._destroy();
+            return this;
+        };
+        CancelablePromise.prototype._getTopParent = function () {
+            var parent = this._parentPromise;
+            var hasParent = !!parent;
+            while (hasParent) {
+                if (parent && parent._parentPromise) {
+                    parent = parent._parentPromise;
+                    hasParent = !!parent;
+                }
+                else {
+                    hasParent = false;
+                }
+            }
+            return parent;
+        };
+        CancelablePromise.prototype._destroy = function () {
+            this._setCanceledCallback = undefined;
+            this._cancelPromise = undefined;
+            this._promise = undefined;
+        };
+        CancelablePromise.CancelError = CancelError;
+        CancelablePromise.TimeoutError = TimeoutError;
+        CancelablePromise.PromiseControl = PromiseControl;
+        return CancelablePromise;
+    }());
     Object.setPrototypeOf(CancelablePromise$1.prototype, Promise.prototype);
 
-    /**
-     * A promise you can stop
-     *
-     * @packageDocumentation
-     * @module cancelable-promise
-     */
+    /**
+     * A promise you can stop
+     *
+     * @packageDocumentation
+     * @module cancelable-promise
+     */
     var CancelablePromise = CancelablePromise$1;
 
-    /**
-     * from https://github.com/CesiumGS/cesium/blob/master/Source/Core/defined.js
-     *
-     * @param val - The object.
-     * @returns Returns true if the object is defined, returns false otherwise.
-     *
-     * @example
-     * ```javascript
-     * if (defined(positions)) {
-     *   doSomething();
-     * } else {
-     *   doSomethingElse();
-     * }
-     * ```
-     */
-    function defined(val) {
-        return val !== undefined && val !== null;
-    }
-    /**
-     * from https://github.com/CesiumGS/cesium/blob/master/Source/Core/defined.js
-     *
-     * @param val - The object.
-     * @returns Returns true if the object is defined and not empty string, returns false otherwise.
-     *
-     * @example
-     * ```javascript
-     * full('foo') // true
-     * full('') // false
-     * full(undefined) // false
-     * full(0) // true
-     * ```
-     */
-    function full(val) {
-        return typeof val === 'string' ? !!val : defined(val);
+    /**
+     * from https://github.com/CesiumGS/cesium/blob/master/Source/Core/defined.js
+     *
+     * @param val - The object.
+     * @returns Returns true if the object is defined, returns false otherwise.
+     *
+     * @example
+     * ```javascript
+     * if (defined(positions)) {
+     *   doSomething();
+     * } else {
+     *   doSomethingElse();
+     * }
+     * ```
+     */
+    function defined(val) {
+        return val !== undefined && val !== null;
+    }
+    /**
+     * from https://github.com/CesiumGS/cesium/blob/master/Source/Core/defined.js
+     *
+     * @param val - The object.
+     * @returns Returns true if the object is defined and not empty string, returns false otherwise.
+     *
+     * @example
+     * ```javascript
+     * full('foo') // true
+     * full('') // false
+     * full(undefined) // false
+     * full(0) // true
+     * ```
+     */
+    function full(val) {
+        return typeof val === 'string' ? !!val : defined(val);
     }
 
-    /**
-     * Copy the values of all of the enumerable own properties from one or more source objects to a
-     * target object. Returns the target object.
-     * @param target - The target object to copy to.
-     * @param sources - One or more source objects from which to copy properties
-     */
-    function objectAssign(target) {
-        var sources = [];
-        for (var _i = 1; _i < arguments.length; _i++) {
-            sources[_i - 1] = arguments[_i];
-        }
-        for (var _a = 0, sources_1 = sources; _a < sources_1.length; _a++) {
-            var source = sources_1[_a];
-            for (var _b = 0, _c = Object.getOwnPropertyNames(source); _b < _c.length; _b++) {
-                var prop = _c[_b];
-                target[prop] = source[prop];
-            }
-        }
+    function getBoundsCoordinates(b) {
+        var westNorth = [b[0], b[1]];
+        var eastNorth = [b[2], b[1]];
+        var eastSouth = [b[2], b[3]];
+        var westSouth = [b[0], b[3]];
+        return [westNorth, eastNorth, eastSouth, westSouth, westNorth];
     }
 
-    function isEqual(a, b, o, p) {
-        if (a instanceof Array) {
-            if (!(b instanceof Array))
-                return false;
-            //if (compareObjects(oVal, pVal === false) return false
-            //would work, too, and perhaps is a better fit, still, this is easy, too
-            return b.sort().join('') === a.sort().join('');
-        }
-        else if (a instanceof Date) {
-            if (!(b instanceof Date))
-                return false;
-            return '' + a === '' + b;
-        }
-        else if (a instanceof Function) {
-            if (!(b instanceof Function))
-                return false;
-            //ignore functions, or check them regardless?
-        }
-        else if (a instanceof Object) {
-            if (!(b instanceof Object))
-                return false;
-            if (a === o) {
-                return b === p;
-            }
-            else {
-                return objectDeepEqual(a, b);
-            }
-        }
-        return a === b;
-    }
-    // based on https://stackoverflow.com/a/13143059
-    function objectDeepEqual(o, p) {
-        var keysO = Object.keys(o).sort();
-        var keysP = Object.keys(p).sort();
-        if (keysO.length !== keysP.length)
-            return false;
-        if (keysO.join('') !== keysP.join(''))
-            return false;
-        for (var i = 0; i < keysO.length; i++) {
-            var oVal = o[keysO[i]];
-            var pVal = p[keysP[i]];
-            if (!isEqual(oVal, pVal, o, p)) {
-                return false;
-            }
-        }
-        return true;
+    function degrees2meters(lng, lat) {
+        lat = lat > 85.06 ? 85.06 : lat < -85.06 ? -85.06 : lat;
+        var x = (lng * 20037508.34) / 180;
+        var y = Math.log(Math.tan(((90 + lat) * Math.PI) / 360)) / (Math.PI / 180);
+        y = (y * 20037508.34) / 180;
+        return [x, y];
+    }
+    // export function degrees2meters2(lon: number, lat: number): [number, number] {
+    //   const radius = 6378137.0;
+    //   const x = (radius * lon * Math.PI) / 180.0;
+    //   const y =
+    //     radius * Math.log(Math.tan(Math.PI / 4.0 + (lat * Math.PI) / 360.0));
+    //   return [x, y];
+    // }
+    // export function meters2degress2(x: number, y: number): LngLatArray {
+    //   const radius = 6378137.0;
+    //   const lon = (180 / Math.PI) * (x / radius);
+    //   const lat = (360 / Math.PI) * (Math.atan(Math.exp(y / radius)) - Math.PI / 4);
+    //   return [lon, lat];
+    // }
+    // const lon = -77.035974;
+    // const lat = 38.898717;
+    // console.log(degrees2meters(lon, lat), degrees2meters2(lon, lat));
+    // const x = -8575605.398443861;
+    // const y = 4707174.018280405;
+    // console.log(meters2degress(x, y), meters2degress2(x, y));
+
+    function isLngLatBoundsArray(array) {
+        return (Array.isArray(array) &&
+            array.length === 4 &&
+            array.every(function (x) { return typeof x === 'number'; }));
     }
 
-    function objectRemoveEmpty(obj) {
-        var newObj = {};
-        Object.keys(obj).forEach(function (key) {
-            if (!(obj[key] instanceof Array) && obj[key] === Object(obj[key])) {
-                newObj[key] = objectRemoveEmpty(obj[key]);
-            }
-            else if (obj[key] !== undefined) {
-                newObj[key] = obj[key];
-            }
-        });
-        return newObj;
+    /**
+     * Copy the values of all of the enumerable own properties from one or more source objects to a
+     * target object. Returns the target object.
+     * @param target - The target object to copy to.
+     * @param sources - One or more source objects from which to copy properties
+     */
+    function objectAssign(target) {
+        var sources = [];
+        for (var _i = 1; _i < arguments.length; _i++) {
+            sources[_i - 1] = arguments[_i];
+        }
+        for (var _a = 0, sources_1 = sources; _a < sources_1.length; _a++) {
+            var source = sources_1[_a];
+            for (var _b = 0, _c = Object.getOwnPropertyNames(source); _b < _c.length; _b++) {
+                var prop = _c[_b];
+                target[prop] = source[prop];
+            }
+        }
+    }
+
+    function isEqual(a, b, o, p) {
+        if (a instanceof Array) {
+            if (!(b instanceof Array))
+                return false;
+            //if (compareObjects(oVal, pVal === false) return false
+            //would work, too, and perhaps is a better fit, still, this is easy, too
+            return b.sort().join('') === a.sort().join('');
+        }
+        else if (a instanceof Date) {
+            if (!(b instanceof Date))
+                return false;
+            return '' + a === '' + b;
+        }
+        else if (a instanceof Function) {
+            if (!(b instanceof Function))
+                return false;
+            //ignore functions, or check them regardless?
+        }
+        else if (a instanceof Object) {
+            if (!(b instanceof Object))
+                return false;
+            if (a === o) {
+                return b === p;
+            }
+            else {
+                return objectDeepEqual(a, b);
+            }
+        }
+        return a === b;
+    }
+    // based on https://stackoverflow.com/a/13143059
+    function objectDeepEqual(o, p) {
+        var keysO = Object.keys(o).sort();
+        var keysP = Object.keys(p).sort();
+        if (keysO.length !== keysP.length)
+            return false;
+        if (keysO.join('') !== keysP.join(''))
+            return false;
+        for (var i = 0; i < keysO.length; i++) {
+            var oVal = o[keysO[i]];
+            var pVal = p[keysP[i]];
+            if (!isEqual(oVal, pVal, o, p)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    function objectRemoveEmpty(obj) {
+        var newObj = {};
+        Object.keys(obj).forEach(function (key) {
+            if (!(obj[key] instanceof Array) && obj[key] === Object(obj[key])) {
+                newObj[key] = objectRemoveEmpty(obj[key]);
+            }
+            else if (obj[key] !== undefined) {
+                newObj[key] = obj[key];
+            }
+        });
+        return newObj;
     }
 
-    function fixUrlStr(url) {
-        // remove double slash
-        return url.replace(/([^:]\/)\/+/g, '$1');
+    function round(val, toFixed) {
+        var n = toFixed ? Number('1e+' + toFixed) : 1;
+        return Math.round((val + Number.EPSILON) * n) / n;
     }
 
-    var BaseGeocoder = /** @class */ (function () {
-        function BaseGeocoder(options) {
-            if (options) {
-                objectAssign(this, options);
-            }
-        }
-        return BaseGeocoder;
+    function isObject$1(val) {
+        return Object.prototype.toString.call(val) === '[object Object]';
+    }
+    function isArray(val) {
+        return Object.prototype.toString.call(val) === '[object Array]';
+    }
+
+    function fixUrlStr(url) {
+        // remove double slash
+        return url.replace(/([^:]\/)\/+/g, '$1');
+    }
+
+    /**
+     * Represents the base class for a geocoder.
+     * This abstract class provides the basic methods that every geocoder should implement.
+     *
+     * @template O - The type of options that can be passed to the geocoder.
+     */
+    var BaseGeocoder = /** @class */ (function () {
+        function BaseGeocoder(options) {
+            if (options) {
+                objectAssign(this, options);
+            }
+        }
+        return BaseGeocoder;
     }());
 
-    var ID$1 = 0;
-    var Geocoder = /** @class */ (function (_super) {
-        __extends(Geocoder, _super);
-        function Geocoder(options) {
-            var _this = _super.call(this, options) || this;
-            _this.providers = [];
-            if (options && options.providers) {
-                _this.providers = options.providers;
-            }
-            return _this;
-        }
-        Geocoder.prototype.abort = function () {
-            this.providers.forEach(function (x) {
-                if (x.abort) {
-                    x.abort();
-                }
-            });
-        };
-        Geocoder.prototype.search = function (query) {
-            return __asyncGenerator(this, arguments, function search_1() {
-                var _i, _a, provider, results, results_1, results_1_1, r, e_1_1;
-                var e_1, _b;
-                return __generator(this, function (_c) {
-                    switch (_c.label) {
-                        case 0:
-                            _i = 0, _a = this.providers;
-                            _c.label = 1;
-                        case 1:
-                            if (!(_i < _a.length)) return [3 /*break*/, 19];
-                            provider = _a[_i];
-                            _c.label = 2;
-                        case 2:
-                            _c.trys.push([2, 17, , 18]);
-                            results = provider.search(query);
-                            _c.label = 3;
-                        case 3:
-                            _c.trys.push([3, 10, 11, 16]);
-                            results_1 = (e_1 = void 0, __asyncValues(results));
-                            _c.label = 4;
-                        case 4: return [4 /*yield*/, __await(results_1.next())];
-                        case 5:
-                            if (!(results_1_1 = _c.sent(), !results_1_1.done)) return [3 /*break*/, 9];
-                            r = results_1_1.value;
-                            return [4 /*yield*/, __await(__assign(__assign({}, r), { provider: provider, _id: ID$1++ }))];
-                        case 6: return [4 /*yield*/, _c.sent()];
-                        case 7:
-                            _c.sent();
-                            _c.label = 8;
-                        case 8: return [3 /*break*/, 4];
-                        case 9: return [3 /*break*/, 16];
-                        case 10:
-                            e_1_1 = _c.sent();
-                            e_1 = { error: e_1_1 };
-                            return [3 /*break*/, 16];
-                        case 11:
-                            _c.trys.push([11, , 14, 15]);
-                            if (!(results_1_1 && !results_1_1.done && (_b = results_1.return))) return [3 /*break*/, 13];
-                            return [4 /*yield*/, __await(_b.call(results_1))];
-                        case 12:
-                            _c.sent();
-                            _c.label = 13;
-                        case 13: return [3 /*break*/, 15];
-                        case 14:
-                            if (e_1) throw e_1.error;
-                            return [7 /*endfinally*/];
-                        case 15: return [7 /*endfinally*/];
-                        case 16: return [3 /*break*/, 18];
-                        case 17:
-                            _c.sent();
-                            return [3 /*break*/, 18];
-                        case 18:
-                            _i++;
-                            return [3 /*break*/, 1];
-                        case 19: return [2 /*return*/];
-                    }
-                });
-            });
-        };
-        Geocoder.prototype.result = function (item) {
-            if (item.provider) {
-                return item.provider.result(item);
-            }
-            return CancelablePromise.resolve(undefined);
-        };
-        return Geocoder;
+    var ID$1 = 0;
+    var Geocoder = /** @class */ (function (_super) {
+        __extends(Geocoder, _super);
+        function Geocoder(options) {
+            var _this = _super.call(this, options) || this;
+            _this.providers = [];
+            if (options && options.providers) {
+                _this.providers = options.providers;
+            }
+            return _this;
+        }
+        Geocoder.prototype.abort = function () {
+            this.providers.forEach(function (x) {
+                if (x.abort) {
+                    x.abort();
+                }
+            });
+        };
+        Geocoder.prototype.search = function (query) {
+            return __asyncGenerator(this, arguments, function search_1() {
+                var _i, _a, provider, results, _b, results_1, results_1_1, r, e_1_1;
+                var _c, e_1, _d, _e;
+                return __generator(this, function (_f) {
+                    switch (_f.label) {
+                        case 0:
+                            _i = 0, _a = this.providers;
+                            _f.label = 1;
+                        case 1:
+                            if (!(_i < _a.length)) return [3 /*break*/, 19];
+                            provider = _a[_i];
+                            _f.label = 2;
+                        case 2:
+                            _f.trys.push([2, 17, , 18]);
+                            results = provider.search(query);
+                            _f.label = 3;
+                        case 3:
+                            _f.trys.push([3, 10, 11, 16]);
+                            _b = true, results_1 = (e_1 = void 0, __asyncValues(results));
+                            _f.label = 4;
+                        case 4: return [4 /*yield*/, __await(results_1.next())];
+                        case 5:
+                            if (!(results_1_1 = _f.sent(), _c = results_1_1.done, !_c)) return [3 /*break*/, 9];
+                            _e = results_1_1.value;
+                            _b = false;
+                            r = _e;
+                            return [4 /*yield*/, __await(__assign(__assign({}, r), { provider: provider, _id: ID$1++ }))];
+                        case 6: return [4 /*yield*/, _f.sent()];
+                        case 7:
+                            _f.sent();
+                            _f.label = 8;
+                        case 8:
+                            _b = true;
+                            return [3 /*break*/, 4];
+                        case 9: return [3 /*break*/, 16];
+                        case 10:
+                            e_1_1 = _f.sent();
+                            e_1 = { error: e_1_1 };
+                            return [3 /*break*/, 16];
+                        case 11:
+                            _f.trys.push([11, , 14, 15]);
+                            if (!(!_b && !_c && (_d = results_1.return))) return [3 /*break*/, 13];
+                            return [4 /*yield*/, __await(_d.call(results_1))];
+                        case 12:
+                            _f.sent();
+                            _f.label = 13;
+                        case 13: return [3 /*break*/, 15];
+                        case 14:
+                            if (e_1) throw e_1.error;
+                            return [7 /*endfinally*/];
+                        case 15: return [7 /*endfinally*/];
+                        case 16: return [3 /*break*/, 18];
+                        case 17:
+                            _f.sent();
+                            return [3 /*break*/, 18];
+                        case 18:
+                            _i++;
+                            return [3 /*break*/, 1];
+                        case 19: return [2 /*return*/];
+                    }
+                });
+            });
+        };
+        Geocoder.prototype.result = function (item) {
+            if (item.provider) {
+                return item.provider.result(item);
+            }
+            return CancelablePromise.resolve(undefined);
+        };
+        return Geocoder;
     }(BaseGeocoder));
 
-    var BaseProvider = /** @class */ (function (_super) {
-        __extends(BaseProvider, _super);
-        function BaseProvider() {
-            return _super !== null && _super.apply(this, arguments) || this;
-        }
-        return BaseProvider;
+    /**
+     * Abstract base class representing a search provider.
+     * It builds upon the BaseGeocoder functionalities with provider-specific properties.
+     * @template O - Options type which extends BaseProviderOptions.
+     */
+    var BaseProvider = /** @class */ (function (_super) {
+        __extends(BaseProvider, _super);
+        function BaseProvider() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        return BaseProvider;
     }(BaseGeocoder));
 
     var events = {exports: {}};
@@ -1197,1455 +1270,1799 @@ var Geocoder = (function (exports) {
       }
     }
 
-    /**
-     * @example
-     * ```javascript
-     * const cache1 = new Cache();
-     * cache1.add('foo', 'value');
-     *
-     * const cache2 = new Cache();
-     * cache2.match('foo'); // value
-     *
-     * const cache3 = new Cache({ namespace: 'foo' });
-     * cache3.match('foo'); // undefined
-     * ```
-     *
-     * @example
-     * ```javascript
-     * let COUNTER = 0;
-     * const createPromise = () => new Promise((res) => {
-     *   COUNTER++
-     *   setTimeout(() => res('Ok'), 300)
-     * });
-     *
-     * const cache = new Cache();
-     * for (let i = 0; i < 10; i++) {
-     *   cache.add('foo', createPromise).then((data) => {
-     *     console.log(data); // 'Ok'
-     *   });
-     * }
-     * console.log(COUNTER); // 1
-     * ```
-     */
-    var Cache$1 = /** @class */ (function () {
-        function Cache(options) {
-            if (options === void 0) { options = {}; }
-            var _a;
-            this.cache = [];
-            var namespace = (_a = options.namespace) !== null && _a !== void 0 ? _a : 'default';
-            if (Cache.instance[namespace]) {
-                return Cache.instance[namespace];
-            }
-            Cache.instance[namespace] = this;
-            return this;
-        }
-        Cache.prototype.clean = function () {
-            this.cache.length = 0;
-        };
-        Cache.prototype.all = function () {
-            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'
-         * })
-         *
-         * ```
-         */
-        Cache.prototype.addFull = function (key, valueToSet, props) {
-            return this.add(key, valueToSet, props, true);
-        };
-        Cache.prototype.add = function (key, valueToSet, props, onlyFull) {
-            var _this = this;
-            var exist = this._find(key, props);
-            if (!exist) {
-                var value = void 0;
-                if (valueToSet instanceof Function) {
-                    value = valueToSet();
-                }
-                else {
-                    value = valueToSet;
-                }
-                var props_ = props && JSON.parse(JSON.stringify(objectRemoveEmpty(props)));
-                var cacheItem = {
-                    key: key,
-                    value: value,
-                    props: props_,
-                    // TODO: remove backward compatibility use only props
-                    options: props_,
-                };
-                if (onlyFull && !full(value)) {
-                    return value;
-                }
-                this.cache.push(cacheItem);
-                if (value instanceof Promise) {
-                    value.catch(function (er) {
-                        _this.delete(key, props);
-                        throw er;
-                    });
-                    if (onlyFull) {
-                        value.then(function (x) {
-                            if (!full(x)) {
-                                _this.delete(key, props);
-                            }
-                            return x;
-                        });
-                    }
-                    return value;
-                }
-                return value;
-            }
-            else {
-                return exist.value;
-            }
-        };
-        Cache.prototype.match = function (key, props) {
-            var cacheRecord = this._find(key, props);
-            if (cacheRecord) {
-                return cacheRecord.value;
-            }
-        };
-        Cache.prototype.matchAll = function (key, props) {
-            var _this = this;
-            if (key) {
-                return this.cache
-                    .filter(function (x) { return _this._filter(x, key, props); })
-                    .map(function (x) { return x.value; });
-            }
-            return this.cache.map(function (x) { return x.value; });
-        };
-        Cache.prototype.delete = function (keyOrItem, props) {
-            var _this = this;
-            var exist = [];
-            if (typeof keyOrItem === 'string') {
-                exist = this.cache.filter(function (x) { return _this._filter(x, keyOrItem, props); });
-            }
-            else {
-                exist.push(keyOrItem);
-            }
-            for (var _i = 0, exist_1 = exist; _i < exist_1.length; _i++) {
-                var e = exist_1[_i];
-                var index = this.cache.indexOf(e);
-                this.cache.splice(index, 1);
-            }
-        };
-        Cache.prototype._find = function (key, props) {
-            var _this = this;
-            return this.cache.find(function (x) { return _this._filter(x, key, props); });
-        };
-        Cache.prototype._filter = function (item, key, props) {
-            if (item.key === key) {
-                if (props) {
-                    // TODO: remove backward compatibility
-                    var itemProps = item.props || item.options;
-                    return objectDeepEqual(itemProps || {}, objectRemoveEmpty(props));
-                }
-                return true;
-            }
-            return false;
-        };
-        Cache.instance = {};
-        return Cache;
+    /**
+     * @example
+     * ```javascript
+     * const cache1 = new Cache();
+     * cache1.add('foo', 'value');
+     *
+     * const cache2 = new Cache();
+     * cache2.match('foo'); // value
+     *
+     * const cache3 = new Cache({ namespace: 'foo' });
+     * cache3.match('foo'); // undefined
+     * ```
+     *
+     * @example
+     * ```javascript
+     * let COUNTER = 0;
+     * const createPromise = () => new Promise((res) => {
+     *   COUNTER++
+     *   setTimeout(() => res('Ok'), 300)
+     * });
+     *
+     * const cache = new Cache();
+     * for (let i = 0; i < 10; i++) {
+     *   cache.add('foo', createPromise).then((data) => {
+     *     console.log(data); // 'Ok'
+     *   });
+     * }
+     * console.log(COUNTER); // 1
+     * ```
+     */
+    var Cache$1 = /** @class */ (function () {
+        function Cache(options) {
+            if (options === void 0) { options = {}; }
+            var _a;
+            this.cache = [];
+            var namespace = (_a = options.namespace) !== null && _a !== void 0 ? _a : 'default';
+            if (Cache.instance[namespace]) {
+                return Cache.instance[namespace];
+            }
+            Cache.instance[namespace] = this;
+            return this;
+        }
+        Cache.prototype.clean = function () {
+            this.cache.length = 0;
+        };
+        Cache.prototype.all = function () {
+            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'
+         * })
+         *
+         * ```
+         */
+        Cache.prototype.addFull = function (key, valueToSet, props) {
+            return this.add(key, valueToSet, props, true);
+        };
+        Cache.prototype.add = function (key, valueToSet, props, onlyFull) {
+            var _this = this;
+            var exist = this._find(key, props);
+            if (!exist) {
+                var value = void 0;
+                if (valueToSet instanceof Function) {
+                    value = valueToSet();
+                }
+                else {
+                    value = valueToSet;
+                }
+                var props_ = props && JSON.parse(JSON.stringify(objectRemoveEmpty(props)));
+                var cacheItem = {
+                    key: key,
+                    value: value,
+                    props: props_,
+                    // TODO: remove backward compatibility use only props
+                    options: props_,
+                };
+                if (onlyFull && !full(value)) {
+                    return value;
+                }
+                this.cache.push(cacheItem);
+                if (value instanceof Promise) {
+                    value.catch(function (er) {
+                        _this.delete(key, props);
+                        throw er;
+                    });
+                    if (onlyFull) {
+                        value.then(function (x) {
+                            if (!full(x)) {
+                                _this.delete(key, props);
+                            }
+                            return x;
+                        });
+                    }
+                    return value;
+                }
+                return value;
+            }
+            else {
+                return exist.value;
+            }
+        };
+        Cache.prototype.match = function (key, props) {
+            var cacheRecord = this._find(key, props);
+            if (cacheRecord) {
+                return cacheRecord.value;
+            }
+        };
+        Cache.prototype.matchAll = function (key, props) {
+            var _this = this;
+            if (key) {
+                return this.cache
+                    .filter(function (x) { return _this._filter(x, key, props); })
+                    .map(function (x) { return x.value; });
+            }
+            return this.cache.map(function (x) { return x.value; });
+        };
+        Cache.prototype.delete = function (keyOrItem, props) {
+            var _this = this;
+            var exist = [];
+            if (typeof keyOrItem === 'string') {
+                exist = this.cache.filter(function (x) { return _this._filter(x, keyOrItem, props); });
+            }
+            else {
+                exist.push(keyOrItem);
+            }
+            for (var _i = 0, exist_1 = exist; _i < exist_1.length; _i++) {
+                var e = exist_1[_i];
+                var index = this.cache.indexOf(e);
+                this.cache.splice(index, 1);
+            }
+        };
+        Cache.prototype._find = function (key, props) {
+            var _this = this;
+            return this.cache.find(function (x) { return _this._filter(x, key, props); });
+        };
+        Cache.prototype._filter = function (item, key, props) {
+            if (item.key === key) {
+                if (props) {
+                    // TODO: remove backward compatibility
+                    var itemProps = item.props || item.options;
+                    return objectDeepEqual(itemProps || {}, objectRemoveEmpty(props));
+                }
+                return true;
+            }
+            return false;
+        };
+        Cache.instance = {};
+        return Cache;
     }());
 
-    /**
-     * Caching for asynchronous functions
-     *
-     * @packageDocumentation
-     * @module cache
-     */
+    /**
+     * Caching for asynchronous functions
+     *
+     * @packageDocumentation
+     * @module cache
+     */
     var Cache = Cache$1;
 
-    /**
-     * Thrown when...
-     */
-    var NetworkError = /** @class */ (function (_super) {
-        __extends(NetworkError, _super);
-        function NetworkError(url) {
-            var _this = _super.call(this) || this;
-            _this.name = 'NetworkError';
-            Object.setPrototypeOf(_this, NetworkError.prototype);
-            _this.message = "Unable to request ".concat(url, ".\n    Possibly invalid NGW URL entered or CORS not configured to get request from ").concat(location.origin); // /control-panel/cors
-            return _this;
-        }
-        return NetworkError;
+    /**
+     * Thrown when...
+     */
+    var NetworkError = /** @class */ (function (_super) {
+        __extends(NetworkError, _super);
+        function NetworkError(url) {
+            var _this = _super.call(this) || this;
+            _this.name = 'NetworkError';
+            Object.setPrototypeOf(_this, NetworkError.prototype);
+            _this.message = "Unable to request ".concat(url, ".\n    Possibly invalid NGW URL entered or CORS not configured to get request from ").concat(location.origin); // /control-panel/cors
+            return _this;
+        }
+        return NetworkError;
     }(Error));
 
-    /**
-     * Thrown when...
-     */
-    var NgwError = /** @class */ (function (_super) {
-        __extends(NgwError, _super);
-        function NgwError(er) {
-            var _this = _super.call(this) || this;
-            _this.name = 'NgwError';
-            Object.assign(_this, er);
-            Object.setPrototypeOf(_this, NgwError.prototype);
-            return _this;
-        }
-        return NgwError;
+    /**
+     * Thrown when...
+     */
+    var NgwError = /** @class */ (function (_super) {
+        __extends(NgwError, _super);
+        function NgwError(er) {
+            var _this = _super.call(this) || this;
+            _this.name = 'NgwError';
+            Object.assign(_this, er);
+            Object.setPrototypeOf(_this, NgwError.prototype);
+            return _this;
+        }
+        return NgwError;
     }(Error));
 
-    function isObject(val) {
-        return Object.prototype.toString.call(val) === '[object Object]';
+    function isObject(val) {
+        return Object.prototype.toString.call(val) === '[object Object]';
     }
 
-    var loadData;
-    // @ts-ignore
-    {
-        loadData = function (url, callback, options, error, onCancel) {
-            if (options === void 0) { options = {}; }
-            options.method = options.method || 'GET';
-            var xhr = new XMLHttpRequest();
-            xhr.open(options.method || 'GET', url, true); // true for asynchronous
-            if (options.responseType === 'blob') {
-                xhr.responseType = options.responseType;
-            }
-            var getResponseText = function () {
-                try {
-                    return JSON.parse(xhr.responseText);
-                }
-                catch (er) {
-                    return xhr.responseText;
-                }
-            };
-            var processingResponse = function (forError) {
-                if (forError === void 0) { forError = false; }
-                var cb = forError ? error : callback;
-                if (options.responseType === 'blob') {
-                    cb(xhr.response);
-                }
-                else {
-                    if (xhr.responseText) {
-                        cb(getResponseText());
-                    }
-                    else {
-                        error({ message: '' });
-                    }
-                }
-            };
-            xhr.onload = function () {
-                if ([401, 403, 404, 422, 500].indexOf(xhr.status) !== -1) {
-                    error(new NgwError(getResponseText()));
-                }
-                processingResponse();
-            };
-            // xhr.onreadystatechange = () => {
-            //   if (
-            //     (xhr.readyState === 4 && xhr.status === 200) ||
-            //     (xhr.readyState === 3 && xhr.status === 201)
-            //   ) {
-            //     processingResponse();
-            //   } else if (xhr.readyState === 3 && xhr.status === 400) {
-            //     processingResponse();
-            //   } else if (xhr.readyState === 4 && xhr.status === 500) {
-            //     processingResponse();
-            //   } else if (xhr.readyState === 4 && xhr.status === 401) {
-            //     error(xhr.statusText);
-            //   } else if (xhr.readyState === 4) {
-            //     error('request error');
-            //   }
-            // };
-            xhr.onerror = function (er) {
-                if (xhr.status === 0) {
-                    error(new NetworkError(url));
-                }
-                else {
-                    error(er);
-                }
-            };
-            xhr.upload.onprogress = function (e) {
-                if (e.lengthComputable) {
-                    var percentComplete = (e.loaded / e.total) * 100;
-                    if (options.onProgress) {
-                        options.onProgress(percentComplete, e);
-                    }
-                    // console.log(percentComplete + '% uploaded');
-                }
-            };
-            var headers = options.headers;
-            if (headers) {
-                for (var h in headers) {
-                    var header = headers[h];
-                    if (typeof header === 'string') {
-                        xhr.setRequestHeader(h, header);
-                    }
-                }
-            }
-            if (options.withCredentials !== undefined) {
-                xhr.withCredentials = options.withCredentials;
-            }
-            var data;
-            if (options.file) {
-                data = new FormData();
-                data.append('file', options.file);
-                if (options.data) {
-                    for (var d in options.data) {
-                        data.append(d, data[d]);
-                    }
-                }
-            }
-            else {
-                data = options.data
-                    ? typeof options.data === 'string'
-                        ? options.data
-                        : JSON.stringify(options.data)
-                    : null;
-            }
-            if (onCancel) {
-                onCancel(function () {
-                    xhr.abort();
-                });
-            }
-            xhr.send(data);
-        };
+    var loadData;
+    // @ts-ignore
+    {
+        loadData = function (url, callback, options, error, onCancel) {
+            if (options === void 0) { options = {}; }
+            options.method = options.method || 'GET';
+            var xhr = new XMLHttpRequest();
+            xhr.open(options.method || 'GET', url, true); // true for asynchronous
+            if (options.responseType === 'blob') {
+                xhr.responseType = options.responseType;
+            }
+            var getResponseText = function () {
+                try {
+                    return JSON.parse(xhr.responseText);
+                }
+                catch (er) {
+                    return xhr.responseText;
+                }
+            };
+            var processingResponse = function (forError) {
+                if (forError === void 0) { forError = false; }
+                var cb = forError ? error : callback;
+                if (options.responseType === 'blob') {
+                    cb(xhr.response);
+                }
+                else {
+                    if (xhr.responseText) {
+                        cb(getResponseText());
+                    }
+                    else {
+                        error({ message: '' });
+                    }
+                }
+            };
+            xhr.onload = function () {
+                if ([401, 403, 404, 422, 500].indexOf(xhr.status) !== -1) {
+                    error(new NgwError(getResponseText()));
+                }
+                processingResponse();
+            };
+            // xhr.onreadystatechange = () => {
+            //   if (
+            //     (xhr.readyState === 4 && xhr.status === 200) ||
+            //     (xhr.readyState === 3 && xhr.status === 201)
+            //   ) {
+            //     processingResponse();
+            //   } else if (xhr.readyState === 3 && xhr.status === 400) {
+            //     processingResponse();
+            //   } else if (xhr.readyState === 4 && xhr.status === 500) {
+            //     processingResponse();
+            //   } else if (xhr.readyState === 4 && xhr.status === 401) {
+            //     error(xhr.statusText);
+            //   } else if (xhr.readyState === 4) {
+            //     error('request error');
+            //   }
+            // };
+            xhr.onerror = function (er) {
+                if (xhr.status === 0) {
+                    error(new NetworkError(url));
+                }
+                else {
+                    error(er);
+                }
+            };
+            xhr.upload.onprogress = function (e) {
+                if (e.lengthComputable) {
+                    var percentComplete = (e.loaded / e.total) * 100;
+                    if (options.onProgress) {
+                        options.onProgress(percentComplete, e);
+                    }
+                    // console.log(percentComplete + '% uploaded');
+                }
+            };
+            var headers = options.headers;
+            if (headers) {
+                for (var h in headers) {
+                    var header = headers[h];
+                    if (typeof header === 'string') {
+                        xhr.setRequestHeader(h, header);
+                    }
+                }
+            }
+            if (options.withCredentials !== undefined) {
+                xhr.withCredentials = options.withCredentials;
+            }
+            var data;
+            if (options.file) {
+                data = new FormData();
+                data.append('file', options.file);
+                if (options.data) {
+                    for (var d in options.data) {
+                        data.append(d, data[d]);
+                    }
+                }
+            }
+            else {
+                data = options.data
+                    ? typeof options.data === 'string'
+                        ? options.data
+                        : JSON.stringify(options.data)
+                    : null;
+            }
+            if (onCancel) {
+                onCancel(function () {
+                    xhr.abort();
+                });
+            }
+            xhr.send(data);
+        };
     }
 
-    // https://github.com/Leaflet/Leaflet/blob/b507e21c510b53cd704fb8d3f89bb46ea925c8eb/src/core/Util.js#L165
-    var templateRe = /\{ *([\w_-]+) *\}/g;
-    function template(str, data) {
-        return str.replace(templateRe, function (s, key) {
-            var value = data[key];
-            if (value === undefined) {
-                throw new Error('No value provided for letiable ' + s);
-            }
-            else if (typeof value === 'function') {
-                value = value(data);
-            }
-            return value;
-        });
+    // https://github.com/Leaflet/Leaflet/blob/b507e21c510b53cd704fb8d3f89bb46ea925c8eb/src/core/Util.js#L165
+    var templateRe = /\{ *([\w_-]+) *\}/g;
+    function template(str, data) {
+        return str.replace(templateRe, function (s, key) {
+            var value = data[key];
+            if (value === undefined) {
+                throw new Error('No value provided for letiable ' + s);
+            }
+            else if (typeof value === 'function') {
+                value = value(data);
+            }
+            return value;
+        });
     }
 
-    function apiRequest(opt) {
-        var params = opt.params;
-        return new CancelablePromise(function (resolve, reject) {
-            opt.connector
-                .connect()
-                .then(function (apiItems) {
-                var apiItem = apiItems && apiItems[opt.name];
-                if (apiItem) {
-                    apiItem = __spreadArray([], apiItem, true);
-                    var url = apiItem.shift();
-                    if (apiItem.length) {
-                        var replaceParams = {};
-                        for (var fry = 0; fry < apiItem.length; fry++) {
-                            var arg = apiItem[fry];
-                            replaceParams[fry] = '{' + arg + '}';
-                            if (params[arg] === undefined) {
-                                throw new Error('`' + arg + '`' + ' url api argument is not specified');
-                            }
-                        }
-                        if (url) {
-                            url = template(url, replaceParams);
-                        }
-                    }
-                    // Transfer part of the parameters from `params` to the URL string
-                    if (params) {
-                        var paramArray_1 = [];
-                        var paramList = params.paramList;
-                        if (Array.isArray(paramList)) {
-                            delete params.paramList;
-                            paramList.forEach(function (x) {
-                                paramArray_1.push("".concat(x[0], "=").concat(x[1]));
-                            });
-                        }
-                        for (var p in params) {
-                            if (apiItem.indexOf(p) === -1) {
-                                paramArray_1.push("".concat(p, "=").concat(params[p]));
-                            }
-                        }
-                        if (paramArray_1.length) {
-                            url = url + '?' + paramArray_1.join('&');
-                        }
-                    }
-                    if (url) {
-                        resolve(opt.connector.makeQuery(url, params, opt.requestOptions));
-                    }
-                    else {
-                        reject(new Error('request url is not set'));
-                    }
-                }
-                else {
-                    resolve(undefined);
-                }
-            })
-                .catch(function (er) {
-                reject(er);
-            });
-        });
+    function apiRequest(opt) {
+        var params = opt.params;
+        return new CancelablePromise(function (resolve, reject) {
+            opt.connector
+                .connect()
+                .then(function (apiItems) {
+                var apiItem = apiItems && apiItems[opt.name];
+                if (apiItem) {
+                    apiItem = __spreadArray([], apiItem, true);
+                    var url = apiItem.shift();
+                    if (apiItem.length) {
+                        var replaceParams = {};
+                        for (var fry = 0; fry < apiItem.length; fry++) {
+                            var arg = apiItem[fry];
+                            replaceParams[fry] = '{' + arg + '}';
+                            if (params[arg] === undefined) {
+                                throw new Error('`' + arg + '`' + ' url api argument is not specified');
+                            }
+                        }
+                        if (url) {
+                            url = template(url, replaceParams);
+                        }
+                    }
+                    // Transfer part of the parameters from `params` to the URL string
+                    if (params) {
+                        var paramArray_1 = [];
+                        var paramList = params.paramList;
+                        if (Array.isArray(paramList)) {
+                            delete params.paramList;
+                            paramList.forEach(function (x) {
+                                paramArray_1.push("".concat(x[0], "=").concat(x[1]));
+                            });
+                        }
+                        for (var p in params) {
+                            if (apiItem.indexOf(p) === -1) {
+                                paramArray_1.push("".concat(p, "=").concat(params[p]));
+                            }
+                        }
+                        if (paramArray_1.length) {
+                            url = url + '?' + paramArray_1.join('&');
+                        }
+                    }
+                    if (url) {
+                        resolve(opt.connector.makeQuery(url, params, opt.requestOptions));
+                    }
+                    else {
+                        reject(new Error('request url is not set'));
+                    }
+                }
+                else {
+                    resolve(undefined);
+                }
+            })
+                .catch(function (er) {
+                reject(er);
+            });
+        });
     }
 
-    /**
-     * Thrown when ...
-     */
-    var ResourceNotFoundError = /** @class */ (function (_super) {
-        __extends(ResourceNotFoundError, _super);
-        function ResourceNotFoundError(obj) {
-            var _this = _super.call(this, obj) || this;
-            _this.name = 'ResourceNotFoundError';
-            _this.exception = 'nextgisweb.resource.exception.ResourceNotFound';
-            Object.setPrototypeOf(_this, ResourceNotFoundError.prototype);
-            return _this;
-        }
-        return ResourceNotFoundError;
+    /**
+     * Thrown when ...
+     */
+    var ResourceNotFoundError = /** @class */ (function (_super) {
+        __extends(ResourceNotFoundError, _super);
+        function ResourceNotFoundError(obj) {
+            var _this = _super.call(this, obj) || this;
+            _this.name = 'ResourceNotFoundError';
+            _this.exception = 'nextgisweb.resource.exception.ResourceNotFound';
+            Object.setPrototypeOf(_this, ResourceNotFoundError.prototype);
+            return _this;
+        }
+        return ResourceNotFoundError;
     }(NgwError));
 
-    /**
-     * Thrown when ...
-     */
-    var InsufficientPermissionsError = /** @class */ (function (_super) {
-        __extends(InsufficientPermissionsError, _super);
-        function InsufficientPermissionsError(obj) {
-            var _this = _super.call(this, obj) || this;
-            _this.name = 'InsufficientPermissionsError';
-            _this.exception = 'nextgisweb.core.exception.InsufficientPermissions';
-            Object.setPrototypeOf(_this, InsufficientPermissionsError.prototype);
-            return _this;
-        }
-        return InsufficientPermissionsError;
+    /**
+     * Thrown when ...
+     */
+    var InsufficientPermissionsError = /** @class */ (function (_super) {
+        __extends(InsufficientPermissionsError, _super);
+        function InsufficientPermissionsError(obj) {
+            var _this = _super.call(this, obj) || this;
+            _this.name = 'InsufficientPermissionsError';
+            _this.exception = 'nextgisweb.core.exception.InsufficientPermissions';
+            Object.setPrototypeOf(_this, InsufficientPermissionsError.prototype);
+            return _this;
+        }
+        return InsufficientPermissionsError;
     }(NgwError));
 
-    var CONNECTORS = [];
-    function addConnector(connector) {
-        CONNECTORS.push(connector);
-    }
-    function findConnector(options) {
-        return CONNECTORS.find(function (x) {
-            if (x.options.baseUrl === options.baseUrl) {
-                if (options.auth) {
-                    if (x.options.auth) {
-                        return objectDeepEqual(x.options.auth, options.auth);
-                    }
-                }
-                else {
-                    // if auth not in find options; use first connector with same url
-                    return true;
-                }
-            }
-        });
-    }
-    function removeConnector(connector) {
-        var index = CONNECTORS.indexOf(connector);
-        if (index !== -1) {
-            CONNECTORS.splice(index, 1);
-        }
+    var CONNECTORS = [];
+    function addConnector(connector) {
+        CONNECTORS.push(connector);
+    }
+    function findConnector(options) {
+        return CONNECTORS.find(function (x) {
+            if (x.options.baseUrl === options.baseUrl) {
+                if (options.auth) {
+                    if (x.options.auth) {
+                        return objectDeepEqual(x.options.auth, options.auth);
+                    }
+                }
+                else {
+                    // if auth not in find options; use first connector with same url
+                    return true;
+                }
+            }
+        });
+    }
+    function removeConnector(connector) {
+        var index = CONNECTORS.indexOf(connector);
+        if (index !== -1) {
+            CONNECTORS.splice(index, 1);
+        }
     }
 
-    var exclude = ['description'];
-    /**
-     * @remarks
-     * https://docs.nextgis.ru/docs_ngweb_dev/doc/developer/resource.html#search-resources
-     *
-     * ```
-     * { keyname, owner_user: { id }} > { keyname, owner_user__id }
-     * ```
-     *
-     * @param resource - Any property from NGW resource item
-     */
-    function resourceToQuery(resource, prefix) {
-        if (prefix === void 0) { prefix = ''; }
-        prefix = prefix ? prefix + '__' : '';
-        var query = {};
-        for (var _i = 0, _a = Object.entries(resource); _i < _a.length; _i++) {
-            var _b = _a[_i], key = _b[0], value = _b[1];
-            if (exclude.indexOf(key) === -1) {
-                if (isObject(value)) {
-                    if (key === 'owner_user') {
-                        var children = resourceToQuery(value, key);
-                        Object.assign(query, children);
-                    }
-                    else if (key === 'parent' && 'id' in value) {
-                        query.parent_id = value.id;
-                    }
-                }
-                else if (defined(value)) {
-                    query[prefix + key] = value;
-                }
-            }
-        }
-        return query;
+    var exclude = ['description'];
+    /**
+     * @remarks
+     * https://docs.nextgis.ru/docs_ngweb_dev/doc/developer/resource.html#search-resources
+     *
+     * ```
+     * { keyname, owner_user: { id }} > { keyname, owner_user__id }
+     * ```
+     *
+     * @param resource - Any property from NGW resource item
+     */
+    function resourceToQuery(resource, prefix) {
+        if (prefix === void 0) { prefix = ''; }
+        prefix = prefix ? prefix + '__' : '';
+        var query = {};
+        for (var _i = 0, _a = Object.entries(resource); _i < _a.length; _i++) {
+            var _b = _a[_i], key = _b[0], value = _b[1];
+            if (exclude.indexOf(key) === -1) {
+                if (isObject(value)) {
+                    if (key === 'owner_user') {
+                        var children = resourceToQuery(value, key);
+                        Object.assign(query, children);
+                    }
+                    else if (key === 'parent' && 'id' in value) {
+                        query.parent_id = value.id;
+                    }
+                }
+                else if (defined(value)) {
+                    query[prefix + key] = value;
+                }
+            }
+        }
+        return query;
     }
 
-    function resourceCompare(res1, res2) {
-        return objectDeepEqual(res1, res2);
+    function resourceCompare(res1, res2) {
+        return objectDeepEqual(res1, res2);
     }
 
-    var ResourcesControl = /** @class */ (function () {
-        function ResourcesControl(connector) {
-            this.connector = connector;
-            this.cache = new Cache();
-        }
-        // -------------------------------------------------------------------------
-        // Resource Methods
-        // -------------------------------------------------------------------------
-        /**
-         * Receive resource from NGW by id, keyname or search-object parameter.
-         * @param resource - Resource id, keyname or search-object
-         *
-         * @remarks
-         * Fetching resource would be cached to speed up next call
-         */
-        ResourcesControl.prototype.getOne = function (resource, requestOptions) {
-            var _this = this;
-            var cache = new Cache();
-            var forCache = {};
-            var opt = __assign(__assign({}, requestOptions), { cache: false });
-            if (typeof resource === 'string') {
-                forCache.keyname = resource;
-            }
-            else if (typeof resource === 'number') {
-                forCache.id = resource;
-            }
-            else if (isObject(resource)) {
-                if (resource.id !== undefined) {
-                    forCache.id = resource.id;
-                }
-                else if (resource.keyname) {
-                    forCache.keyname = resource.keyname;
-                }
-            }
-            var makeRequest = function () {
-                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(undefined);
-            };
-            return cache.addFull('resource', makeRequest, forCache);
-        };
-        ResourcesControl.prototype.getOneOrFail = function (resource, requestOptions) {
-            return this.getOne(resource, requestOptions).then(function (res) {
-                if (res) {
-                    return res;
-                }
-                throw new ResourceNotFoundError();
-            });
-        };
-        /**
-         * A fast way to retrieve resource ID for any resource definition.
-         * @param resource - Any available resource definition
-         *
-         * @remarks
-         * There are situations when exactly the resource id is needed
-         * (for example, to compose the correct request to the api)
-         * then this method will come in handy to facilitate the extraction of the identifier
-         * if the resource is specified through a keyname or other parameters.
-         */
-        ResourcesControl.prototype.getId = function (resource, requestOptions) {
-            if (typeof resource === 'number') {
-                return CancelablePromise.resolve(resource);
-            }
-            else if (typeof resource === 'string' || isObject(resource)) {
-                return this.getOne(resource, requestOptions).then(function (res) {
-                    if (res) {
-                        return res.resource.id;
-                    }
-                });
-            }
-            return CancelablePromise.resolve(undefined);
-        };
-        /**
-         * A fast way to retrieve resource ID for any resource definition.
-         * @param resource - Any available resource definition
-         *
-         * @remarks
-         * Similar with {@link NgwConnector.getResourceId | getResourceId} but rise error if resource is not exist.
-         * To not make one more checks if the resource is definitely exists
-         */
-        ResourcesControl.prototype.getIdOrFail = function (resource, requestOptions) {
-            return this.getId(resource, requestOptions).then(function (resp) {
-                if (resp === undefined) {
-                    throw new Error();
-                }
-                return resp;
-            });
-        };
-        ResourcesControl.prototype.getMany = function (resource, requestOptions) {
-            var _this = this;
-            return this._resourceCacheFilter(resource).then(function (items) {
-                if (!items.length) {
-                    var query = {};
-                    if (resource.keyname) {
-                        query.keyname = resource.keyname;
-                    }
-                    else {
-                        Object.assign(query, resourceToQuery(resource));
-                    }
-                    return _this.connector
-                        .get('resource.search', requestOptions, __assign({ serialization: 'full' }, query))
-                        .then(function (resources) {
-                        if (resources) {
-                            for (var _i = 0, resources_1 = resources; _i < resources_1.length; _i++) {
-                                var x = resources_1[_i];
-                                _this.cache.add('resource.item', CancelablePromise.resolve(x), {
-                                    id: x.resource.id,
-                                });
-                            }
-                        }
-                        return resources;
-                    });
-                }
-                return items;
-            });
-        };
-        ResourcesControl.prototype.getParent = function (resource, requestOptions) {
-            var _this = this;
-            return this.getOne(resource, requestOptions).then(function (child) {
-                if (child) {
-                    return _this.getOne(child.resource.parent.id, requestOptions);
-                }
-                return CancelablePromise.resolve(undefined);
-            });
-        };
-        ResourcesControl.prototype.getChildrenOf = function (resource, requestOptions) {
-            var _this = this;
-            return this.getIdOrFail(resource).then(function (parent) {
-                return _this._getChildrenOf(parent, requestOptions);
-            });
-        };
-        ResourcesControl.prototype.update = function (resource, data) {
-            var _this = this;
-            return this.getId(resource).then(function (id) {
-                if (id !== undefined) {
-                    return _this.connector.put('resource.item', { data: data }, { id: id });
-                }
-            });
-        };
-        /**
-         * Fast way to delete resource from NGW and clean cache.
-         * @param resource - Resource definition
-         */
-        ResourcesControl.prototype.delete = function (resource) {
-            var _this = this;
-            return this.getId(resource).then(function (id) {
-                if (id !== undefined) {
-                    return _this.connector.delete('resource.item', null, { id: id }).then(function () {
-                        _this._cleanResourceItemCache(id);
-                        return undefined;
-                    });
-                }
-            });
-        };
-        ResourcesControl.prototype._getChildrenOf = function (parent, requestOptions, _items) {
-            var _this = this;
-            if (_items === void 0) { _items = []; }
-            return this.connector
-                .get('resource.collection', __assign({ cache: true }, requestOptions), {
-                parent: parent,
-            })
-                .then(function (items) {
-                var recursivePromises = [];
-                for (var _i = 0, items_1 = items; _i < items_1.length; _i++) {
-                    var item = items_1[_i];
-                    _this.cache.add('resource.item', CancelablePromise.resolve(item), {
-                        id: item.resource.id,
-                    });
-                    _items.push(item);
-                    if ((requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.recursive) && item.resource.children) {
-                        recursivePromises.push(_this._getChildrenOf(item.resource.id, requestOptions, _items));
-                    }
-                }
-                if (recursivePromises.length) {
-                    return CancelablePromise.all(recursivePromises).then(function () {
-                        return _items;
-                    });
-                }
-                return _items;
-            });
-        };
-        ResourcesControl.prototype._cleanResourceItemCache = function (id) {
-            return __awaiter(this, void 0, void 0, function () {
-                var all, toDelete, _i, all_1, c, cid, rid, _a, toDelete_1, d;
-                return __generator(this, function (_b) {
-                    switch (_b.label) {
-                        case 0:
-                            all = this.cache.all();
-                            toDelete = [];
-                            _i = 0, all_1 = all;
-                            _b.label = 1;
-                        case 1:
-                            if (!(_i < all_1.length)) return [3 /*break*/, 5];
-                            c = all_1[_i];
-                            cid = c.options && c.options.id;
-                            if (!(['resource.item', 'resource'].includes(c.key) && cid !== undefined)) return [3 /*break*/, 4];
-                            if (!(typeof cid === 'number')) return [3 /*break*/, 2];
-                            if (cid === id) {
-                                toDelete.push(c);
-                            }
-                            return [3 /*break*/, 4];
-                        case 2: return [4 /*yield*/, this.getId(cid)];
-                        case 3:
-                            rid = _b.sent();
-                            if (rid === id) {
-                                toDelete.push(c);
-                            }
-                            _b.label = 4;
-                        case 4:
-                            _i++;
-                            return [3 /*break*/, 1];
-                        case 5:
-                            for (_a = 0, toDelete_1 = toDelete; _a < toDelete_1.length; _a++) {
-                                d = toDelete_1[_a];
-                                this.cache.delete(d);
-                            }
-                            return [2 /*return*/];
-                    }
-                });
-            });
-        };
-        ResourcesControl.prototype._fetchResourceById = function (id, requestOptions) {
-            var _this = this;
-            var promise = function () {
-                return _this.connector.get('resource.item', requestOptions, { id: id });
-            };
-            return this.cache
-                .add('resource.item', promise, {
-                id: id,
-            })
-                .catch(function (er) {
-                if (!(er instanceof ResourceNotFoundError)) {
-                    throw er;
-                }
-                return undefined;
-            });
-        };
-        ResourcesControl.prototype._fetchResourceBy = function (resource, requestOptions) {
-            return this.getMany(resource, requestOptions).then(function (resources) {
-                return resources[0];
-            });
-        };
-        ResourcesControl.prototype._resourceCacheFilter = function (resource) {
-            return CancelablePromise.all(this.cache.matchAll('resource.item')).then(function (resources) {
-                var items = [];
-                resources.filter(function (x) {
-                    if (x) {
-                        // identical by uniq props
-                        if (resource.keyname && x.resource.keyname) {
-                            return resource.keyname === x.resource.keyname;
-                        }
-                        if (defined(resource.id) && defined(x.resource.id)) {
-                            return resource.id === x.resource.id;
-                        }
-                        return resourceCompare(resource, x.resource);
-                    }
-                });
-                return items;
-            });
-        };
-        return ResourcesControl;
+    var ResourcesControl = /** @class */ (function () {
+        function ResourcesControl(connector) {
+            this.connector = connector;
+            this.cache = new Cache();
+        }
+        // -------------------------------------------------------------------------
+        // Resource Methods
+        // -------------------------------------------------------------------------
+        /**
+         * Receive resource from NGW by id, keyname or search-object parameter.
+         * @param resource - Resource id, keyname or search-object
+         *
+         * @remarks
+         * Fetching resource would be cached to speed up next call
+         */
+        ResourcesControl.prototype.getOne = function (resource, requestOptions) {
+            var _this = this;
+            var cache = new Cache();
+            var forCache = {};
+            var opt = __assign(__assign({}, requestOptions), { cache: false });
+            if (typeof resource === 'string') {
+                forCache.keyname = resource;
+            }
+            else if (typeof resource === 'number') {
+                forCache.id = resource;
+            }
+            else if (isObject(resource)) {
+                if (resource.id !== undefined) {
+                    forCache.id = resource.id;
+                }
+                else if (resource.keyname) {
+                    forCache.keyname = resource.keyname;
+                }
+            }
+            var makeRequest = function () {
+                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(undefined);
+            };
+            return cache.addFull('resource', makeRequest, forCache);
+        };
+        ResourcesControl.prototype.getOneOrFail = function (resource, requestOptions) {
+            return this.getOne(resource, requestOptions).then(function (res) {
+                if (res) {
+                    return res;
+                }
+                throw new ResourceNotFoundError();
+            });
+        };
+        /**
+         * A fast way to retrieve resource ID for any resource definition.
+         * @param resource - Any available resource definition
+         *
+         * @remarks
+         * There are situations when exactly the resource id is needed
+         * (for example, to compose the correct request to the api)
+         * then this method will come in handy to facilitate the extraction of the identifier
+         * if the resource is specified through a keyname or other parameters.
+         */
+        ResourcesControl.prototype.getId = function (resource, requestOptions) {
+            if (typeof resource === 'number') {
+                return CancelablePromise.resolve(resource);
+            }
+            else if (typeof resource === 'string' || isObject(resource)) {
+                return this.getOne(resource, requestOptions).then(function (res) {
+                    if (res) {
+                        return res.resource.id;
+                    }
+                });
+            }
+            return CancelablePromise.resolve(undefined);
+        };
+        /**
+         * A fast way to retrieve resource ID for any resource definition.
+         * @param resource - Any available resource definition
+         *
+         * @remarks
+         * Similar with {@link NgwConnector.getResourceId | getResourceId} but rise error if resource is not exist.
+         * To not make one more checks if the resource is definitely exists
+         */
+        ResourcesControl.prototype.getIdOrFail = function (resource, requestOptions) {
+            return this.getId(resource, requestOptions).then(function (resp) {
+                if (resp === undefined) {
+                    throw new Error();
+                }
+                return resp;
+            });
+        };
+        ResourcesControl.prototype.getMany = function (resource, requestOptions) {
+            var _this = this;
+            return this._resourceCacheFilter(resource).then(function (items) {
+                if (!items.length) {
+                    var query = {};
+                    if (resource.keyname) {
+                        query.keyname = resource.keyname;
+                    }
+                    else {
+                        Object.assign(query, resourceToQuery(resource));
+                    }
+                    return _this.connector
+                        .get('resource.search', requestOptions, __assign({ serialization: 'full' }, query))
+                        .then(function (resources) {
+                        if (resources) {
+                            for (var _i = 0, resources_1 = resources; _i < resources_1.length; _i++) {
+                                var x = resources_1[_i];
+                                _this.cache.add('resource.item', CancelablePromise.resolve(x), {
+                                    id: x.resource.id,
+                                });
+                            }
+                        }
+                        return resources;
+                    });
+                }
+                return items;
+            });
+        };
+        ResourcesControl.prototype.getParent = function (resource, requestOptions) {
+            var _this = this;
+            return this.getOne(resource, requestOptions).then(function (child) {
+                if (child) {
+                    return _this.getOne(child.resource.parent.id, requestOptions);
+                }
+                return CancelablePromise.resolve(undefined);
+            });
+        };
+        ResourcesControl.prototype.getChildrenOf = function (resource, requestOptions) {
+            var _this = this;
+            return this.getIdOrFail(resource).then(function (parent) {
+                return _this._getChildrenOf(parent, requestOptions);
+            });
+        };
+        ResourcesControl.prototype.update = function (resource, data) {
+            var _this = this;
+            return this.getId(resource).then(function (id) {
+                if (id !== undefined) {
+                    return _this.connector.put('resource.item', { data: data }, { id: id });
+                }
+            });
+        };
+        /**
+         * Fast way to delete resource from NGW and clean cache.
+         * @param resource - Resource definition
+         */
+        ResourcesControl.prototype.delete = function (resource) {
+            var _this = this;
+            return this.getId(resource).then(function (id) {
+                if (id !== undefined) {
+                    return _this.connector.delete('resource.item', null, { id: id }).then(function () {
+                        _this._cleanResourceItemCache(id);
+                        return undefined;
+                    });
+                }
+            });
+        };
+        ResourcesControl.prototype._getChildrenOf = function (parent, requestOptions, _items) {
+            var _this = this;
+            if (_items === void 0) { _items = []; }
+            return this.connector
+                .get('resource.collection', __assign({ cache: true }, requestOptions), {
+                parent: parent,
+            })
+                .then(function (items) {
+                var recursivePromises = [];
+                for (var _i = 0, items_1 = items; _i < items_1.length; _i++) {
+                    var item = items_1[_i];
+                    _this.cache.add('resource.item', CancelablePromise.resolve(item), {
+                        id: item.resource.id,
+                    });
+                    _items.push(item);
+                    if ((requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.recursive) && item.resource.children) {
+                        recursivePromises.push(_this._getChildrenOf(item.resource.id, requestOptions, _items));
+                    }
+                }
+                if (recursivePromises.length) {
+                    return CancelablePromise.all(recursivePromises).then(function () {
+                        return _items;
+                    });
+                }
+                return _items;
+            });
+        };
+        ResourcesControl.prototype._cleanResourceItemCache = function (id) {
+            return __awaiter(this, void 0, void 0, function () {
+                var all, toDelete, _i, all_1, c, cid, rid, _a, toDelete_1, d;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0:
+                            all = this.cache.all();
+                            toDelete = [];
+                            _i = 0, all_1 = all;
+                            _b.label = 1;
+                        case 1:
+                            if (!(_i < all_1.length)) return [3 /*break*/, 5];
+                            c = all_1[_i];
+                            cid = c.options && c.options.id;
+                            if (!(['resource.item', 'resource'].includes(c.key) && cid !== undefined)) return [3 /*break*/, 4];
+                            if (!(typeof cid === 'number')) return [3 /*break*/, 2];
+                            if (cid === id) {
+                                toDelete.push(c);
+                            }
+                            return [3 /*break*/, 4];
+                        case 2: return [4 /*yield*/, this.getId(cid)];
+                        case 3:
+                            rid = _b.sent();
+                            if (rid === id) {
+                                toDelete.push(c);
+                            }
+                            _b.label = 4;
+                        case 4:
+                            _i++;
+                            return [3 /*break*/, 1];
+                        case 5:
+                            for (_a = 0, toDelete_1 = toDelete; _a < toDelete_1.length; _a++) {
+                                d = toDelete_1[_a];
+                                this.cache.delete(d);
+                            }
+                            return [2 /*return*/];
+                    }
+                });
+            });
+        };
+        ResourcesControl.prototype._fetchResourceById = function (id, requestOptions) {
+            var _this = this;
+            var promise = function () {
+                return _this.connector.get('resource.item', requestOptions, { id: id });
+            };
+            return this.cache
+                .add('resource.item', promise, {
+                id: id,
+            })
+                .catch(function (er) {
+                if (!(er instanceof ResourceNotFoundError)) {
+                    throw er;
+                }
+                return undefined;
+            });
+        };
+        ResourcesControl.prototype._fetchResourceBy = function (resource, requestOptions) {
+            return this.getMany(resource, requestOptions).then(function (resources) {
+                return resources[0];
+            });
+        };
+        ResourcesControl.prototype._resourceCacheFilter = function (resource) {
+            return CancelablePromise.all(this.cache.matchAll('resource.item')).then(function (resources) {
+                var items = [];
+                resources.filter(function (x) {
+                    if (x) {
+                        // identical by uniq props
+                        if (resource.keyname && x.resource.keyname) {
+                            return resource.keyname === x.resource.keyname;
+                        }
+                        if (defined(resource.id) && defined(x.resource.id)) {
+                            return resource.id === x.resource.id;
+                        }
+                        return resourceCompare(resource, x.resource);
+                    }
+                });
+                return items;
+            });
+        };
+        return ResourcesControl;
     }());
 
-    var ID = 0;
-    var NgwConnector$1 = /** @class */ (function () {
-        function NgwConnector(options) {
-            this.options = options;
-            this.id = ID++;
-            this.emitter = new events.exports.EventEmitter();
-            this.routeStr = '/api/component/pyramid/route';
-            this.activeRequests = [];
-            var exist = findConnector(options);
-            if (exist) {
-                return exist;
-            }
-            else {
-                if (this.options.route) {
-                    this.routeStr = this.options.route;
-                }
-                if (this.options.requestTransform) {
-                    this.requestTransform = this.options.requestTransform;
-                }
-                this.resources = new ResourcesControl(this);
-                addConnector(this);
-            }
-        }
-        NgwConnector.create = function (options) {
-            return new this(options);
-        };
-        NgwConnector.prototype.setRequestTransform = function (requestTransform) {
-            this.requestTransform = requestTransform;
-        };
-        /**
-         * Fast way to specify the connection address to NextGIS Web.
-         * The current connection will be severed.
-         * @param baseUrl - NGW url
-         */
-        NgwConnector.prototype.setNgw = function (baseUrl) {
-            this.logout();
-            this.options.baseUrl = baseUrl;
-            addConnector(this);
-        };
-        /**
-         * Establishing a connection with NextGIS Web to fulfill all other requests.
-         * @remarks
-         * This method need not be called manually as it is used when forming a request in {@link apiRequest | apiRequest}.
-         * Can be used to check connection.
-         * @example
-         * ```javascript
-         * const connector = new NgwConnector({baseUrl: 'https://demo.nextgis.com'});
-         * connector.connect()
-         *   .then(() => console.log('Ok'))
-         *   .catch((er) => console.log('Connection problem', er));
-         * ```
-         */
-        NgwConnector.prototype.connect = function () {
-            var _this = this;
-            var cache = new Cache();
-            var auth = this.options.auth;
-            var makeConnect = function () {
-                return new CancelablePromise(function (resolve, reject) {
-                    var makeQuery = function () {
-                        return _this.makeQuery(_this.routeStr, {}, {})
-                            .then(function (route) {
-                            resolve(route);
-                        })
-                            .catch(function (er) {
-                            reject(er);
-                        });
-                    };
-                    if (auth) {
-                        var login = auth.login, password = auth.password;
-                        if (login && password) {
-                            return _this._login({ login: login, password: password })
-                                .then(function () {
-                                return makeQuery();
-                            })
-                                .catch(function (er) { return reject(er); });
-                        }
-                    }
-                    return makeQuery();
-                });
-            };
-            return cache.add('route', makeConnect, {
-                id: this.id,
-                auth: auth,
-                baseUrl: this.options.baseUrl,
-            });
-        };
-        /**
-         * Quick way to change NextGIS Web user.
-         * @param credentials - New user credentials
-         */
-        NgwConnector.prototype.login = function (credentials, options) {
-            this.logout();
-            addConnector(this);
-            return this._login(credentials, options);
-        };
-        /**
-         * Disconnecting a user. Aborting all current requests
-         */
-        NgwConnector.prototype.logout = function () {
-            this.abort();
-            removeConnector(this);
-            this.options.auth = undefined;
-            this.user = undefined;
-            this.emitter.emit('logout');
-            this.resources.cache.clean();
-        };
-        NgwConnector.prototype.getUserInfo = function (credentials, options) {
-            if (this.user && this.user.id) {
-                return CancelablePromise.resolve(this.user);
-            }
-            if (credentials) {
-                this.options.auth = credentials;
-            }
-            var options_ = __assign({ headers: this.getAuthorizationHeaders(credentials) }, options);
-            // Do not use apiRequest('auth.current_user') to avoid circular-references
-            return this.makeQuery('/api/component/auth/current_user', {}, options_);
-        };
-        /**
-         * Obtaining the required Headers for authentication of requests in the NGW.
-         */
-        NgwConnector.prototype.getAuthorizationHeaders = function (credentials) {
-            var client = this.makeClientId(credentials);
-            if (client) {
-                return {
-                    Authorization: 'Basic ' + client,
-                };
-            }
-        };
-        NgwConnector.prototype.makeClientId = function (credentials) {
-            credentials = credentials || this.options.auth;
-            if (credentials) {
-                var login = credentials.login, password = credentials.password;
-                var str = unescape(encodeURIComponent("".concat(login, ":").concat(password)));
-                // @ts-ignore
-                {
-                    return window.btoa(str);
-                }
-            }
-        };
-        /** Stop all api requests */
-        NgwConnector.prototype.abort = function () {
-            for (var _i = 0, _a = this.activeRequests; _i < _a.length; _i++) {
-                var req = _a[_i];
-                req.cancel();
-            }
-            this.activeRequests = [];
-        };
-        NgwConnector.prototype.getActiveApiRequests = function () {
-            return __spreadArray([], this.activeRequests, true);
-        };
-        /**
-         * Send request to NGW api router.
-         * @param name - NGW route name from {@link https://docs.nextgis.com/docs_ngweb_dev/doc/developer/resource.html#routes | routes}
-         * @param params - Request item params or query params
-         * @param requestOptions - Request options
-         *
-         * @example
-         * ```javascript
-         *
-         * // there is such an NGW route item
-         * // "feature_layer.feature.item": [
-         * //   "/api/resource/{0}/feature/{1}",
-         * //   "id",
-         * //   "fid"
-         * // ],
-         *
-         * const connector = new NgwConnector({ baseUrl: 'https://example.nextgis.com' });
-         * connector.apiRequest('feature_layer.feature.item', {
-         *   // request params for {0} and {1}
-         *   'id': 2011,
-         *   'fid': 101,
-         *   // query params
-         *   'srs': 4326,
-         *   'geom_format': 'geojson',
-         * }, { method: 'GET' });
-         * // send get-request to 'https://example.nextgis.com/api/resource/2011/feature/101?srs=4326&geom_format=geojson'
-         *
-         * ```
-         */
-        NgwConnector.prototype.apiRequest = function (name, params_, requestOptions) {
-            var _this = this;
-            var _a;
-            if (params_ === void 0) { params_ = {}; }
-            if (requestOptions === void 0) { requestOptions = {}; }
-            var method = requestOptions.method, headers = requestOptions.headers, withCredentials = requestOptions.withCredentials, responseType = requestOptions.responseType;
-            var params = objectRemoveEmpty(params_);
-            var makeApiRequest = function () {
-                return apiRequest({ name: name, params: params, requestOptions: requestOptions, connector: _this });
-            };
-            if (requestOptions.cache && method === 'GET') {
-                var cache = new Cache();
-                return cache.add(name, makeApiRequest, __assign({ params: params }, objectRemoveEmpty({
-                    headers: headers,
-                    withCredentials: withCredentials,
-                    responseType: responseType,
-                    baseUrl: this.options.baseUrl,
-                    userId: (_a = this.user) === null || _a === void 0 ? void 0 : _a.id,
-                })));
-            }
-            return makeApiRequest();
-        };
-        /**
-         * Shortcut method for send POST request to NGW.
-         * @param name - NGW route name from {@link https://docs.nextgis.com/docs_ngweb_dev/doc/developer/resource.html#routes | routes}
-         * @param options - Request options
-         * @param params - Request item params or query params
-         *
-         * @example
-         * ```javascript
-         * connector.post('resource.collection', { data: POST_PAYLOAD })
-         *   .then((newResource) => console.log(newResource))
-         *   .catch((error) => console.warn(error));
-         * ```
-         */
-        NgwConnector.prototype.post = function (name, options, params) {
-            options = options || {};
-            options.method = 'POST';
-            return this.apiRequest(name, params, options);
-        };
-        /**
-         * Shortcut method for send GET request to NGW.
-         * @param name - NGW route name from {@link https://docs.nextgis.com/docs_ngweb_dev/doc/developer/resource.html#routes | routes}
-         * @param options - Request options
-         * @param params - Request item params or query params
-         */
-        NgwConnector.prototype.get = function (name, options, params) {
-            options = options || {};
-            options.method = 'GET';
-            return this.apiRequest(name, params, options);
-        };
-        /**
-         * Shortcut method for send PATCH request to NGW.
-         * @param name - NGW route name from {@link https://docs.nextgis.com/docs_ngweb_dev/doc/developer/resource.html#routes | routes}
-         * @param options - Request options
-         * @param params - Request item params or query params
-         */
-        NgwConnector.prototype.patch = function (name, options, params) {
-            options = options || {};
-            options.method = 'PATCH';
-            return this.apiRequest(name, params, options);
-        };
-        /**
-         * Shortcut method for send PUT request to NGW.
-         * @param name - NGW route name from {@link https://docs.nextgis.com/docs_ngweb_dev/doc/developer/resource.html#routes | routes}
-         * @param options - Request options
-         * @param params - Request item params or query params
-         */
-        NgwConnector.prototype.put = function (name, options, params) {
-            options = options || {};
-            options.method = 'PUT';
-            return this.apiRequest(name, params, options);
-        };
-        /**
-         * Shortcut method for send DELETE request to NGW.
-         * @param name - NGW route name from {@link https://docs.nextgis.com/docs_ngweb_dev/doc/developer/resource.html#routes | routes}
-         * @param options - Request options
-         * @param params - Request item params or query params
-         */
-        NgwConnector.prototype.delete = function (name, options, params) {
-            options = options || {};
-            options.method = 'DELETE';
-            return this.apiRequest(name, params, options);
-        };
-        /**
-         * Send request to NGW.
-         * @param url - URL address to NGW
-         * @param params - Query params
-         * @param options - Request options
-         */
-        NgwConnector.prototype.makeQuery = function (url, params, options) {
-            if (options === void 0) { options = {}; }
-            url = (this.options.baseUrl ? this.options.baseUrl : '') + url;
-            if (url) {
-                if (params) {
-                    url = template(url, params);
-                }
-                url = encodeURI(fixUrlStr(url));
-                return this._loadData(url, options);
-            }
-            else {
-                throw new Error('Empty `url` not allowed');
-            }
-        };
-        // -------------------------------------------------------------------------
-        // Resource Methods
-        // -------------------------------------------------------------------------
-        /**
-         * {@link ResourcesControl.getOne}
-         */
-        NgwConnector.prototype.getResource = function (resource, requestOptions) {
-            return this.resources.getOne(resource, requestOptions);
-        };
-        /**
-         * {@link ResourcesControl.getOneOrFail}
-         */
-        NgwConnector.prototype.getResourceOrFail = function (resource, requestOptions) {
-            return this.resources.getOneOrFail(resource, requestOptions);
-        };
-        /**
-         * @deprecated - use {@link getResource}
-         */
-        NgwConnector.prototype.getResourceBy = function (resource) {
-            return this.resources.getOne(resource);
-        };
-        /**
-         * @deprecated - use {@link getResource}
-         */
-        NgwConnector.prototype.getResourceByKeyname = function (keyname) {
-            return this.resources.getOne(keyname);
-        };
-        /**
-         * @deprecated - use {@link getResource}
-         */
-        NgwConnector.prototype.getResourceById = function (id) {
-            return this.resources.getOne(id);
-        };
-        /**
-         * {@link ResourcesControl.getId}
-         */
-        NgwConnector.prototype.getResourceId = function (resource, requestOptions) {
-            return this.resources.getId(resource, requestOptions);
-        };
-        /**
-         * {@link ResourcesControl.getIdOrFail}
-         */
-        NgwConnector.prototype.getResourceIdOrFail = function (resource, requestOptions) {
-            return this.resources.getIdOrFail(resource, requestOptions);
-        };
-        /**
-         * {@link ResourcesControl.getMany}
-         */
-        NgwConnector.prototype.getResourcesBy = function (resource, requestOptions) {
-            return this.resources.getMany(resource, requestOptions);
-        };
-        /**
-         * {@link ResourcesControl.getParent}
-         */
-        NgwConnector.prototype.getResourceParent = function (resource, requestOptions) {
-            return this.resources.getParent(resource, requestOptions);
-        };
-        /**
-         * {@link ResourcesControl.getChildrenOf}
-         */
-        NgwConnector.prototype.getResourceChildren = function (resource, requestOptions) {
-            return this.resources.getChildrenOf(resource, requestOptions);
-        };
-        /**
-         * {@link ResourcesControl.update}
-         */
-        NgwConnector.prototype.updateResource = function (resource, data) {
-            return this.resources.update(resource, data);
-        };
-        /**
-         * {@link ResourcesControl.delete}
-         */
-        NgwConnector.prototype.deleteResource = function (resource) {
-            return this.resources.delete(resource);
-        };
-        /**
-         * @internal
-         */
-        NgwConnector.prototype._loadData = function (url, options) {
-            var _this = this;
-            options.responseType = options.responseType || 'json';
-            var request = new CancelablePromise(function (resolve, reject, onCancel) {
-                if (_this.user) {
-                    options = options || {};
-                    // options.withCredentials = true;
-                    options.headers = __assign(__assign({}, _this.getAuthorizationHeaders()), options.headers);
-                }
-                if (_this.requestTransform) {
-                    var _a = _this.requestTransform(url, options), transUrl = _a[0], transOptions = _a[1];
-                    url = transUrl;
-                    options = transOptions;
-                }
-                loadData(url, resolve, options, reject, onCancel);
-            })
-                .then(function (resp) {
-                _this._cleanActiveRequests(request);
-                return resp;
-            })
-                .catch(function (httpError) {
-                _this._cleanActiveRequests(request);
-                if (httpError instanceof CancelablePromise.CancelError) ;
-                else {
-                    // @ts-ignore
-                    {
-                        console.warn('DEV WARN', httpError);
-                    }
-                    var er = _this._handleHttpError(httpError);
-                    if (er) {
-                        throw er;
-                    }
-                }
-            });
-            if (options.signal &&
-                typeof options.signal.addEventListener === 'function') {
-                options.signal.addEventListener('abort', function () {
-                    request.cancel();
-                    _this._cleanActiveRequests(request);
-                });
-            }
-            this.activeRequests.push(request);
-            return request;
-        };
-        NgwConnector.prototype._login = function (credentials, options) {
-            var _this = this;
-            return this.getUserInfo(credentials, options)
-                .then(function (data) {
-                _this.user = data;
-                _this.emitter.emit('login', data);
-                return data;
-            })
-                .catch(function (er) {
-                _this.emitter.emit('login:error', er);
-                throw er;
-            });
-        };
-        NgwConnector.prototype._cleanActiveRequests = function (request) {
-            var activeRequestIndex = this.activeRequests.indexOf(request);
-            if (activeRequestIndex !== -1) {
-                this.activeRequests.splice(activeRequestIndex, 1);
-            }
-        };
-        NgwConnector.prototype._handleHttpError = function (er) {
-            if (er) {
-                if (er instanceof NgwError) {
-                    if (er.exception === 'nextgisweb.resource.exception.ResourceNotFound') {
-                        throw new ResourceNotFoundError(er);
-                    }
-                    else if (er.exception === 'nextgisweb.core.exception.InsufficientPermissions') {
-                        throw new InsufficientPermissionsError(er);
-                    }
-                }
-            }
-            return er;
-        };
-        NgwConnector.errors = {
-            NgwError: NgwError,
-            ResourceNotFoundError: ResourceNotFoundError,
-        };
-        return NgwConnector;
+    var ID = 0;
+    var NgwConnector$1 = /** @class */ (function () {
+        function NgwConnector(options) {
+            this.options = options;
+            this.id = ID++;
+            this.emitter = new events.exports.EventEmitter();
+            this.routeStr = '/api/component/pyramid/route';
+            this.activeRequests = [];
+            var exist = findConnector(options);
+            if (exist) {
+                return exist;
+            }
+            else {
+                if (this.options.route) {
+                    this.routeStr = this.options.route;
+                }
+                if (this.options.requestTransform) {
+                    this.requestTransform = this.options.requestTransform;
+                }
+                this.resources = new ResourcesControl(this);
+                addConnector(this);
+            }
+        }
+        NgwConnector.create = function (options) {
+            return new this(options);
+        };
+        NgwConnector.prototype.setRequestTransform = function (requestTransform) {
+            this.requestTransform = requestTransform;
+        };
+        /**
+         * Fast way to specify the connection address to NextGIS Web.
+         * The current connection will be severed.
+         * @param baseUrl - NGW url
+         */
+        NgwConnector.prototype.setNgw = function (baseUrl) {
+            this.logout();
+            this.options.baseUrl = baseUrl;
+            addConnector(this);
+        };
+        /**
+         * Establishing a connection with NextGIS Web to fulfill all other requests.
+         * @remarks
+         * This method need not be called manually as it is used when forming a request in {@link apiRequest | apiRequest}.
+         * Can be used to check connection.
+         * @example
+         * ```javascript
+         * const connector = new NgwConnector({baseUrl: 'https://demo.nextgis.com'});
+         * connector.connect()
+         *   .then(() => console.log('Ok'))
+         *   .catch((er) => console.log('Connection problem', er));
+         * ```
+         */
+        NgwConnector.prototype.connect = function () {
+            var _this = this;
+            var cache = new Cache();
+            var auth = this.options.auth;
+            var makeConnect = function () {
+                return new CancelablePromise(function (resolve, reject) {
+                    var makeQuery = function () {
+                        return _this.makeQuery(_this.routeStr, {}, {})
+                            .then(function (route) {
+                            resolve(route);
+                        })
+                            .catch(function (er) {
+                            reject(er);
+                        });
+                    };
+                    if (auth) {
+                        var login = auth.login, password = auth.password;
+                        if (login && password) {
+                            return _this._login({ login: login, password: password })
+                                .then(function () {
+                                return makeQuery();
+                            })
+                                .catch(function (er) { return reject(er); });
+                        }
+                    }
+                    return makeQuery();
+                });
+            };
+            return cache.add('route', makeConnect, {
+                id: this.id,
+                auth: auth,
+                baseUrl: this.options.baseUrl,
+            });
+        };
+        /**
+         * Quick way to change NextGIS Web user.
+         * @param credentials - New user credentials
+         */
+        NgwConnector.prototype.login = function (credentials, options) {
+            this.logout();
+            addConnector(this);
+            return this._login(credentials, options);
+        };
+        /**
+         * Disconnecting a user. Aborting all current requests
+         */
+        NgwConnector.prototype.logout = function () {
+            this.abort();
+            removeConnector(this);
+            this.options.auth = undefined;
+            this.user = undefined;
+            this.emitter.emit('logout');
+            this.resources.cache.clean();
+        };
+        NgwConnector.prototype.getUserInfo = function (credentials, options) {
+            if (this.user && this.user.id) {
+                return CancelablePromise.resolve(this.user);
+            }
+            if (credentials) {
+                this.options.auth = credentials;
+            }
+            var options_ = __assign({ headers: this.getAuthorizationHeaders(credentials) }, options);
+            // Do not use apiRequest('auth.current_user') to avoid circular-references
+            return this.makeQuery('/api/component/auth/current_user', {}, options_);
+        };
+        /**
+         * Obtaining the required Headers for authentication of requests in the NGW.
+         */
+        NgwConnector.prototype.getAuthorizationHeaders = function (credentials) {
+            var client = this.makeClientId(credentials);
+            if (client) {
+                return {
+                    Authorization: 'Basic ' + client,
+                };
+            }
+        };
+        NgwConnector.prototype.makeClientId = function (credentials) {
+            credentials = credentials || this.options.auth;
+            if (credentials) {
+                var login = credentials.login, password = credentials.password;
+                var str = unescape(encodeURIComponent("".concat(login, ":").concat(password)));
+                // @ts-ignore
+                {
+                    return window.btoa(str);
+                }
+            }
+        };
+        /** Stop all api requests */
+        NgwConnector.prototype.abort = function () {
+            for (var _i = 0, _a = this.activeRequests; _i < _a.length; _i++) {
+                var req = _a[_i];
+                req.cancel();
+            }
+            this.activeRequests = [];
+        };
+        NgwConnector.prototype.getActiveApiRequests = function () {
+            return __spreadArray([], this.activeRequests, true);
+        };
+        /**
+         * Send request to NGW api router.
+         * @param name - NGW route name from {@link https://docs.nextgis.com/docs_ngweb_dev/doc/developer/resource.html#routes | routes}
+         * @param params - Request item params or query params
+         * @param requestOptions - Request options
+         *
+         * @example
+         * ```javascript
+         *
+         * // there is such an NGW route item
+         * // "feature_layer.feature.item": [
+         * //   "/api/resource/{0}/feature/{1}",
+         * //   "id",
+         * //   "fid"
+         * // ],
+         *
+         * const connector = new NgwConnector({ baseUrl: 'https://example.nextgis.com' });
+         * connector.apiRequest('feature_layer.feature.item', {
+         *   // request params for {0} and {1}
+         *   'id': 2011,
+         *   'fid': 101,
+         *   // query params
+         *   'srs': 4326,
+         *   'geom_format': 'geojson',
+         * }, { method: 'GET' });
+         * // send get-request to 'https://example.nextgis.com/api/resource/2011/feature/101?srs=4326&geom_format=geojson'
+         *
+         * ```
+         */
+        NgwConnector.prototype.apiRequest = function (name, params_, requestOptions) {
+            var _this = this;
+            var _a;
+            if (params_ === void 0) { params_ = {}; }
+            if (requestOptions === void 0) { requestOptions = {}; }
+            var method = requestOptions.method, headers = requestOptions.headers, withCredentials = requestOptions.withCredentials, responseType = requestOptions.responseType;
+            var params = objectRemoveEmpty(params_);
+            var makeApiRequest = function () {
+                return apiRequest({ name: name, params: params, requestOptions: requestOptions, connector: _this });
+            };
+            if (requestOptions.cache && method === 'GET') {
+                var cache = new Cache();
+                return cache.add(name, makeApiRequest, __assign({ params: params }, objectRemoveEmpty({
+                    headers: headers,
+                    withCredentials: withCredentials,
+                    responseType: responseType,
+                    baseUrl: this.options.baseUrl,
+                    userId: (_a = this.user) === null || _a === void 0 ? void 0 : _a.id,
+                })));
+            }
+            return makeApiRequest();
+        };
+        /**
+         * Shortcut method for send POST request to NGW.
+         * @param name - NGW route name from {@link https://docs.nextgis.com/docs_ngweb_dev/doc/developer/resource.html#routes | routes}
+         * @param options - Request options
+         * @param params - Request item params or query params
+         *
+         * @example
+         * ```javascript
+         * connector.post('resource.collection', { data: POST_PAYLOAD })
+         *   .then((newResource) => console.log(newResource))
+         *   .catch((error) => console.warn(error));
+         * ```
+         */
+        NgwConnector.prototype.post = function (name, options, params) {
+            options = options || {};
+            options.method = 'POST';
+            return this.apiRequest(name, params, options);
+        };
+        /**
+         * Shortcut method for send GET request to NGW.
+         * @param name - NGW route name from {@link https://docs.nextgis.com/docs_ngweb_dev/doc/developer/resource.html#routes | routes}
+         * @param options - Request options
+         * @param params - Request item params or query params
+         */
+        NgwConnector.prototype.get = function (name, options, params) {
+            options = options || {};
+            options.method = 'GET';
+            return this.apiRequest(name, params, options);
+        };
+        /**
+         * Shortcut method for send PATCH request to NGW.
+         * @param name - NGW route name from {@link https://docs.nextgis.com/docs_ngweb_dev/doc/developer/resource.html#routes | routes}
+         * @param options - Request options
+         * @param params - Request item params or query params
+         */
+        NgwConnector.prototype.patch = function (name, options, params) {
+            options = options || {};
+            options.method = 'PATCH';
+            return this.apiRequest(name, params, options);
+        };
+        /**
+         * Shortcut method for send PUT request to NGW.
+         * @param name - NGW route name from {@link https://docs.nextgis.com/docs_ngweb_dev/doc/developer/resource.html#routes | routes}
+         * @param options - Request options
+         * @param params - Request item params or query params
+         */
+        NgwConnector.prototype.put = function (name, options, params) {
+            options = options || {};
+            options.method = 'PUT';
+            return this.apiRequest(name, params, options);
+        };
+        /**
+         * Shortcut method for send DELETE request to NGW.
+         * @param name - NGW route name from {@link https://docs.nextgis.com/docs_ngweb_dev/doc/developer/resource.html#routes | routes}
+         * @param options - Request options
+         * @param params - Request item params or query params
+         */
+        NgwConnector.prototype.delete = function (name, options, params) {
+            options = options || {};
+            options.method = 'DELETE';
+            return this.apiRequest(name, params, options);
+        };
+        /**
+         * Send request to NGW.
+         * @param url - URL address to NGW
+         * @param params - Query params
+         * @param options - Request options
+         */
+        NgwConnector.prototype.makeQuery = function (url, params, options) {
+            if (options === void 0) { options = {}; }
+            url = (this.options.baseUrl ? this.options.baseUrl : '') + url;
+            if (url) {
+                if (params) {
+                    url = template(url, params);
+                }
+                url = encodeURI(fixUrlStr(url));
+                return this._loadData(url, options);
+            }
+            else {
+                throw new Error('Empty `url` not allowed');
+            }
+        };
+        // -------------------------------------------------------------------------
+        // Resource Methods
+        // -------------------------------------------------------------------------
+        /**
+         * {@link ResourcesControl.getOne}
+         */
+        NgwConnector.prototype.getResource = function (resource, requestOptions) {
+            return this.resources.getOne(resource, requestOptions);
+        };
+        /**
+         * {@link ResourcesControl.getOneOrFail}
+         */
+        NgwConnector.prototype.getResourceOrFail = function (resource, requestOptions) {
+            return this.resources.getOneOrFail(resource, requestOptions);
+        };
+        /**
+         * @deprecated - use {@link getResource}
+         */
+        NgwConnector.prototype.getResourceBy = function (resource) {
+            return this.resources.getOne(resource);
+        };
+        /**
+         * @deprecated - use {@link getResource}
+         */
+        NgwConnector.prototype.getResourceByKeyname = function (keyname) {
+            return this.resources.getOne(keyname);
+        };
+        /**
+         * @deprecated - use {@link getResource}
+         */
+        NgwConnector.prototype.getResourceById = function (id) {
+            return this.resources.getOne(id);
+        };
+        /**
+         * {@link ResourcesControl.getId}
+         */
+        NgwConnector.prototype.getResourceId = function (resource, requestOptions) {
+            return this.resources.getId(resource, requestOptions);
+        };
+        /**
+         * {@link ResourcesControl.getIdOrFail}
+         */
+        NgwConnector.prototype.getResourceIdOrFail = function (resource, requestOptions) {
+            return this.resources.getIdOrFail(resource, requestOptions);
+        };
+        /**
+         * {@link ResourcesControl.getMany}
+         */
+        NgwConnector.prototype.getResourcesBy = function (resource, requestOptions) {
+            return this.resources.getMany(resource, requestOptions);
+        };
+        /**
+         * {@link ResourcesControl.getParent}
+         */
+        NgwConnector.prototype.getResourceParent = function (resource, requestOptions) {
+            return this.resources.getParent(resource, requestOptions);
+        };
+        /**
+         * {@link ResourcesControl.getChildrenOf}
+         */
+        NgwConnector.prototype.getResourceChildren = function (resource, requestOptions) {
+            return this.resources.getChildrenOf(resource, requestOptions);
+        };
+        /**
+         * {@link ResourcesControl.update}
+         */
+        NgwConnector.prototype.updateResource = function (resource, data) {
+            return this.resources.update(resource, data);
+        };
+        /**
+         * {@link ResourcesControl.delete}
+         */
+        NgwConnector.prototype.deleteResource = function (resource) {
+            return this.resources.delete(resource);
+        };
+        /**
+         * @internal
+         */
+        NgwConnector.prototype._loadData = function (url, options) {
+            var _this = this;
+            options.responseType = options.responseType || 'json';
+            var request = new CancelablePromise(function (resolve, reject, onCancel) {
+                if (_this.user) {
+                    options = options || {};
+                    // options.withCredentials = true;
+                    options.headers = __assign(__assign({}, _this.getAuthorizationHeaders()), options.headers);
+                }
+                if (_this.requestTransform) {
+                    var _a = _this.requestTransform(url, options), transUrl = _a[0], transOptions = _a[1];
+                    url = transUrl;
+                    options = transOptions;
+                }
+                loadData(url, resolve, options, reject, onCancel);
+            })
+                .then(function (resp) {
+                _this._cleanActiveRequests(request);
+                return resp;
+            })
+                .catch(function (httpError) {
+                _this._cleanActiveRequests(request);
+                if (httpError instanceof CancelablePromise.CancelError) ;
+                else {
+                    // @ts-ignore
+                    {
+                        console.warn('DEV WARN', httpError);
+                    }
+                    var er = _this._handleHttpError(httpError);
+                    if (er) {
+                        throw er;
+                    }
+                }
+            });
+            if (options.signal &&
+                typeof options.signal.addEventListener === 'function') {
+                options.signal.addEventListener('abort', function () {
+                    request.cancel();
+                    _this._cleanActiveRequests(request);
+                });
+            }
+            this.activeRequests.push(request);
+            return request;
+        };
+        NgwConnector.prototype._login = function (credentials, options) {
+            var _this = this;
+            return this.getUserInfo(credentials, options)
+                .then(function (data) {
+                _this.user = data;
+                _this.emitter.emit('login', data);
+                return data;
+            })
+                .catch(function (er) {
+                _this.emitter.emit('login:error', er);
+                throw er;
+            });
+        };
+        NgwConnector.prototype._cleanActiveRequests = function (request) {
+            var activeRequestIndex = this.activeRequests.indexOf(request);
+            if (activeRequestIndex !== -1) {
+                this.activeRequests.splice(activeRequestIndex, 1);
+            }
+        };
+        NgwConnector.prototype._handleHttpError = function (er) {
+            if (er) {
+                if (er instanceof NgwError) {
+                    if (er.exception === 'nextgisweb.resource.exception.ResourceNotFound') {
+                        throw new ResourceNotFoundError(er);
+                    }
+                    else if (er.exception === 'nextgisweb.core.exception.InsufficientPermissions') {
+                        throw new InsufficientPermissionsError(er);
+                    }
+                }
+            }
+            return er;
+        };
+        NgwConnector.errors = {
+            NgwError: NgwError,
+            ResourceNotFoundError: ResourceNotFoundError,
+        };
+        return NgwConnector;
     }());
 
-    /**
-     * A lightweight HTTP client optimized for use with {@link http://docs.nextgis.ru/docs_ngweb_dev/doc/developer/toc.html | NextGIS Web} API
-     *
-     * @remarks
-     * Make sure CORS is registered in the {@link https://docs.nextgis.com/docs_ngcom/source/CORS.html | NextGIS Web settings } to be able to send requests.
-     *
-     * @packageDocumentation
-     * @module ngw-connector
-     */
+    /**
+     * A lightweight HTTP client optimized for use with {@link http://docs.nextgis.ru/docs_ngweb_dev/doc/developer/toc.html | NextGIS Web} API
+     *
+     * @remarks
+     * Make sure CORS is registered in the {@link https://docs.nextgis.com/docs_ngcom/source/CORS.html | NextGIS Web settings } to be able to send requests.
+     *
+     * @packageDocumentation
+     * @module ngw-connector
+     */
     var NgwConnector = NgwConnector$1;
 
-    var NgwProvider = /** @class */ (function (_super) {
-        __extends(NgwProvider, _super);
-        function NgwProvider(options) {
-            var _this = _super.call(this, options) || this;
-            _this.caseInsensitive = true;
-            _this.searchUrl = 'https://maxim.nextgis.com';
-            _this.searchResources = [];
-            _this.requests = [];
-            _this.connector =
-                options.connector ||
-                    new NgwConnector({
-                        baseUrl: _this.searchUrl,
-                    });
-            _this.searchResources = options.searchResources;
-            return _this;
-        }
-        NgwProvider.prototype.abort = function () {
-            this.requests.forEach(function (x) {
-                x.cancel();
-            });
-            this.requests = [];
-        };
-        NgwProvider.prototype.search = function (like) {
-            return __asyncGenerator(this, arguments, function search_1() {
-                var _loop_1, this_1, _i, _a, resource;
-                var _this = this;
-                return __generator(this, function (_b) {
-                    switch (_b.label) {
-                        case 0:
-                            _loop_1 = function (resource) {
-                                var limit, request, resp, entries, _loop_2, _c, _d, item;
-                                return __generator(this, function (_e) {
-                                    switch (_e.label) {
-                                        case 0:
-                                            limit = resource.limit || 300;
-                                            request = this_1.connector.get('feature_layer.store', {
-                                                headers: { RANGE: "items=0-".concat(limit) },
-                                            }, {
-                                                id: resource.id,
-                                                like: like,
-                                            });
-                                            this_1.requests.push(request);
-                                            request.catch(function (er) {
-                                                console.warn(er);
-                                            });
-                                            return [4 /*yield*/, __await(request)];
-                                        case 1:
-                                            resp = _e.sent();
-                                            entries = [];
-                                            if (resp) {
-                                                resp.forEach(function (x) {
-                                                    entries.push(__assign({ query: like, resourceId: resource.id }, x));
-                                                });
-                                            }
-                                            _loop_2 = function (item) {
-                                                return __generator(this, function (_f) {
-                                                    switch (_f.label) {
-                                                        case 0:
-                                                            item.result = function () { return _this.result(item); };
-                                                            return [4 /*yield*/, __await(item)];
-                                                        case 1: return [4 /*yield*/, _f.sent()];
-                                                        case 2:
-                                                            _f.sent();
-                                                            return [2 /*return*/];
-                                                    }
-                                                });
-                                            };
-                                            _c = 0, _d = this_1._items(entries);
-                                            _e.label = 2;
-                                        case 2:
-                                            if (!(_c < _d.length)) return [3 /*break*/, 5];
-                                            item = _d[_c];
-                                            return [5 /*yield**/, _loop_2(item)];
-                                        case 3:
-                                            _e.sent();
-                                            _e.label = 4;
-                                        case 4:
-                                            _c++;
-                                            return [3 /*break*/, 2];
-                                        case 5: return [2 /*return*/];
-                                    }
-                                });
-                            };
-                            this_1 = this;
-                            _i = 0, _a = this.searchResources;
-                            _b.label = 1;
-                        case 1:
-                            if (!(_i < _a.length)) return [3 /*break*/, 4];
-                            resource = _a[_i];
-                            return [5 /*yield**/, _loop_1(resource)];
-                        case 2:
-                            _b.sent();
-                            _b.label = 3;
-                        case 3:
-                            _i++;
-                            return [3 /*break*/, 1];
-                        case 4: return [2 /*return*/];
-                    }
-                });
-            });
-        };
-        NgwProvider.prototype.result = function (item) {
-            var req = this.connector
-                .get('feature_layer.feature.item_extent', null, {
-                id: item.resourceId,
-                fid: item.featureId,
-            })
-                .then(function (x) {
-                var e = x.extent;
-                return {
-                    text: item.text,
-                    extent: [e.minLon, e.minLat, e.maxLon, e.maxLat],
-                };
-            });
-            this.requests.push(req);
-            return req;
-        };
-        NgwProvider.prototype._items = function (entries) {
-            var _this = this;
-            var items = [];
-            entries.forEach(function (entry) {
-                var meta = _this.searchResources.find(function (x) { return x.id === entry.resourceId; });
-                if (meta) {
-                    items.push({
-                        query: entry.query,
-                        text: entry.label,
-                        featureId: entry.id,
-                        resourceId: entry.resourceId,
-                    });
-                }
-            });
-            return items;
-        };
-        return NgwProvider;
+    function reEscape(s) {
+        return s.replace(/[-/\\^$*+?.()|[\]{}]/g, '\\$&');
+    }
+    function like(b, a, iLike) {
+        a = String(a);
+        b = String(b);
+        if (a === b)
+            return true;
+        if (iLike && a.toUpperCase() === b.toUpperCase())
+            return true;
+        var re = "^".concat(reEscape(a), "$").replace(/%/g, '.*').replace('_', '.');
+        return new RegExp(re, iLike ? 'i' : '').exec(b) !== null;
+    }
+    var operationsAliases = {
+        // greater(>)
+        gt: function (a, b) { return a > b; },
+        // lower(<)
+        lt: function (a, b) { return a < b; },
+        // greater or equal(>=)
+        ge: function (a, b) { return a >= b; },
+        // lower or equal(<=)
+        le: function (a, b) { return a <= b; },
+        // equal(=)
+        eq: function (a, b) { return a === b; },
+        //  not equal(!=)
+        ne: function (a, b) { return a !== b; },
+        in: function (a, b) { return b.indexOf(a) !== -1; },
+        notin: function (a, b) { return b.indexOf(a) === -1; },
+        // LIKE SQL statement(for strings compare)
+        like: function (a, b) {
+            return like(a, b);
+        },
+        // ILIKE SQL statement(for strings compare)
+        ilike: function (a, b) {
+            return like(a, b, true);
+        },
+    };
+    function isPropertyFilter(filter) {
+        var pf = filter;
+        if (pf.length === 3 &&
+            typeof pf[0] === 'string' &&
+            typeof pf[1] === 'string') {
+            return true;
+        }
+        return false;
+    }
+    function propertiesFilter(properties, filters) {
+        var logic = typeof filters[0] === 'string' ? filters[0] : 'all';
+        var filterFunction = function (p) {
+            if (isPropertyFilter(p)) {
+                var field_1 = p[0], operation = p[1], value_1 = p[2];
+                var operationExec = operationsAliases[operation];
+                if (operationExec) {
+                    if (operation === 'like' || operation === 'ilike') {
+                        if (typeof field_1 === 'string') {
+                            var prop_1 = '';
+                            var value_ = field_1.replace(/^%?(\w+)%?$/, function (match, cleanField) {
+                                prop_1 = properties[cleanField];
+                                return field_1.replace(cleanField, value_1);
+                            });
+                            return operationExec(prop_1, value_);
+                        }
+                    }
+                    return operationExec(properties[field_1], value_1);
+                }
+                return false;
+            }
+            else {
+                return propertiesFilter(properties, p);
+            }
+        };
+        var filters_ = filters.filter(function (x) { return Array.isArray(x); });
+        return logic === 'any'
+            ? filters_.some(filterFunction)
+            : filters_.every(filterFunction);
+    }
+
+    var FEATURE_REQUEST_PARAMS = {
+        srs: 4326,
+        geom_format: 'geojson',
+    };
+    function updateItemRequestParam(params, options) {
+        var extensions = options.extensions, geom = options.geom, fields = options.fields, srs = options.srs, ilike = options.ilike, like = options.like;
+        if (extensions) {
+            params.extensions = extensions.join(',');
+        }
+        if (fields !== undefined) {
+            params.fields = Array.isArray(fields) ? fields.join(',') : '';
+        }
+        if (geom !== undefined) {
+            params.geom = geom ? 'yes' : 'no';
+            if (!geom) {
+                delete params.srs;
+                delete params.geom_format;
+            }
+        }
+        if (defined(ilike)) {
+            params.ilike = ilike;
+        }
+        else if (defined(like)) {
+            params.like = like;
+        }
+        if (defined(srs)) {
+            params.srs = srs;
+        }
+    }
+    // NGW REST API is not able to filtering by combined queries
+    // therefore the filter is divided into several requests
+    function createFeatureFieldFilterQueries(opt) {
+        var queries = getQueries(opt);
+        return CancelablePromise.all(queries).then(function (itemsParts) {
+            // this list of ids used for optimization
+            var ids = [];
+            var items = [];
+            for (var _i = 0, itemsParts_1 = itemsParts; _i < itemsParts_1.length; _i++) {
+                var part = itemsParts_1[_i];
+                for (var _a = 0, part_1 = part; _a < part_1.length; _a++) {
+                    var item = part_1[_a];
+                    if (!ids.includes(item.id)) {
+                        items.push(item);
+                        ids.push(item.id);
+                    }
+                }
+            }
+            var offset = opt.offset !== undefined ? opt.offset : 0;
+            var limit = opt.limit !== undefined ? opt.limit : items.length;
+            if (opt.offset || opt.limit) {
+                return items.splice(offset, limit);
+            }
+            return items;
+        });
+    }
+    function createParam(pf) {
+        var field = pf[0], operation = pf[1], value = pf[2];
+        var isFldStr = field !== 'id' ? 'fld_' : '';
+        var vStart = '';
+        var vEnd = '';
+        var field_ = String(field)
+            .trim()
+            .replace(/^(%?)(.+?)(%?)$/, function (m, a, b, c) {
+            vStart = a;
+            vEnd = c;
+            return b;
+        });
+        var v = vStart + value + vEnd;
+        return ["".concat(isFldStr).concat(field_, "__").concat(operation), v];
+    }
+    function getQueries(opt, _queries, _parentAllParams) {
+        if (_queries === void 0) { _queries = []; }
+        if (_parentAllParams === void 0) { _parentAllParams = []; }
+        var filters = opt.filters;
+        var logic = typeof filters[0] === 'string' ? filters[0] : 'all';
+        var filters_ = filters.filter(function (x) { return Array.isArray(x); });
+        if (logic === 'any') {
+            for (var _i = 0, filters_1 = filters_; _i < filters_1.length; _i++) {
+                var f = filters_1[_i];
+                if (isPropertyFilter(f)) {
+                    _queries.push(fetchNgwLayerItemsRequest(__assign(__assign({}, opt), { paramList: __spreadArray(__spreadArray([], _parentAllParams, true), [createParam(f)], false) })));
+                }
+                else {
+                    getQueries(__assign(__assign({}, opt), { filters: f }), _queries, __spreadArray([], _parentAllParams, true));
+                }
+            }
+        }
+        else if (logic === 'all') {
+            var filters_3 = [];
+            var propertiesFilterList = [];
+            for (var _a = 0, filters_2 = filters_; _a < filters_2.length; _a++) {
+                var f = filters_2[_a];
+                if (isPropertyFilter(f)) {
+                    filters_3.push(createParam(f));
+                }
+                else {
+                    propertiesFilterList.push(f);
+                }
+            }
+            if (propertiesFilterList.length) {
+                for (var _b = 0, propertiesFilterList_1 = propertiesFilterList; _b < propertiesFilterList_1.length; _b++) {
+                    var x = propertiesFilterList_1[_b];
+                    getQueries(__assign(__assign({}, opt), { filters: x }), _queries, __spreadArray(__spreadArray([], _parentAllParams, true), filters_3, true));
+                }
+            }
+            else {
+                _queries.push(fetchNgwLayerItemsRequest(__assign(__assign({}, opt), { paramList: __spreadArray(__spreadArray([], _parentAllParams, true), filters_3, true) })));
+            }
+        }
+        return _queries;
+    }
+    function createWktFromCoordArray(coord) {
+        var polygon = coord.map(function (_a) {
+            var lng = _a[0], lat = _a[1];
+            var _b = degrees2meters(lng, lat).map(function (c) { return round(c); }), x = _b[0], y = _b[1];
+            return x + ' ' + y;
+        });
+        return "POLYGON((".concat(polygon.join(', '), "))");
+    }
+    function fetchNgwLayerItemsRequest(options) {
+        var params = __assign({}, FEATURE_REQUEST_PARAMS);
+        var limit = options.limit, cache = options.cache, signal = options.signal, offset = options.offset, orderBy = options.orderBy, paramList = options.paramList, connector = options.connector, geomFormat = options.geomFormat, intersects = options.intersects, resourceId = options.resourceId;
+        if (limit) {
+            if (limit !== Number.POSITIVE_INFINITY) {
+                params.limit = limit;
+            }
+        }
+        else {
+            // Strict restriction on loading data from large layers
+            params.limit = 7000;
+        }
+        if (offset) {
+            params.offset = offset;
+        }
+        if (geomFormat) {
+            params.geom_format = geomFormat;
+        }
+        updateItemRequestParam(params, options);
+        if (orderBy) {
+            params.order_by = orderBy.join(',');
+        }
+        if (Array.isArray(intersects)) {
+            var coordinates = isLngLatBoundsArray(intersects)
+                ? getBoundsCoordinates(intersects)
+                : intersects;
+            params.intersects = createWktFromCoordArray(coordinates);
+        }
+        else if (typeof intersects === 'string') {
+            params.intersects = intersects;
+        }
+        if (paramList) {
+            params.paramList = paramList;
+        }
+        var reqParams = __assign({ id: resourceId }, params);
+        return connector.get('feature_layer.feature.collection', { cache: cache, signal: signal }, reqParams);
+    }
+
+    function prepareNgwFieldsToPropertiesFilter(fields) {
+        var f;
+        var _loop_1 = function () {
+            var field = fields[f];
+            if (isObject$1(field)) {
+                var date = field;
+                if (defined(date.year) && defined(date.month) && defined(date.day)) {
+                    var dt_1 = [
+                        date.year,
+                        date.month - 1,
+                        date.day,
+                    ];
+                    if ('hour' in date) {
+                        [date.hour, date.minute, date.second].forEach(function (x) {
+                            dt_1.push(x);
+                        });
+                    }
+                    fields[f] = new (Date.bind.apply(Date, __spreadArray([void 0], dt_1, false)))().toISOString();
+                }
+            }
+            else if (f === 'id' && typeof field === 'string') {
+                fields[f] = field.split(',').map(Number);
+            }
+        };
+        for (f in fields) {
+            _loop_1();
+        }
+        return fields;
+    }
+
+    function fetchNgwLayerItems(options) {
+        var filters = options.filters;
+        if (filters) {
+            return createFeatureFieldFilterQueries(__assign(__assign({}, options), { filters: filters })).then(function (data) {
+                var _a;
+                var clientFilterValidate = (_a = options.clientFilterValidate) !== null && _a !== void 0 ? _a : isFilterWithAnyCase(filters);
+                // Additional client-side filter check
+                if (clientFilterValidate) {
+                    data = data.filter(function (y) {
+                        var fields = prepareNgwFieldsToPropertiesFilter(__assign(__assign({}, y.fields), { id: y.id }));
+                        var result = propertiesFilter(fields, filters);
+                        return result;
+                    });
+                }
+                return data;
+            });
+        }
+        else {
+            return fetchNgwLayerItemsRequest(options);
+        }
+    }
+    function isFilterWithAnyCase(filters) {
+        if (filters[0] === 'any') {
+            return true;
+        }
+        for (var i = 1; i < filters.length; i++) {
+            var p = filters[i];
+            if (isArray(p)) {
+                var deep = isFilterWithAnyCase(p);
+                if (deep) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    var NgwProvider = /** @class */ (function (_super) {
+        __extends(NgwProvider, _super);
+        function NgwProvider(options) {
+            var _this = this;
+            var _a;
+            _this = _super.call(this, options) || this;
+            _this.caseInsensitive = true;
+            _this.searchResources = [];
+            _this._abortControllers = [];
+            if (!options.searchUrl && !((_a = options.connectorOptions) === null || _a === void 0 ? void 0 : _a.baseUrl)) {
+                throw new Error('The `searchUrl` of `connectorOptions.baseUrl` are required');
+            }
+            _this.connector =
+                options.connector ||
+                    new NgwConnector(__assign({ baseUrl: _this.searchUrl }, options.connectorOptions));
+            _this.searchResources = options.searchResources;
+            return _this;
+        }
+        NgwProvider.prototype.abort = function () {
+            this._abortControllers.forEach(function (a) {
+                a.abort();
+            });
+            this._abortControllers.length = 0;
+        };
+        NgwProvider.prototype.search = function (query) {
+            var _a, _b;
+            return __asyncGenerator(this, arguments, function search_1() {
+                var signal, _i, _c, config, searchMethod, limit, resourceId, resource, options, request, entries, _loop_1, _d, _e, item, er_1;
+                var _this = this;
+                return __generator(this, function (_f) {
+                    switch (_f.label) {
+                        case 0:
+                            signal = this._makeSignal();
+                            _i = 0, _c = this.searchResources;
+                            _f.label = 1;
+                        case 1:
+                            if (!(_i < _c.length)) return [3 /*break*/, 11];
+                            config = _c[_i];
+                            if (signal.aborted) {
+                                return [3 /*break*/, 11];
+                            }
+                            searchMethod = config.searchMethod;
+                            limit = (_a = config.limit) !== null && _a !== void 0 ? _a : NgwProvider.limit;
+                            resourceId = (_b = config.id) !== null && _b !== void 0 ? _b : config.resourceId;
+                            _f.label = 2;
+                        case 2:
+                            _f.trys.push([2, 9, , 10]);
+                            return [4 /*yield*/, __await(this.connector.getResourceOrFail(resourceId, {
+                                    cache: true,
+                                }))];
+                        case 3:
+                            resource = _f.sent();
+                            options = {
+                                connector: this.connector,
+                                resourceId: resourceId,
+                                signal: signal,
+                                limit: limit,
+                            };
+                            if (searchMethod === 'like') {
+                                options.like = query;
+                            }
+                            else {
+                                options.ilike = query;
+                            }
+                            request = fetchNgwLayerItems(options);
+                            return [4 /*yield*/, __await(request)];
+                        case 4:
+                            entries = _f.sent();
+                            _loop_1 = function (item) {
+                                return __generator(this, function (_g) {
+                                    switch (_g.label) {
+                                        case 0:
+                                            item.result = function () { return _this.result(item); };
+                                            return [4 /*yield*/, __await(item)];
+                                        case 1: return [4 /*yield*/, _g.sent()];
+                                        case 2:
+                                            _g.sent();
+                                            return [2 /*return*/];
+                                    }
+                                });
+                            };
+                            _d = 0, _e = this._items({
+                                entries: entries,
+                                query: query,
+                                config: config,
+                                resourceItem: resource,
+                            });
+                            _f.label = 5;
+                        case 5:
+                            if (!(_d < _e.length)) return [3 /*break*/, 8];
+                            item = _e[_d];
+                            return [5 /*yield**/, _loop_1(item)];
+                        case 6:
+                            _f.sent();
+                            _f.label = 7;
+                        case 7:
+                            _d++;
+                            return [3 /*break*/, 5];
+                        case 8: return [3 /*break*/, 10];
+                        case 9:
+                            er_1 = _f.sent();
+                            if (er_1 &&
+                                'name' in er_1 &&
+                                er_1.name !== 'CancelError') {
+                                console.warn(er_1);
+                            }
+                            return [3 /*break*/, 10];
+                        case 10:
+                            _i++;
+                            return [3 /*break*/, 1];
+                        case 11: return [2 /*return*/];
+                    }
+                });
+            });
+        };
+        NgwProvider.prototype.result = function (item) {
+            var signal = this._makeSignal();
+            var req = this.connector
+                .get('feature_layer.feature.item_extent', { signal: signal }, {
+                id: item.resourceId,
+                fid: item.featureId,
+            })
+                .then(function (x) {
+                var e = x.extent;
+                return {
+                    text: item.text,
+                    extent: [e.minLon, e.minLat, e.maxLon, e.maxLat],
+                };
+            });
+            return req;
+        };
+        NgwProvider.prototype._makeSignal = function () {
+            var abortController = new AbortController();
+            this._abortControllers.push(abortController);
+            return abortController.signal;
+        };
+        NgwProvider.prototype._items = function (_a) {
+            var _b;
+            var entries = _a.entries, query = _a.query, config = _a.config, resourceItem = _a.resourceItem;
+            var items = [];
+            var labelField = undefined;
+            if (resourceItem.feature_layer) {
+                labelField = (_b = resourceItem.feature_layer.fields.find(function (f) { return f.label_field; })) === null || _b === void 0 ? void 0 : _b.keyname;
+            }
+            var meta = this.searchResources.find(function (x) { var _a; return (_a = x.id) !== null && _a !== void 0 ? _a : x.resourceId === resourceItem.resource.id; });
+            if (meta) {
+                entries.forEach(function (entry) {
+                    var text = labelField ? entry.fields[labelField] : entry.id;
+                    if (config.renderSearch) {
+                        text = config.renderSearch({
+                            item: entry,
+                            resourceItem: resourceItem,
+                        });
+                    }
+                    else if (labelField) {
+                        text = entry.fields[labelField];
+                    }
+                    items.push({
+                        query: query,
+                        text: text,
+                        featureId: entry.id,
+                        resourceId: resourceItem.resource.id,
+                        item: entry,
+                        resourceItem: resourceItem,
+                    });
+                });
+            }
+            return items;
+        };
+        NgwProvider.limit = 300;
+        return NgwProvider;
     }(BaseProvider));
 
-    var NominatimProvider = /** @class */ (function (_super) {
-        __extends(NominatimProvider, _super);
-        function NominatimProvider(options) {
-            var _this = _super.call(this, options) || this;
-            _this.searchUrl = 'https://nominatim.openstreetmap.org';
-            _this._requests = [];
-            return _this;
-        }
-        NominatimProvider.prototype.abort = function () {
-            this._requests.forEach(function (x) { return x.cancel(); });
-            this._requests = [];
-        };
-        NominatimProvider.prototype.search = function (val) {
-            return __asyncGenerator(this, arguments, function search_1() {
-                var url, request, items, _loop_1, _i, items_1, i;
-                var _this = this;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
-                        case 0:
-                            url = fixUrlStr(
-                            // `${this.baseUrl}/search?format=geojson&polygon_geojson=1${window.locale === 'ru' ? '&accept-language=ru-RU,en-US' : ''}&q=${val}`
-                            "".concat(this.searchUrl, "/search?format=geojson&polygon_geojson=1&q=").concat(val));
-                            request = new CancelablePromise(function (resolve, reject, onCancel) {
-                                var xhr = new XMLHttpRequest();
-                                xhr.open('GET', url, true);
-                                xhr.onload = function () {
-                                    try {
-                                        var geojson = JSON.parse(xhr.responseText);
-                                        var features = geojson.features.map(function (x) {
-                                            return {
-                                                geom: x,
-                                                extent: x.bbox,
-                                                text: x.properties && x.properties.display_name,
-                                                query: val,
-                                            };
-                                        });
-                                        resolve(features);
-                                    }
-                                    catch (er) {
-                                        reject(er);
-                                    }
-                                };
-                                xhr.onerror = function (er) {
-                                    reject(er);
-                                };
-                                onCancel(function () {
-                                    xhr.abort();
-                                });
-                                xhr.send();
-                            }).catch(function (er) {
-                                if (er.name === 'CancelError') ;
-                                throw er;
-                            });
-                            this._requests.push(request);
-                            return [4 /*yield*/, __await(request)];
-                        case 1:
-                            items = _a.sent();
-                            if (!items) return [3 /*break*/, 5];
-                            _loop_1 = function (i) {
-                                return __generator(this, function (_b) {
-                                    switch (_b.label) {
-                                        case 0:
-                                            i.result = function () { return _this.result(i); };
-                                            return [4 /*yield*/, __await(i)];
-                                        case 1: return [4 /*yield*/, _b.sent()];
-                                        case 2:
-                                            _b.sent();
-                                            return [2 /*return*/];
-                                    }
-                                });
-                            };
-                            _i = 0, items_1 = items;
-                            _a.label = 2;
-                        case 2:
-                            if (!(_i < items_1.length)) return [3 /*break*/, 5];
-                            i = items_1[_i];
-                            return [5 /*yield**/, _loop_1(i)];
-                        case 3:
-                            _a.sent();
-                            _a.label = 4;
-                        case 4:
-                            _i++;
-                            return [3 /*break*/, 2];
-                        case 5: return [2 /*return*/];
-                    }
-                });
-            });
-        };
-        NominatimProvider.prototype.result = function (model) {
-            return CancelablePromise.resolve({
-                text: model.text,
-                extent: model.extent || [],
-                geom: model.geom,
-            });
-        };
-        return NominatimProvider;
+    var NominatimProvider = /** @class */ (function (_super) {
+        __extends(NominatimProvider, _super);
+        function NominatimProvider(options) {
+            var _this = _super.call(this, options) || this;
+            _this.searchUrl = 'https://nominatim.openstreetmap.org';
+            _this._requests = [];
+            return _this;
+        }
+        NominatimProvider.prototype.abort = function () {
+            this._requests.forEach(function (x) { return x.cancel(); });
+            this._requests = [];
+        };
+        NominatimProvider.prototype.search = function (val) {
+            return __asyncGenerator(this, arguments, function search_1() {
+                var url, request, items, _loop_1, _i, items_1, i;
+                var _this = this;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            url = fixUrlStr(
+                            // `${this.baseUrl}/search?format=geojson&polygon_geojson=1${window.locale === 'ru' ? '&accept-language=ru-RU,en-US' : ''}&q=${val}`
+                            "".concat(this.searchUrl, "/search?format=geojson&polygon_geojson=1&q=").concat(val));
+                            request = new CancelablePromise(function (resolve, reject, onCancel) {
+                                var xhr = new XMLHttpRequest();
+                                xhr.open('GET', url, true);
+                                xhr.onload = function () {
+                                    try {
+                                        var geojson = JSON.parse(xhr.responseText);
+                                        var features = geojson.features.map(function (x) {
+                                            return {
+                                                geom: x,
+                                                extent: x.bbox,
+                                                text: x.properties && x.properties.display_name,
+                                                query: val,
+                                            };
+                                        });
+                                        resolve(features);
+                                    }
+                                    catch (er) {
+                                        reject(er);
+                                    }
+                                };
+                                xhr.onerror = function (er) {
+                                    reject(er);
+                                };
+                                onCancel(function () {
+                                    xhr.abort();
+                                });
+                                xhr.send();
+                            }).catch(function (er) {
+                                if (er.name === 'CancelError') ;
+                                throw er;
+                            });
+                            this._requests.push(request);
+                            return [4 /*yield*/, __await(request)];
+                        case 1:
+                            items = _a.sent();
+                            if (!items) return [3 /*break*/, 5];
+                            _loop_1 = function (i) {
+                                return __generator(this, function (_b) {
+                                    switch (_b.label) {
+                                        case 0:
+                                            i.result = function () { return _this.result(i); };
+                                            return [4 /*yield*/, __await(i)];
+                                        case 1: return [4 /*yield*/, _b.sent()];
+                                        case 2:
+                                            _b.sent();
+                                            return [2 /*return*/];
+                                    }
+                                });
+                            };
+                            _i = 0, items_1 = items;
+                            _a.label = 2;
+                        case 2:
+                            if (!(_i < items_1.length)) return [3 /*break*/, 5];
+                            i = items_1[_i];
+                            return [5 /*yield**/, _loop_1(i)];
+                        case 3:
+                            _a.sent();
+                            _a.label = 4;
+                        case 4:
+                            _i++;
+                            return [3 /*break*/, 2];
+                        case 5: return [2 /*return*/];
+                    }
+                });
+            });
+        };
+        NominatimProvider.prototype.result = function (model) {
+            return CancelablePromise.resolve({
+                text: model.text,
+                extent: model.extent || [],
+                geom: model.geom,
+            });
+        };
+        return NominatimProvider;
     }(BaseProvider));
 
-    function create(options) {
-        return new Geocoder(options);
+    /**
+     * Modern geocoder on async generators. May use different data providers.
+     *
+     * @packageDocumentation
+     * @module geocoder
+     */
+    function create(options) {
+        return new Geocoder(options);
     }
 
     exports.BaseProvider = BaseProvider;