@nextgis/ngw-map 3.0.1 → 4.0.0-alpha.0

package/lib/ngw-map.global.js

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/ngw-map; version: 3.0.1; author: NextGIS */
+/** Bundle of @nextgis/ngw-map; version: 4.0.0-alpha.0; author: NextGIS */
 var NgwMap = (function (exports) {
   'use strict';
 
@@ -354,6 +354,20 @@ var NgwMap = (function (exports) {
   function fixUrlStr(url) {
     return url.replace(/([^:]\/)\/+/g, "$1");
   }
+  function updateUrlParams(urlStr, params) {
+    const url = new URL(urlStr);
+    const searchParams = new URLSearchParams(url.search);
+    Object.entries(params).forEach(([key, value]) => {
+      if (value === void 0) {
+        searchParams.delete(key);
+      } else {
+        searchParams.set(key, value);
+      }
+    });
+    searchParams.set("timestamp", String((/* @__PURE__ */ new Date()).getTime()));
+    const newSearch = [...searchParams.entries()].map(([key, value]) => `${key}=${value}`).join("&");
+    return `${url.origin}${url.pathname}?${newSearch}`;
+  }
 
   const templateRe = /\{ *([\w_-]+) *\}/g;
   function template(str, data) {
@@ -368,19 +382,19 @@ var NgwMap = (function (exports) {
     });
   }
 
-  var __defProp$R = Object.defineProperty;
-  var __getOwnPropSymbols$z = Object.getOwnPropertySymbols;
-  var __hasOwnProp$z = Object.prototype.hasOwnProperty;
-  var __propIsEnum$z = Object.prototype.propertyIsEnumerable;
-  var __defNormalProp$R = (obj, key, value) => key in obj ? __defProp$R(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __spreadValues$y = (a, b) => {
+  var __defProp$S = Object.defineProperty;
+  var __getOwnPropSymbols$A = Object.getOwnPropertySymbols;
+  var __hasOwnProp$A = Object.prototype.hasOwnProperty;
+  var __propIsEnum$A = Object.prototype.propertyIsEnumerable;
+  var __defNormalProp$S = (obj, key, value) => key in obj ? __defProp$S(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+  var __spreadValues$z = (a, b) => {
     for (var prop in b || (b = {}))
-      if (__hasOwnProp$z.call(b, prop))
-        __defNormalProp$R(a, prop, b[prop]);
-    if (__getOwnPropSymbols$z)
-      for (var prop of __getOwnPropSymbols$z(b)) {
-        if (__propIsEnum$z.call(b, prop))
-          __defNormalProp$R(a, prop, b[prop]);
+      if (__hasOwnProp$A.call(b, prop))
+        __defNormalProp$S(a, prop, b[prop]);
+    if (__getOwnPropSymbols$A)
+      for (var prop of __getOwnPropSymbols$A(b)) {
+        if (__propIsEnum$A.call(b, prop))
+          __defNormalProp$S(a, prop, b[prop]);
       }
     return a;
   };
@@ -443,7 +457,7 @@ var NgwMap = (function (exports) {
           }
         }
         if (url) {
-          return connector.makeQuery(url, params, __spreadValues$y({
+          return connector.makeQuery(url, params, __spreadValues$z({
             cacheName: name
           }, requestOptions));
         } else {
@@ -455,9 +469,9 @@ var NgwMap = (function (exports) {
     });
   }
 
-  var __defProp$Q = Object.defineProperty;
-  var __defNormalProp$Q = (obj, key, value) => key in obj ? __defProp$Q(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __publicField$A = (obj, key, value) => __defNormalProp$Q(obj, typeof key !== "symbol" ? key + "" : key, value);
+  var __defProp$R = Object.defineProperty;
+  var __defNormalProp$R = (obj, key, value) => key in obj ? __defProp$R(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+  var __publicField$A = (obj, key, value) => __defNormalProp$R(obj, typeof key !== "symbol" ? key + "" : key, value);
   const _Cache = class _Cache {
     constructor(options = {}) {
       __publicField$A(this, "cache", []);
@@ -624,7 +638,9 @@ var NgwMap = (function (exports) {
     this.domain = null;
     if (EventEmitter.usingDomains) {
       // if there is an active domain, then attach to it.
-      if (domain.active) ;
+      if (domain.active && !(this instanceof domain.Domain)) {
+        this.domain = domain.active;
+      }
     }
 
     if (!this._events || this._events === Object.getPrototypeOf(this)._events) {
@@ -1067,63 +1083,7 @@ var NgwMap = (function (exports) {
   }
 
   var pkg = {
-  	name: "@nextgis/ngw-connector",
-  	version: "3.0.1",
-  	_priority: 12,
-  	description: "A lightweight HTTP client optimized for use with NextGIS Web API",
-  	main: "index.js",
-  	module: "lib/ngw-connector.esm-bundler.js",
-  	unpkg: "lib/ngw-connector.global.prod.js",
-  	jsdelivr: "lib/ngw-connector.global.prod.js",
-  	types: "lib/index.d.ts",
-  	dependencies: {
-  		"@nextgis/cache": "3.0.0",
-  		"@nextgis/cancelable-promise": "3.0.0",
-  		"@nextgis/utils": "3.0.0",
-  		"@types/events": "^3.0.0",
-  		events: "*",
-  		"form-data": "^4.0.0"
-  	},
-  	devDependencies: {
-  		"@nextgis/build-tools": "3.0.0"
-  	},
-  	scripts: {
-  		clean: "rimraf ./lib",
-  		dev: "node ../build-tools/lib/build.js",
-  		prod: "npm run dev -- --release",
-  		lint: "eslint ./src/**/*.ts --fix --c ../../.eslintrc",
-  		watch: "npm run dev -- --watch",
-  		"gen:types": "node ./scripts/generator"
-  	},
-  	buildOptions: {
-  		name: "NgwConnector",
-  		formats: [
-  			"esm-bundler",
-  			"esm-browser",
-  			"cjs",
-  			"global"
-  		]
-  	},
-  	keywords: [
-  		"NextGIS",
-  		"MAP"
-  	],
-  	author: "NextGIS",
-  	files: [
-  		"index.js",
-  		"lib"
-  	],
-  	license: "MIT",
-  	homepage: "https://github.com/nextgis/nextgis_frontend/tree/master/packages/ngw-connector#readme",
-  	repository: {
-  		type: "git",
-  		url: "git://github.com/nextgis/nextgis_frontend.git"
-  	},
-  	engines: {
-  		node: ">=18.20.4"
-  	},
-  	gitHead: "edc68033f914f6c95c4125b9738bba6d36e990b4"
-  };
+  	version: "3.0.1"};
 
   class AbortError extends Error {
     constructor(message = "AbortError") {
@@ -1132,9 +1092,9 @@ var NgwMap = (function (exports) {
     }
   }
 
-  var __defProp$P = Object.defineProperty;
-  var __defNormalProp$P = (obj, key, value) => key in obj ? __defProp$P(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __publicField$z = (obj, key, value) => __defNormalProp$P(obj, typeof key !== "symbol" ? key + "" : key, value);
+  var __defProp$Q = Object.defineProperty;
+  var __defNormalProp$Q = (obj, key, value) => key in obj ? __defProp$Q(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+  var __publicField$z = (obj, key, value) => __defNormalProp$Q(obj, typeof key !== "symbol" ? key + "" : key, value);
   class NgwError extends Error {
     constructor(er) {
       super();
@@ -1151,9 +1111,9 @@ var NgwMap = (function (exports) {
     }
   }
 
-  var __defProp$O = Object.defineProperty;
-  var __defNormalProp$O = (obj, key, value) => key in obj ? __defProp$O(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __publicField$y = (obj, key, value) => __defNormalProp$O(obj, typeof key !== "symbol" ? key + "" : key, value);
+  var __defProp$P = Object.defineProperty;
+  var __defNormalProp$P = (obj, key, value) => key in obj ? __defProp$P(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+  var __publicField$y = (obj, key, value) => __defNormalProp$P(obj, typeof key !== "symbol" ? key + "" : key, value);
   class InsufficientPermissionsError extends NgwError {
     constructor(obj) {
       super(obj);
@@ -1163,9 +1123,9 @@ var NgwMap = (function (exports) {
     }
   }
 
-  var __defProp$N = Object.defineProperty;
-  var __defNormalProp$N = (obj, key, value) => key in obj ? __defProp$N(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __publicField$x = (obj, key, value) => __defNormalProp$N(obj, typeof key !== "symbol" ? key + "" : key, value);
+  var __defProp$O = Object.defineProperty;
+  var __defNormalProp$O = (obj, key, value) => key in obj ? __defProp$O(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+  var __publicField$x = (obj, key, value) => __defNormalProp$O(obj, typeof key !== "symbol" ? key + "" : key, value);
   let NetworksResponseError$1 = class NetworksResponseError extends NgwError {
     constructor(obj) {
       super(obj);
@@ -1208,9 +1168,9 @@ var NgwMap = (function (exports) {
     return false;
   }
 
-  var __defProp$M = Object.defineProperty;
-  var __defNormalProp$M = (obj, key, value) => key in obj ? __defProp$M(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __publicField$w = (obj, key, value) => __defNormalProp$M(obj, key + "" , value);
+  var __defProp$N = Object.defineProperty;
+  var __defNormalProp$N = (obj, key, value) => key in obj ? __defProp$N(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+  var __publicField$w = (obj, key, value) => __defNormalProp$N(obj, key + "" , value);
   class NetworkError extends Error {
     constructor(url) {
       super();
@@ -1221,9 +1181,9 @@ var NgwMap = (function (exports) {
     }
   }
 
-  var __defProp$L = Object.defineProperty;
-  var __defNormalProp$L = (obj, key, value) => key in obj ? __defProp$L(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __publicField$v = (obj, key, value) => __defNormalProp$L(obj, typeof key !== "symbol" ? key + "" : key, value);
+  var __defProp$M = Object.defineProperty;
+  var __defNormalProp$M = (obj, key, value) => key in obj ? __defProp$M(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+  var __publicField$v = (obj, key, value) => __defNormalProp$M(obj, typeof key !== "symbol" ? key + "" : key, value);
   class ResourceNotFoundError extends NgwError {
     constructor(obj) {
       super(obj);
@@ -1245,9 +1205,9 @@ var NgwMap = (function (exports) {
     isError: isError
   });
 
-  var __defProp$K = Object.defineProperty;
-  var __defNormalProp$K = (obj, key, value) => key in obj ? __defProp$K(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __publicField$u = (obj, key, value) => __defNormalProp$K(obj, typeof key !== "symbol" ? key + "" : key, value);
+  var __defProp$L = Object.defineProperty;
+  var __defNormalProp$L = (obj, key, value) => key in obj ? __defProp$L(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+  var __publicField$u = (obj, key, value) => __defNormalProp$L(obj, typeof key !== "symbol" ? key + "" : key, value);
   class BaseAPIError extends Error {
     constructor(message) {
       super(message || "Something went wrong.");
@@ -1309,30 +1269,30 @@ var NgwMap = (function (exports) {
     }
   }
 
-  var __defProp$J = Object.defineProperty;
-  var __getOwnPropSymbols$y = Object.getOwnPropertySymbols;
-  var __hasOwnProp$y = Object.prototype.hasOwnProperty;
-  var __propIsEnum$y = Object.prototype.propertyIsEnumerable;
-  var __defNormalProp$J = (obj, key, value) => key in obj ? __defProp$J(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __spreadValues$x = (a, b) => {
+  var __defProp$K = Object.defineProperty;
+  var __getOwnPropSymbols$z = Object.getOwnPropertySymbols;
+  var __hasOwnProp$z = Object.prototype.hasOwnProperty;
+  var __propIsEnum$z = Object.prototype.propertyIsEnumerable;
+  var __defNormalProp$K = (obj, key, value) => key in obj ? __defProp$K(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+  var __spreadValues$y = (a, b) => {
     for (var prop in b || (b = {}))
-      if (__hasOwnProp$y.call(b, prop))
-        __defNormalProp$J(a, prop, b[prop]);
-    if (__getOwnPropSymbols$y)
-      for (var prop of __getOwnPropSymbols$y(b)) {
-        if (__propIsEnum$y.call(b, prop))
-          __defNormalProp$J(a, prop, b[prop]);
+      if (__hasOwnProp$z.call(b, prop))
+        __defNormalProp$K(a, prop, b[prop]);
+    if (__getOwnPropSymbols$z)
+      for (var prop of __getOwnPropSymbols$z(b)) {
+        if (__propIsEnum$z.call(b, prop))
+          __defNormalProp$K(a, prop, b[prop]);
       }
     return a;
   };
-  var __objRest$5 = (source, exclude) => {
+  var __objRest$7 = (source, exclude) => {
     var target = {};
     for (var prop in source)
-      if (__hasOwnProp$y.call(source, prop) && exclude.indexOf(prop) < 0)
+      if (__hasOwnProp$z.call(source, prop) && exclude.indexOf(prop) < 0)
         target[prop] = source[prop];
-    if (source != null && __getOwnPropSymbols$y)
-      for (var prop of __getOwnPropSymbols$y(source)) {
-        if (exclude.indexOf(prop) < 0 && __propIsEnum$y.call(source, prop))
+    if (source != null && __getOwnPropSymbols$z)
+      for (var prop of __getOwnPropSymbols$z(source)) {
+        if (exclude.indexOf(prop) < 0 && __propIsEnum$z.call(source, prop))
           target[prop] = source[prop];
       }
     return target;
@@ -1470,7 +1430,7 @@ var NgwMap = (function (exports) {
         credentials: "same-origin",
         headers: {}
       };
-      const _a = __spreadValues$x(__spreadValues$x({}, defaults), options), {
+      const _a = __spreadValues$y(__spreadValues$y({}, defaults), options), {
         withCredentials,
         responseType,
         cacheProps,
@@ -1479,7 +1439,7 @@ var NgwMap = (function (exports) {
         cache,
         query,
         json
-      } = _a, opt = __objRest$5(_a, [
+      } = _a, opt = __objRest$7(_a, [
         "withCredentials",
         "responseType",
         "cacheProps",
@@ -1550,7 +1510,7 @@ var NgwMap = (function (exports) {
       if (cacheEngine) {
         if (((_c = opt.method) == null ? void 0 : _c.toUpperCase()) === "GET") {
           if (cache !== false) {
-            const props = cacheProps ? cacheProps : __spreadValues$x({}, objectRemoveEmpty({
+            const props = cacheProps ? cacheProps : __spreadValues$y({}, objectRemoveEmpty({
               withCredentials,
               responseType
             }));
@@ -1570,33 +1530,33 @@ var NgwMap = (function (exports) {
     });
   }
 
-  var __defProp$I = Object.defineProperty;
-  var __defProps$j = Object.defineProperties;
-  var __getOwnPropDescs$j = Object.getOwnPropertyDescriptors;
-  var __getOwnPropSymbols$x = Object.getOwnPropertySymbols;
-  var __hasOwnProp$x = Object.prototype.hasOwnProperty;
-  var __propIsEnum$x = Object.prototype.propertyIsEnumerable;
-  var __defNormalProp$I = (obj, key, value) => key in obj ? __defProp$I(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __spreadValues$w = (a, b) => {
+  var __defProp$J = Object.defineProperty;
+  var __defProps$k = Object.defineProperties;
+  var __getOwnPropDescs$k = Object.getOwnPropertyDescriptors;
+  var __getOwnPropSymbols$y = Object.getOwnPropertySymbols;
+  var __hasOwnProp$y = Object.prototype.hasOwnProperty;
+  var __propIsEnum$y = Object.prototype.propertyIsEnumerable;
+  var __defNormalProp$J = (obj, key, value) => key in obj ? __defProp$J(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+  var __spreadValues$x = (a, b) => {
     for (var prop in b || (b = {}))
-      if (__hasOwnProp$x.call(b, prop))
-        __defNormalProp$I(a, prop, b[prop]);
-    if (__getOwnPropSymbols$x)
-      for (var prop of __getOwnPropSymbols$x(b)) {
-        if (__propIsEnum$x.call(b, prop))
-          __defNormalProp$I(a, prop, b[prop]);
+      if (__hasOwnProp$y.call(b, prop))
+        __defNormalProp$J(a, prop, b[prop]);
+    if (__getOwnPropSymbols$y)
+      for (var prop of __getOwnPropSymbols$y(b)) {
+        if (__propIsEnum$y.call(b, prop))
+          __defNormalProp$J(a, prop, b[prop]);
       }
     return a;
   };
-  var __spreadProps$j = (a, b) => __defProps$j(a, __getOwnPropDescs$j(b));
-  var __objRest$4 = (source, exclude) => {
+  var __spreadProps$k = (a, b) => __defProps$k(a, __getOwnPropDescs$k(b));
+  var __objRest$6 = (source, exclude) => {
     var target = {};
     for (var prop in source)
-      if (__hasOwnProp$x.call(source, prop) && exclude.indexOf(prop) < 0)
+      if (__hasOwnProp$y.call(source, prop) && exclude.indexOf(prop) < 0)
         target[prop] = source[prop];
-    if (source != null && __getOwnPropSymbols$x)
-      for (var prop of __getOwnPropSymbols$x(source)) {
-        if (exclude.indexOf(prop) < 0 && __propIsEnum$x.call(source, prop))
+    if (source != null && __getOwnPropSymbols$y)
+      for (var prop of __getOwnPropSymbols$y(source)) {
+        if (exclude.indexOf(prop) < 0 && __propIsEnum$y.call(source, prop))
           target[prop] = source[prop];
       }
     return target;
@@ -1668,7 +1628,7 @@ var NgwMap = (function (exports) {
     for (const method of methods) {
       const methodResp = (requestOptions) => {
         var _b;
-        const _a = requestOptions || {}, { headers: optHeaders } = _a, restOpt = __objRest$4(_a, ["headers"]);
+        const _a = requestOptions || {}, { headers: optHeaders } = _a, restOpt = __objRest$6(_a, ["headers"]);
         if ((_b = requestOptions == null ? void 0 : requestOptions.signal) == null ? void 0 : _b.aborted) {
           throw new AbortError();
         }
@@ -1680,10 +1640,10 @@ var NgwMap = (function (exports) {
             routeData,
             ...rest
           );
-          const headers = objectRemoveEmpty(__spreadValues$w(__spreadValues$w({}, connector.getAuthorizationHeaders()), optHeaders != null ? optHeaders : {}));
+          const headers = objectRemoveEmpty(__spreadValues$x(__spreadValues$x({}, connector.getAuthorizationHeaders()), optHeaders != null ? optHeaders : {}));
           return request(
             template,
-            __spreadProps$j(__spreadValues$w({
+            __spreadProps$k(__spreadValues$x({
               headers
             }, restOpt), {
               method
@@ -1807,38 +1767,38 @@ var NgwMap = (function (exports) {
     }
   }
 
-  var __defProp$H = Object.defineProperty;
-  var __defProps$i = Object.defineProperties;
-  var __getOwnPropDescs$i = Object.getOwnPropertyDescriptors;
-  var __getOwnPropSymbols$w = Object.getOwnPropertySymbols;
-  var __hasOwnProp$w = Object.prototype.hasOwnProperty;
-  var __propIsEnum$w = Object.prototype.propertyIsEnumerable;
-  var __defNormalProp$H = (obj, key, value) => key in obj ? __defProp$H(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __spreadValues$v = (a, b) => {
+  var __defProp$I = Object.defineProperty;
+  var __defProps$j = Object.defineProperties;
+  var __getOwnPropDescs$j = Object.getOwnPropertyDescriptors;
+  var __getOwnPropSymbols$x = Object.getOwnPropertySymbols;
+  var __hasOwnProp$x = Object.prototype.hasOwnProperty;
+  var __propIsEnum$x = Object.prototype.propertyIsEnumerable;
+  var __defNormalProp$I = (obj, key, value) => key in obj ? __defProp$I(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+  var __spreadValues$w = (a, b) => {
     for (var prop in b || (b = {}))
-      if (__hasOwnProp$w.call(b, prop))
-        __defNormalProp$H(a, prop, b[prop]);
-    if (__getOwnPropSymbols$w)
-      for (var prop of __getOwnPropSymbols$w(b)) {
-        if (__propIsEnum$w.call(b, prop))
-          __defNormalProp$H(a, prop, b[prop]);
+      if (__hasOwnProp$x.call(b, prop))
+        __defNormalProp$I(a, prop, b[prop]);
+    if (__getOwnPropSymbols$x)
+      for (var prop of __getOwnPropSymbols$x(b)) {
+        if (__propIsEnum$x.call(b, prop))
+          __defNormalProp$I(a, prop, b[prop]);
       }
     return a;
   };
-  var __spreadProps$i = (a, b) => __defProps$i(a, __getOwnPropDescs$i(b));
-  var __objRest$3 = (source, exclude) => {
+  var __spreadProps$j = (a, b) => __defProps$j(a, __getOwnPropDescs$j(b));
+  var __objRest$5 = (source, exclude) => {
     var target = {};
     for (var prop in source)
-      if (__hasOwnProp$w.call(source, prop) && exclude.indexOf(prop) < 0)
+      if (__hasOwnProp$x.call(source, prop) && exclude.indexOf(prop) < 0)
         target[prop] = source[prop];
-    if (source != null && __getOwnPropSymbols$w)
-      for (var prop of __getOwnPropSymbols$w(source)) {
-        if (exclude.indexOf(prop) < 0 && __propIsEnum$w.call(source, prop))
+    if (source != null && __getOwnPropSymbols$x)
+      for (var prop of __getOwnPropSymbols$x(source)) {
+        if (exclude.indexOf(prop) < 0 && __propIsEnum$x.call(source, prop))
           target[prop] = source[prop];
       }
     return target;
   };
-  var __publicField$t = (obj, key, value) => __defNormalProp$H(obj, typeof key !== "symbol" ? key + "" : key, value);
+  var __publicField$t = (obj, key, value) => __defNormalProp$I(obj, typeof key !== "symbol" ? key + "" : key, value);
   var __async$t = (__this, __arguments, generator) => {
     return new Promise((resolve, reject) => {
       var fulfilled = (value) => {
@@ -1974,7 +1934,7 @@ var NgwMap = (function (exports) {
         if (credentials) {
           this.options.auth = credentials;
         }
-        const options_ = __spreadValues$v({
+        const options_ = __spreadValues$w({
           headers: this.getAuthorizationHeaders(credentials),
           cache: true
         }, options);
@@ -2015,7 +1975,7 @@ var NgwMap = (function (exports) {
       this.activeRequests = {};
     }
     getActiveApiRequests() {
-      return __spreadValues$v({}, this.activeRequests);
+      return __spreadValues$w({}, this.activeRequests);
     }
     route(name, ...rest) {
       return route(name, this, ...rest);
@@ -2034,11 +1994,11 @@ var NgwMap = (function (exports) {
           throw new Error("Empty `url` not allowed");
         }
         if (params) {
-          const _a = params, restParams = __objRest$3(_a, ["paramList"]);
+          const _a = params, { paramList } = _a, restParams = __objRest$5(_a, ["paramList"]);
           url = template(url, restParams);
         }
         url = encodeURI(fixUrlStr(url));
-        options = __spreadValues$v({ withCredentials: this.withCredentials }, options);
+        options = __spreadValues$w({ withCredentials: this.withCredentials }, options);
         const {
           cache,
           signal: externalSignal,
@@ -2070,7 +2030,7 @@ var NgwMap = (function (exports) {
           }
         });
         if (method === "GET" && cache !== false) {
-          const cacheOptions = cacheProps ? cacheProps : __spreadProps$i(__spreadValues$v({}, objectRemoveEmpty({
+          const cacheOptions = cacheProps ? cacheProps : __spreadProps$j(__spreadValues$w({}, objectRemoveEmpty({
             headers,
             withCredentials,
             responseType,
@@ -2093,7 +2053,7 @@ var NgwMap = (function (exports) {
         var _a;
         if (this.user) {
           options = options || {};
-          options.headers = __spreadValues$v(__spreadValues$v({}, this.getAuthorizationHeaders()), options.headers);
+          options.headers = __spreadValues$w(__spreadValues$w({}, this.getAuthorizationHeaders()), options.headers);
         }
         if (this.requestTransform) {
           const [transUrl, transOptions] = this.requestTransform(url, options);
@@ -2182,26 +2142,26 @@ var NgwMap = (function (exports) {
     return query;
   }
 
-  var __defProp$G = Object.defineProperty;
-  var __defProps$h = Object.defineProperties;
-  var __getOwnPropDescs$h = Object.getOwnPropertyDescriptors;
-  var __getOwnPropSymbols$v = Object.getOwnPropertySymbols;
-  var __hasOwnProp$v = Object.prototype.hasOwnProperty;
-  var __propIsEnum$v = Object.prototype.propertyIsEnumerable;
-  var __defNormalProp$G = (obj, key, value) => key in obj ? __defProp$G(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __spreadValues$u = (a, b) => {
+  var __defProp$H = Object.defineProperty;
+  var __defProps$i = Object.defineProperties;
+  var __getOwnPropDescs$i = Object.getOwnPropertyDescriptors;
+  var __getOwnPropSymbols$w = Object.getOwnPropertySymbols;
+  var __hasOwnProp$w = Object.prototype.hasOwnProperty;
+  var __propIsEnum$w = Object.prototype.propertyIsEnumerable;
+  var __defNormalProp$H = (obj, key, value) => key in obj ? __defProp$H(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+  var __spreadValues$v = (a, b) => {
     for (var prop in b || (b = {}))
-      if (__hasOwnProp$v.call(b, prop))
-        __defNormalProp$G(a, prop, b[prop]);
-    if (__getOwnPropSymbols$v)
-      for (var prop of __getOwnPropSymbols$v(b)) {
-        if (__propIsEnum$v.call(b, prop))
-          __defNormalProp$G(a, prop, b[prop]);
+      if (__hasOwnProp$w.call(b, prop))
+        __defNormalProp$H(a, prop, b[prop]);
+    if (__getOwnPropSymbols$w)
+      for (var prop of __getOwnPropSymbols$w(b)) {
+        if (__propIsEnum$w.call(b, prop))
+          __defNormalProp$H(a, prop, b[prop]);
       }
     return a;
   };
-  var __spreadProps$h = (a, b) => __defProps$h(a, __getOwnPropDescs$h(b));
-  var __publicField$s = (obj, key, value) => __defNormalProp$G(obj, typeof key !== "symbol" ? key + "" : key, value);
+  var __spreadProps$i = (a, b) => __defProps$i(a, __getOwnPropDescs$i(b));
+  var __publicField$s = (obj, key, value) => __defNormalProp$H(obj, typeof key !== "symbol" ? key + "" : key, value);
   var __async$s = (__this, __arguments, generator) => {
     return new Promise((resolve, reject) => {
       var fulfilled = (value) => {
@@ -2243,7 +2203,7 @@ var NgwMap = (function (exports) {
      * Fetching resource would be cached to speed up next call
      */
     getOne(resource, requestOptions) {
-      const opt = __spreadValues$u({}, requestOptions);
+      const opt = __spreadValues$v({}, requestOptions);
       if (typeof resource === "string") ; else if (typeof resource === "number") ; else if (isObject(resource)) {
         if (resource.id !== void 0) {
           resource.id;
@@ -2320,8 +2280,8 @@ var NgwMap = (function (exports) {
           } else {
             Object.assign(query, resourceToQuery(resource));
           }
-          return this.connector.route("resource.search").get(__spreadProps$h(__spreadValues$u({}, requestOptions), {
-            query: __spreadValues$u({
+          return this.connector.route("resource.search").get(__spreadProps$i(__spreadValues$v({}, requestOptions), {
+            query: __spreadValues$v({
               serialization: "full"
             }, query)
           })).then((resources) => {
@@ -2383,7 +2343,7 @@ var NgwMap = (function (exports) {
         } else {
           parent = parentDef;
         }
-        const items = yield this.connector.route("resource.collection").get(__spreadProps$h(__spreadValues$u({}, requestOptions), {
+        const items = yield this.connector.route("resource.collection").get(__spreadProps$i(__spreadValues$v({}, requestOptions), {
           query: {
             parent
           }
@@ -2464,9 +2424,9 @@ var NgwMap = (function (exports) {
     }
   }
 
-  var __defProp$F = Object.defineProperty;
-  var __defNormalProp$F = (obj, key, value) => key in obj ? __defProp$F(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __publicField$r = (obj, key, value) => __defNormalProp$F(obj, key + "" , value);
+  var __defProp$G = Object.defineProperty;
+  var __defNormalProp$G = (obj, key, value) => key in obj ? __defProp$G(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+  var __publicField$r = (obj, key, value) => __defNormalProp$G(obj, key + "" , value);
   class NgwConnectorExtended extends NgwConnector {
     constructor(options) {
       super(options);
@@ -2680,25 +2640,25 @@ var NgwMap = (function (exports) {
     }
   }
 
-  var __defProp$E = Object.defineProperty;
-  var __defProps$g = Object.defineProperties;
-  var __getOwnPropDescs$g = Object.getOwnPropertyDescriptors;
-  var __getOwnPropSymbols$u = Object.getOwnPropertySymbols;
-  var __hasOwnProp$u = Object.prototype.hasOwnProperty;
-  var __propIsEnum$u = Object.prototype.propertyIsEnumerable;
-  var __defNormalProp$E = (obj, key, value) => key in obj ? __defProp$E(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __spreadValues$t = (a, b) => {
+  var __defProp$F = Object.defineProperty;
+  var __defProps$h = Object.defineProperties;
+  var __getOwnPropDescs$h = Object.getOwnPropertyDescriptors;
+  var __getOwnPropSymbols$v = Object.getOwnPropertySymbols;
+  var __hasOwnProp$v = Object.prototype.hasOwnProperty;
+  var __propIsEnum$v = Object.prototype.propertyIsEnumerable;
+  var __defNormalProp$F = (obj, key, value) => key in obj ? __defProp$F(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+  var __spreadValues$u = (a, b) => {
     for (var prop in b || (b = {}))
-      if (__hasOwnProp$u.call(b, prop))
-        __defNormalProp$E(a, prop, b[prop]);
-    if (__getOwnPropSymbols$u)
-      for (var prop of __getOwnPropSymbols$u(b)) {
-        if (__propIsEnum$u.call(b, prop))
-          __defNormalProp$E(a, prop, b[prop]);
+      if (__hasOwnProp$v.call(b, prop))
+        __defNormalProp$F(a, prop, b[prop]);
+    if (__getOwnPropSymbols$v)
+      for (var prop of __getOwnPropSymbols$v(b)) {
+        if (__propIsEnum$v.call(b, prop))
+          __defNormalProp$F(a, prop, b[prop]);
       }
     return a;
   };
-  var __spreadProps$g = (a, b) => __defProps$g(a, __getOwnPropDescs$g(b));
+  var __spreadProps$h = (a, b) => __defProps$h(a, __getOwnPropDescs$h(b));
   function getNgwWebmapExtent(webmap) {
     const bottom = webmap["extent_bottom"];
     const left = webmap["extent_left"];
@@ -2765,14 +2725,14 @@ var NgwMap = (function (exports) {
       if (resource.cls && resource.parent && resource.cls.indexOf("style") !== -1) {
         return connector.getResource(resource.parent.id, options).then((res) => {
           if (res) {
-            return fetchNgwLayerExtent(__spreadProps$g(__spreadValues$t({}, options), {
+            return fetchNgwLayerExtent(__spreadProps$h(__spreadValues$u({}, options), {
               resourceId: res.resource.id,
               connector
             }));
           }
         });
       } else {
-        return fetchNgwLayerExtent(__spreadProps$g(__spreadValues$t({}, options), {
+        return fetchNgwLayerExtent(__spreadProps$h(__spreadValues$u({}, options), {
           resourceId: resource.id,
           connector
         }));
@@ -2780,9 +2740,9 @@ var NgwMap = (function (exports) {
     }
   }
 
-  var __defProp$D = Object.defineProperty;
-  var __defNormalProp$D = (obj, key, value) => key in obj ? __defProp$D(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __publicField$q = (obj, key, value) => __defNormalProp$D(obj, typeof key !== "symbol" ? key + "" : key, value);
+  var __defProp$E = Object.defineProperty;
+  var __defNormalProp$E = (obj, key, value) => key in obj ? __defProp$E(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+  var __publicField$q = (obj, key, value) => __defNormalProp$E(obj, typeof key !== "symbol" ? key + "" : key, value);
   var __async$r = (__this, __arguments, generator) => {
     return new Promise((resolve, reject) => {
       var fulfilled = (value) => {
@@ -2878,23 +2838,23 @@ var NgwMap = (function (exports) {
     });
   }
 
-  var __defProp$C = Object.defineProperty;
-  var __getOwnPropSymbols$t = Object.getOwnPropertySymbols;
-  var __hasOwnProp$t = Object.prototype.hasOwnProperty;
-  var __propIsEnum$t = Object.prototype.propertyIsEnumerable;
-  var __defNormalProp$C = (obj, key, value) => key in obj ? __defProp$C(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __spreadValues$s = (a, b) => {
+  var __defProp$D = Object.defineProperty;
+  var __getOwnPropSymbols$u = Object.getOwnPropertySymbols;
+  var __hasOwnProp$u = Object.prototype.hasOwnProperty;
+  var __propIsEnum$u = Object.prototype.propertyIsEnumerable;
+  var __defNormalProp$D = (obj, key, value) => key in obj ? __defProp$D(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+  var __spreadValues$t = (a, b) => {
     for (var prop in b || (b = {}))
-      if (__hasOwnProp$t.call(b, prop))
-        __defNormalProp$C(a, prop, b[prop]);
-    if (__getOwnPropSymbols$t)
-      for (var prop of __getOwnPropSymbols$t(b)) {
-        if (__propIsEnum$t.call(b, prop))
-          __defNormalProp$C(a, prop, b[prop]);
+      if (__hasOwnProp$u.call(b, prop))
+        __defNormalProp$D(a, prop, b[prop]);
+    if (__getOwnPropSymbols$u)
+      for (var prop of __getOwnPropSymbols$u(b)) {
+        if (__propIsEnum$u.call(b, prop))
+          __defNormalProp$D(a, prop, b[prop]);
       }
     return a;
   };
-  var __publicField$p = (obj, key, value) => __defNormalProp$C(obj, typeof key !== "symbol" ? key + "" : key, value);
+  var __publicField$p = (obj, key, value) => __defNormalProp$D(obj, typeof key !== "symbol" ? key + "" : key, value);
   var __async$p = (__this, __arguments, generator) => {
     return new Promise((resolve, reject) => {
       var fulfilled = (value) => {
@@ -2969,7 +2929,7 @@ var NgwMap = (function (exports) {
               this._creatingInProgress = true;
               const Adapter = yield createAdapter(this);
               if (Adapter) {
-                const adapter = new Adapter(webMap.mapAdapter.map, __spreadValues$s({}, adapterOptions));
+                const adapter = new Adapter(webMap.mapAdapter.map, __spreadValues$t({}, adapterOptions));
                 const realLayer = yield adapter.addLayer({
                   order: this.options.order,
                   headers: this.options.headers,
@@ -3053,19 +3013,19 @@ var NgwMap = (function (exports) {
     });
   }
 
-  var __defProp$B = Object.defineProperty;
-  var __getOwnPropSymbols$s = Object.getOwnPropertySymbols;
-  var __hasOwnProp$s = Object.prototype.hasOwnProperty;
-  var __propIsEnum$s = Object.prototype.propertyIsEnumerable;
-  var __defNormalProp$B = (obj, key, value) => key in obj ? __defProp$B(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __spreadValues$r = (a, b) => {
+  var __defProp$C = Object.defineProperty;
+  var __getOwnPropSymbols$t = Object.getOwnPropertySymbols;
+  var __hasOwnProp$t = Object.prototype.hasOwnProperty;
+  var __propIsEnum$t = Object.prototype.propertyIsEnumerable;
+  var __defNormalProp$C = (obj, key, value) => key in obj ? __defProp$C(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+  var __spreadValues$s = (a, b) => {
     for (var prop in b || (b = {}))
-      if (__hasOwnProp$s.call(b, prop))
-        __defNormalProp$B(a, prop, b[prop]);
-    if (__getOwnPropSymbols$s)
-      for (var prop of __getOwnPropSymbols$s(b)) {
-        if (__propIsEnum$s.call(b, prop))
-          __defNormalProp$B(a, prop, b[prop]);
+      if (__hasOwnProp$t.call(b, prop))
+        __defNormalProp$C(a, prop, b[prop]);
+    if (__getOwnPropSymbols$t)
+      for (var prop of __getOwnPropSymbols$t(b)) {
+        if (__propIsEnum$t.call(b, prop))
+          __defNormalProp$C(a, prop, b[prop]);
       }
     return a;
   };
@@ -3104,7 +3064,7 @@ var NgwMap = (function (exports) {
       return like(a, b, true);
     }
   };
-  function isPropertyFilter(filter) {
+  function isPropertyFilter$1(filter) {
     const pf = filter;
     if (pf.length === 3 && typeof pf[0] === "string" && typeof pf[1] === "string") {
       return true;
@@ -3112,7 +3072,7 @@ var NgwMap = (function (exports) {
     return false;
   }
   function featureFilter(feature, filters) {
-    const properties = __spreadValues$r({}, feature.properties);
+    const properties = __spreadValues$s({}, feature.properties);
     if (properties) {
       properties.$id = feature.id;
       return propertiesFilter(properties, filters);
@@ -3122,7 +3082,7 @@ var NgwMap = (function (exports) {
   function propertiesFilter(properties, filters) {
     const logic = typeof filters[0] === "string" ? filters[0] : "all";
     const filterFunction = (p) => {
-      if (isPropertyFilter(p)) {
+      if (isPropertyFilter$1(p)) {
         const [field, operation, value] = p;
         const operationExec = operationsAliases[operation];
         if (operationExec) {
@@ -3147,25 +3107,25 @@ var NgwMap = (function (exports) {
     return logic === "any" ? filters_.some(filterFunction) : filters_.every(filterFunction);
   }
 
-  var __defProp$A = Object.defineProperty;
-  var __defProps$f = Object.defineProperties;
-  var __getOwnPropDescs$f = Object.getOwnPropertyDescriptors;
-  var __getOwnPropSymbols$r = Object.getOwnPropertySymbols;
-  var __hasOwnProp$r = Object.prototype.hasOwnProperty;
-  var __propIsEnum$r = Object.prototype.propertyIsEnumerable;
-  var __defNormalProp$A = (obj, key, value) => key in obj ? __defProp$A(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __spreadValues$q = (a, b) => {
+  var __defProp$B = Object.defineProperty;
+  var __defProps$g = Object.defineProperties;
+  var __getOwnPropDescs$g = Object.getOwnPropertyDescriptors;
+  var __getOwnPropSymbols$s = Object.getOwnPropertySymbols;
+  var __hasOwnProp$s = Object.prototype.hasOwnProperty;
+  var __propIsEnum$s = Object.prototype.propertyIsEnumerable;
+  var __defNormalProp$B = (obj, key, value) => key in obj ? __defProp$B(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+  var __spreadValues$r = (a, b) => {
     for (var prop in b || (b = {}))
-      if (__hasOwnProp$r.call(b, prop))
-        __defNormalProp$A(a, prop, b[prop]);
-    if (__getOwnPropSymbols$r)
-      for (var prop of __getOwnPropSymbols$r(b)) {
-        if (__propIsEnum$r.call(b, prop))
-          __defNormalProp$A(a, prop, b[prop]);
+      if (__hasOwnProp$s.call(b, prop))
+        __defNormalProp$B(a, prop, b[prop]);
+    if (__getOwnPropSymbols$s)
+      for (var prop of __getOwnPropSymbols$s(b)) {
+        if (__propIsEnum$s.call(b, prop))
+          __defNormalProp$B(a, prop, b[prop]);
       }
     return a;
   };
-  var __spreadProps$f = (a, b) => __defProps$f(a, __getOwnPropDescs$f(b));
+  var __spreadProps$g = (a, b) => __defProps$g(a, __getOwnPropDescs$g(b));
   var __async$n = (__this, __arguments, generator) => {
     return new Promise((resolve, reject) => {
       var fulfilled = (value) => {
@@ -3275,21 +3235,21 @@ var NgwMap = (function (exports) {
     const filters_ = filters.filter((x) => Array.isArray(x));
     if (logic === "any") {
       for (const f of filters_) {
-        if (isPropertyFilter(f)) {
+        if (isPropertyFilter$1(f)) {
           _queries.push(
-            fetchNgwLayerItemsRequest(__spreadProps$f(__spreadValues$q({}, opt), {
+            fetchNgwLayerItemsRequest(__spreadProps$g(__spreadValues$r({}, opt), {
               paramList: [..._parentAllParams, ...paramList, createParam(f)]
             }))
           );
         } else {
-          getQueries(__spreadProps$f(__spreadValues$q({}, opt), { filters: f }), _queries, [..._parentAllParams]);
+          getQueries(__spreadProps$g(__spreadValues$r({}, opt), { filters: f }), _queries, [..._parentAllParams]);
         }
       }
     } else if (logic === "all") {
       const filters2 = [];
       const propertiesFilterList = [];
       for (const f of filters_) {
-        if (isPropertyFilter(f)) {
+        if (isPropertyFilter$1(f)) {
           filters2.push(createParam(f));
         } else {
           propertiesFilterList.push(f);
@@ -3297,14 +3257,14 @@ var NgwMap = (function (exports) {
       }
       if (propertiesFilterList.length) {
         for (const x of propertiesFilterList) {
-          getQueries(__spreadProps$f(__spreadValues$q({}, opt), { filters: x }), _queries, [
+          getQueries(__spreadProps$g(__spreadValues$r({}, opt), { filters: x }), _queries, [
             ..._parentAllParams,
             ...filters2
           ]);
         }
       } else {
         _queries.push(
-          fetchNgwLayerItemsRequest(__spreadProps$f(__spreadValues$q({}, opt), {
+          fetchNgwLayerItemsRequest(__spreadProps$g(__spreadValues$r({}, opt), {
             paramList: [..._parentAllParams, ...paramList, ...filters2]
           }))
         );
@@ -3320,7 +3280,7 @@ var NgwMap = (function (exports) {
     return `POLYGON((${polygon.join(", ")}))`;
   }
   function fetchNgwLayerItemsRequest(options) {
-    const params = __spreadValues$q({}, FEATURE_REQUEST_PARAMS);
+    const params = __spreadValues$r({}, FEATURE_REQUEST_PARAMS);
     const {
       limit,
       query,
@@ -3356,7 +3316,7 @@ var NgwMap = (function (exports) {
     if (paramList) {
       Object.assign(params, paramListToQuery(paramList));
     }
-    return connector.route("feature_layer.feature.collection", { id: Number(resourceId) }).get({ query: __spreadValues$q(__spreadValues$q({}, params), query), cache, signal });
+    return connector.route("feature_layer.feature.collection", { id: Number(resourceId) }).get({ query: __spreadValues$r(__spreadValues$r({}, params), query), cache, signal });
   }
 
   function prepareNgwFieldsToPropertiesFilter(fields) {
@@ -3385,25 +3345,25 @@ var NgwMap = (function (exports) {
     return fields;
   }
 
-  var __defProp$z = Object.defineProperty;
-  var __defProps$e = Object.defineProperties;
-  var __getOwnPropDescs$e = Object.getOwnPropertyDescriptors;
-  var __getOwnPropSymbols$q = Object.getOwnPropertySymbols;
-  var __hasOwnProp$q = Object.prototype.hasOwnProperty;
-  var __propIsEnum$q = Object.prototype.propertyIsEnumerable;
-  var __defNormalProp$z = (obj, key, value) => key in obj ? __defProp$z(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __spreadValues$p = (a, b) => {
+  var __defProp$A = Object.defineProperty;
+  var __defProps$f = Object.defineProperties;
+  var __getOwnPropDescs$f = Object.getOwnPropertyDescriptors;
+  var __getOwnPropSymbols$r = Object.getOwnPropertySymbols;
+  var __hasOwnProp$r = Object.prototype.hasOwnProperty;
+  var __propIsEnum$r = Object.prototype.propertyIsEnumerable;
+  var __defNormalProp$A = (obj, key, value) => key in obj ? __defProp$A(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+  var __spreadValues$q = (a, b) => {
     for (var prop in b || (b = {}))
-      if (__hasOwnProp$q.call(b, prop))
-        __defNormalProp$z(a, prop, b[prop]);
-    if (__getOwnPropSymbols$q)
-      for (var prop of __getOwnPropSymbols$q(b)) {
-        if (__propIsEnum$q.call(b, prop))
-          __defNormalProp$z(a, prop, b[prop]);
+      if (__hasOwnProp$r.call(b, prop))
+        __defNormalProp$A(a, prop, b[prop]);
+    if (__getOwnPropSymbols$r)
+      for (var prop of __getOwnPropSymbols$r(b)) {
+        if (__propIsEnum$r.call(b, prop))
+          __defNormalProp$A(a, prop, b[prop]);
       }
     return a;
   };
-  var __spreadProps$e = (a, b) => __defProps$e(a, __getOwnPropDescs$e(b));
+  var __spreadProps$f = (a, b) => __defProps$f(a, __getOwnPropDescs$f(b));
   var __async$m = (__this, __arguments, generator) => {
     return new Promise((resolve, reject) => {
       var fulfilled = (value) => {
@@ -3429,13 +3389,13 @@ var NgwMap = (function (exports) {
       var _a;
       const filters = options.filters;
       if (filters) {
-        let data = yield createFeatureFieldFilterQueries(__spreadProps$e(__spreadValues$p({}, options), {
+        let data = yield createFeatureFieldFilterQueries(__spreadProps$f(__spreadValues$q({}, options), {
           filters
         }));
         const clientFilterValidate = (_a = options.clientFilterValidate) != null ? _a : isFilterWithAnyCase(filters);
         if (clientFilterValidate) {
           data = data.filter((y) => {
-            const fields = prepareNgwFieldsToPropertiesFilter(__spreadProps$e(__spreadValues$p({}, y.fields), {
+            const fields = prepareNgwFieldsToPropertiesFilter(__spreadProps$f(__spreadValues$q({}, y.fields), {
               id: y.id
             }));
             const result = propertiesFilter(fields, filters);
@@ -3553,25 +3513,25 @@ var NgwMap = (function (exports) {
     }
   }
 
-  var __defProp$y = Object.defineProperty;
-  var __defProps$d = Object.defineProperties;
-  var __getOwnPropDescs$d = Object.getOwnPropertyDescriptors;
-  var __getOwnPropSymbols$p = Object.getOwnPropertySymbols;
-  var __hasOwnProp$p = Object.prototype.hasOwnProperty;
-  var __propIsEnum$p = Object.prototype.propertyIsEnumerable;
-  var __defNormalProp$y = (obj, key, value) => key in obj ? __defProp$y(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __spreadValues$o = (a, b) => {
+  var __defProp$z = Object.defineProperty;
+  var __defProps$e = Object.defineProperties;
+  var __getOwnPropDescs$e = Object.getOwnPropertyDescriptors;
+  var __getOwnPropSymbols$q = Object.getOwnPropertySymbols;
+  var __hasOwnProp$q = Object.prototype.hasOwnProperty;
+  var __propIsEnum$q = Object.prototype.propertyIsEnumerable;
+  var __defNormalProp$z = (obj, key, value) => key in obj ? __defProp$z(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+  var __spreadValues$p = (a, b) => {
     for (var prop in b || (b = {}))
-      if (__hasOwnProp$p.call(b, prop))
-        __defNormalProp$y(a, prop, b[prop]);
-    if (__getOwnPropSymbols$p)
-      for (var prop of __getOwnPropSymbols$p(b)) {
-        if (__propIsEnum$p.call(b, prop))
-          __defNormalProp$y(a, prop, b[prop]);
+      if (__hasOwnProp$q.call(b, prop))
+        __defNormalProp$z(a, prop, b[prop]);
+    if (__getOwnPropSymbols$q)
+      for (var prop of __getOwnPropSymbols$q(b)) {
+        if (__propIsEnum$q.call(b, prop))
+          __defNormalProp$z(a, prop, b[prop]);
       }
     return a;
   };
-  var __spreadProps$d = (a, b) => __defProps$d(a, __getOwnPropDescs$d(b));
+  var __spreadProps$e = (a, b) => __defProps$e(a, __getOwnPropDescs$e(b));
   var __async$l = (__this, __arguments, generator) => {
     return new Promise((resolve, reject) => {
       var fulfilled = (value) => {
@@ -3594,48 +3554,48 @@ var NgwMap = (function (exports) {
   };
   function fetchNgwLayerItem(options) {
     return __async$l(this, null, function* () {
-      const params = __spreadValues$o({}, FEATURE_REQUEST_PARAMS);
+      const params = __spreadValues$p({}, FEATURE_REQUEST_PARAMS);
       updateItemRequestParam(params, options);
       const resp = yield options.connector.route("feature_layer.feature.item", {
         id: Number(options.resourceId),
         fid: options.featureId
-      }).get(__spreadProps$d(__spreadValues$o({}, options), { query: params }));
+      }).get(__spreadProps$e(__spreadValues$p({}, options), { query: params }));
       const toGeojson = () => __async$l(null, null, function* () {
         if (resp.geom) {
           return createGeoJsonFeature(resp);
         } else {
-          const onlyGeomItem = yield fetchNgwLayerItem(__spreadProps$d(__spreadValues$o({}, options), {
+          const onlyGeomItem = yield fetchNgwLayerItem(__spreadProps$e(__spreadValues$p({}, options), {
             geom: true,
             fields: null,
             extensions: null
           }));
           const geom = onlyGeomItem.geom;
-          return createGeoJsonFeature(__spreadProps$d(__spreadValues$o({}, resp), { geom }));
+          return createGeoJsonFeature(__spreadProps$e(__spreadValues$p({}, resp), { geom }));
         }
       });
-      return __spreadProps$d(__spreadValues$o({}, resp), {
+      return __spreadProps$e(__spreadValues$p({}, resp), {
         toGeojson
       });
     });
   }
 
-  var __defProp$x = Object.defineProperty;
-  var __getOwnPropSymbols$o = Object.getOwnPropertySymbols;
-  var __hasOwnProp$o = Object.prototype.hasOwnProperty;
-  var __propIsEnum$o = Object.prototype.propertyIsEnumerable;
-  var __defNormalProp$x = (obj, key, value) => key in obj ? __defProp$x(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __spreadValues$n = (a, b) => {
+  var __defProp$y = Object.defineProperty;
+  var __getOwnPropSymbols$p = Object.getOwnPropertySymbols;
+  var __hasOwnProp$p = Object.prototype.hasOwnProperty;
+  var __propIsEnum$p = Object.prototype.propertyIsEnumerable;
+  var __defNormalProp$y = (obj, key, value) => key in obj ? __defProp$y(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+  var __spreadValues$o = (a, b) => {
     for (var prop in b || (b = {}))
-      if (__hasOwnProp$o.call(b, prop))
-        __defNormalProp$x(a, prop, b[prop]);
-    if (__getOwnPropSymbols$o)
-      for (var prop of __getOwnPropSymbols$o(b)) {
-        if (__propIsEnum$o.call(b, prop))
-          __defNormalProp$x(a, prop, b[prop]);
+      if (__hasOwnProp$p.call(b, prop))
+        __defNormalProp$y(a, prop, b[prop]);
+    if (__getOwnPropSymbols$p)
+      for (var prop of __getOwnPropSymbols$p(b)) {
+        if (__propIsEnum$p.call(b, prop))
+          __defNormalProp$y(a, prop, b[prop]);
       }
     return a;
   };
-  var __publicField$o = (obj, key, value) => __defNormalProp$x(obj, typeof key !== "symbol" ? key + "" : key, value);
+  var __publicField$o = (obj, key, value) => __defNormalProp$y(obj, typeof key !== "symbol" ? key + "" : key, value);
   class BookmarkItem {
     constructor(options) {
       this.options = options;
@@ -3672,7 +3632,7 @@ var NgwMap = (function (exports) {
       if (this.item.geom) {
         return Promise.resolve(createGeoJsonFeature(this.item));
       } else {
-        return fetchNgwLayerItem(__spreadValues$n({
+        return fetchNgwLayerItem(__spreadValues$o({
           resourceId: this.resourceId,
           featureId: this.item.id,
           connector: this.options.connector,
@@ -3690,9 +3650,9 @@ var NgwMap = (function (exports) {
 
   const WEBMAP_BASELAYER_ID_PREFIX = "webmap-baselayer";
 
-  var __defProp$w = Object.defineProperty;
-  var __defNormalProp$w = (obj, key, value) => key in obj ? __defProp$w(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __publicField$n = (obj, key, value) => __defNormalProp$w(obj, typeof key !== "symbol" ? key + "" : key, value);
+  var __defProp$x = Object.defineProperty;
+  var __defNormalProp$x = (obj, key, value) => key in obj ? __defProp$x(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+  var __publicField$n = (obj, key, value) => __defNormalProp$x(obj, typeof key !== "symbol" ? key + "" : key, value);
   class BaseProperty {
     constructor(name, item, options) {
       __publicField$n(this, "options");
@@ -3805,26 +3765,26 @@ var NgwMap = (function (exports) {
     }
   }
 
-  var __defProp$v = Object.defineProperty;
-  var __getOwnPropSymbols$n = Object.getOwnPropertySymbols;
-  var __hasOwnProp$n = Object.prototype.hasOwnProperty;
-  var __propIsEnum$n = Object.prototype.propertyIsEnumerable;
-  var __defNormalProp$v = (obj, key, value) => key in obj ? __defProp$v(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __spreadValues$m = (a, b) => {
+  var __defProp$w = Object.defineProperty;
+  var __getOwnPropSymbols$o = Object.getOwnPropertySymbols;
+  var __hasOwnProp$o = Object.prototype.hasOwnProperty;
+  var __propIsEnum$o = Object.prototype.propertyIsEnumerable;
+  var __defNormalProp$w = (obj, key, value) => key in obj ? __defProp$w(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+  var __spreadValues$n = (a, b) => {
     for (var prop in b || (b = {}))
-      if (__hasOwnProp$n.call(b, prop))
-        __defNormalProp$v(a, prop, b[prop]);
-    if (__getOwnPropSymbols$n)
-      for (var prop of __getOwnPropSymbols$n(b)) {
-        if (__propIsEnum$n.call(b, prop))
-          __defNormalProp$v(a, prop, b[prop]);
+      if (__hasOwnProp$o.call(b, prop))
+        __defNormalProp$w(a, prop, b[prop]);
+    if (__getOwnPropSymbols$o)
+      for (var prop of __getOwnPropSymbols$o(b)) {
+        if (__propIsEnum$o.call(b, prop))
+          __defNormalProp$w(a, prop, b[prop]);
       }
     return a;
   };
-  var __publicField$m = (obj, key, value) => __defNormalProp$v(obj, key + "" , value);
+  var __publicField$m = (obj, key, value) => __defNormalProp$w(obj, key + "" , value);
   const _CheckProperty = class _CheckProperty extends BaseProperty {
     constructor(name, item, options) {
-      super(name, item, __spreadValues$m(__spreadValues$m({}, _CheckProperty.options), options));
+      super(name, item, __spreadValues$n(__spreadValues$n({}, _CheckProperty.options), options));
       this.set(this.get());
     }
     update(value, options) {
@@ -3905,13 +3865,13 @@ var NgwMap = (function (exports) {
     _blockChild(item, options) {
       const prop = item.properties && item.properties.property(this.name);
       if (prop && prop.block) {
-        prop.block(__spreadValues$m({ silent: true }, options || {}));
+        prop.block(__spreadValues$n({ silent: true }, options || {}));
       }
     }
     _unBlockChild(item, options) {
       const prop = item.properties && item.properties.property(this.name);
       if (prop && prop.unBlock) {
-        prop.unBlock(__spreadValues$m({ silent: true }, options || {}));
+        prop.unBlock(__spreadValues$n({ silent: true }, options || {}));
       }
     }
     _propagation(value, options) {
@@ -3921,7 +3881,7 @@ var NgwMap = (function (exports) {
           const child = children[fry];
           const property = child.properties && child.properties.property(this.name);
           if (property) {
-            property.set(value, __spreadValues$m(__spreadValues$m({}, options), {
+            property.set(value, __spreadValues$n(__spreadValues$n({}, options), {
               propagation: true,
               bubble: false
             }));
@@ -3939,23 +3899,23 @@ var NgwMap = (function (exports) {
   });
   let CheckProperty = _CheckProperty;
 
-  var __defProp$u = Object.defineProperty;
-  var __getOwnPropSymbols$m = Object.getOwnPropertySymbols;
-  var __hasOwnProp$m = Object.prototype.hasOwnProperty;
-  var __propIsEnum$m = Object.prototype.propertyIsEnumerable;
-  var __defNormalProp$u = (obj, key, value) => key in obj ? __defProp$u(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __spreadValues$l = (a, b) => {
+  var __defProp$v = Object.defineProperty;
+  var __getOwnPropSymbols$n = Object.getOwnPropertySymbols;
+  var __hasOwnProp$n = Object.prototype.hasOwnProperty;
+  var __propIsEnum$n = Object.prototype.propertyIsEnumerable;
+  var __defNormalProp$v = (obj, key, value) => key in obj ? __defProp$v(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+  var __spreadValues$m = (a, b) => {
     for (var prop in b || (b = {}))
-      if (__hasOwnProp$m.call(b, prop))
-        __defNormalProp$u(a, prop, b[prop]);
-    if (__getOwnPropSymbols$m)
-      for (var prop of __getOwnPropSymbols$m(b)) {
-        if (__propIsEnum$m.call(b, prop))
-          __defNormalProp$u(a, prop, b[prop]);
+      if (__hasOwnProp$n.call(b, prop))
+        __defNormalProp$v(a, prop, b[prop]);
+    if (__getOwnPropSymbols$n)
+      for (var prop of __getOwnPropSymbols$n(b)) {
+        if (__propIsEnum$n.call(b, prop))
+          __defNormalProp$v(a, prop, b[prop]);
       }
     return a;
   };
-  var __publicField$l = (obj, key, value) => __defNormalProp$u(obj, typeof key !== "symbol" ? key + "" : key, value);
+  var __publicField$l = (obj, key, value) => __defNormalProp$v(obj, typeof key !== "symbol" ? key + "" : key, value);
   const BOOLEAN_TYPE = "boolean";
   const STRING_TYPE = "string";
   const _ItemProperties = class _ItemProperties {
@@ -4003,7 +3963,7 @@ var NgwMap = (function (exports) {
     _setPropertyHandler(propOpt) {
       const Handler = this._getHandler(propOpt);
       if (Handler && propOpt.name) {
-        const options = __spreadValues$l({}, propOpt);
+        const options = __spreadValues$m({}, propOpt);
         this._properties[propOpt.name] = new Handler(
           propOpt.name,
           this.item,
@@ -4133,9 +4093,9 @@ var NgwMap = (function (exports) {
     return true;
   }
 
-  var __defProp$t = Object.defineProperty;
-  var __defNormalProp$t = (obj, key, value) => key in obj ? __defProp$t(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __publicField$k = (obj, key, value) => __defNormalProp$t(obj, typeof key !== "symbol" ? key + "" : key, value);
+  var __defProp$u = Object.defineProperty;
+  var __defNormalProp$u = (obj, key, value) => key in obj ? __defProp$u(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+  var __publicField$k = (obj, key, value) => __defNormalProp$u(obj, typeof key !== "symbol" ? key + "" : key, value);
   class TreeHelper {
     constructor(item) {
       __publicField$k(this, "item");
@@ -4203,23 +4163,23 @@ var NgwMap = (function (exports) {
     }
   }
 
-  var __defProp$s = Object.defineProperty;
-  var __getOwnPropSymbols$l = Object.getOwnPropertySymbols;
-  var __hasOwnProp$l = Object.prototype.hasOwnProperty;
-  var __propIsEnum$l = Object.prototype.propertyIsEnumerable;
-  var __defNormalProp$s = (obj, key, value) => key in obj ? __defProp$s(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __spreadValues$k = (a, b) => {
+  var __defProp$t = Object.defineProperty;
+  var __getOwnPropSymbols$m = Object.getOwnPropertySymbols;
+  var __hasOwnProp$m = Object.prototype.hasOwnProperty;
+  var __propIsEnum$m = Object.prototype.propertyIsEnumerable;
+  var __defNormalProp$t = (obj, key, value) => key in obj ? __defProp$t(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+  var __spreadValues$l = (a, b) => {
     for (var prop in b || (b = {}))
-      if (__hasOwnProp$l.call(b, prop))
-        __defNormalProp$s(a, prop, b[prop]);
-    if (__getOwnPropSymbols$l)
-      for (var prop of __getOwnPropSymbols$l(b)) {
-        if (__propIsEnum$l.call(b, prop))
-          __defNormalProp$s(a, prop, b[prop]);
+      if (__hasOwnProp$m.call(b, prop))
+        __defNormalProp$t(a, prop, b[prop]);
+    if (__getOwnPropSymbols$m)
+      for (var prop of __getOwnPropSymbols$m(b)) {
+        if (__propIsEnum$m.call(b, prop))
+          __defNormalProp$t(a, prop, b[prop]);
       }
     return a;
   };
-  var __publicField$j = (obj, key, value) => __defNormalProp$s(obj, typeof key !== "symbol" ? key + "" : key, value);
+  var __publicField$j = (obj, key, value) => __defNormalProp$t(obj, typeof key !== "symbol" ? key + "" : key, value);
   let ID$1 = 0;
   class Item {
     constructor(options) {
@@ -4228,7 +4188,7 @@ var NgwMap = (function (exports) {
       __publicField$j(this, "tree");
       __publicField$j(this, "id", ID$1);
       ID$1 += 1;
-      this.options = __spreadValues$k({}, options);
+      this.options = __spreadValues$l({}, options);
       this.tree = new TreeHelper(this);
     }
     initProperties() {
@@ -4284,26 +4244,26 @@ var NgwMap = (function (exports) {
     return { [`symbols[${resourceId}]`]: intervals.join(",") || void 0 };
   }
 
-  var __defProp$r = Object.defineProperty;
-  var __defProps$c = Object.defineProperties;
-  var __getOwnPropDescs$c = Object.getOwnPropertyDescriptors;
-  var __getOwnPropSymbols$k = Object.getOwnPropertySymbols;
-  var __hasOwnProp$k = Object.prototype.hasOwnProperty;
-  var __propIsEnum$k = Object.prototype.propertyIsEnumerable;
-  var __defNormalProp$r = (obj, key, value) => key in obj ? __defProp$r(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __spreadValues$j = (a, b) => {
+  var __defProp$s = Object.defineProperty;
+  var __defProps$d = Object.defineProperties;
+  var __getOwnPropDescs$d = Object.getOwnPropertyDescriptors;
+  var __getOwnPropSymbols$l = Object.getOwnPropertySymbols;
+  var __hasOwnProp$l = Object.prototype.hasOwnProperty;
+  var __propIsEnum$l = Object.prototype.propertyIsEnumerable;
+  var __defNormalProp$s = (obj, key, value) => key in obj ? __defProp$s(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+  var __spreadValues$k = (a, b) => {
     for (var prop in b || (b = {}))
-      if (__hasOwnProp$k.call(b, prop))
-        __defNormalProp$r(a, prop, b[prop]);
-    if (__getOwnPropSymbols$k)
-      for (var prop of __getOwnPropSymbols$k(b)) {
-        if (__propIsEnum$k.call(b, prop))
-          __defNormalProp$r(a, prop, b[prop]);
+      if (__hasOwnProp$l.call(b, prop))
+        __defNormalProp$s(a, prop, b[prop]);
+    if (__getOwnPropSymbols$l)
+      for (var prop of __getOwnPropSymbols$l(b)) {
+        if (__propIsEnum$l.call(b, prop))
+          __defNormalProp$s(a, prop, b[prop]);
       }
     return a;
   };
-  var __spreadProps$c = (a, b) => __defProps$c(a, __getOwnPropDescs$c(b));
-  var __publicField$i = (obj, key, value) => __defNormalProp$r(obj, typeof key !== "symbol" ? key + "" : key, value);
+  var __spreadProps$d = (a, b) => __defProps$d(a, __getOwnPropDescs$d(b));
+  var __publicField$i = (obj, key, value) => __defNormalProp$s(obj, typeof key !== "symbol" ? key + "" : key, value);
   var __async$k = (__this, __arguments, generator) => {
     return new Promise((resolve, reject) => {
       var fulfilled = (value) => {
@@ -4368,14 +4328,14 @@ var NgwMap = (function (exports) {
         if (this.connector) {
           const ngwLegend = yield this.connector.route("render.legend_symbols", {
             id: this.resourceId
-          }).get(__spreadValues$j({}, options));
+          }).get(__spreadValues$k({}, options));
           this.legend = ngwLegend;
           return this.createLegend(ngwLegend);
         }
       });
     }
     createLegend(items) {
-      return items.map((params) => __spreadProps$c(__spreadValues$j({}, params), {
+      return items.map((params) => __spreadProps$d(__spreadValues$k({}, params), {
         /** @deprecated use display_name instead */
         name: params.display_name,
         /** @deprecated use icon instead */
@@ -4405,7 +4365,7 @@ var NgwMap = (function (exports) {
       }
       if (this.layer.updateLayer) {
         this.layer.updateLayer({
-          params: __spreadValues$j({}, createLayerSymbolParam(this.resourceId, intervals))
+          params: __spreadValues$k({}, createLayerSymbolParam(this.resourceId, intervals))
         });
       }
       if (intervals.length) {
@@ -4442,26 +4402,26 @@ var NgwMap = (function (exports) {
     }
   }
 
-  var __defProp$q = Object.defineProperty;
-  var __defProps$b = Object.defineProperties;
-  var __getOwnPropDescs$b = Object.getOwnPropertyDescriptors;
-  var __getOwnPropSymbols$j = Object.getOwnPropertySymbols;
-  var __hasOwnProp$j = Object.prototype.hasOwnProperty;
-  var __propIsEnum$j = Object.prototype.propertyIsEnumerable;
-  var __defNormalProp$q = (obj, key, value) => key in obj ? __defProp$q(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __spreadValues$i = (a, b) => {
+  var __defProp$r = Object.defineProperty;
+  var __defProps$c = Object.defineProperties;
+  var __getOwnPropDescs$c = Object.getOwnPropertyDescriptors;
+  var __getOwnPropSymbols$k = Object.getOwnPropertySymbols;
+  var __hasOwnProp$k = Object.prototype.hasOwnProperty;
+  var __propIsEnum$k = Object.prototype.propertyIsEnumerable;
+  var __defNormalProp$r = (obj, key, value) => key in obj ? __defProp$r(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+  var __spreadValues$j = (a, b) => {
     for (var prop in b || (b = {}))
-      if (__hasOwnProp$j.call(b, prop))
-        __defNormalProp$q(a, prop, b[prop]);
-    if (__getOwnPropSymbols$j)
-      for (var prop of __getOwnPropSymbols$j(b)) {
-        if (__propIsEnum$j.call(b, prop))
-          __defNormalProp$q(a, prop, b[prop]);
+      if (__hasOwnProp$k.call(b, prop))
+        __defNormalProp$r(a, prop, b[prop]);
+    if (__getOwnPropSymbols$k)
+      for (var prop of __getOwnPropSymbols$k(b)) {
+        if (__propIsEnum$k.call(b, prop))
+          __defNormalProp$r(a, prop, b[prop]);
       }
     return a;
   };
-  var __spreadProps$b = (a, b) => __defProps$b(a, __getOwnPropDescs$b(b));
-  var __publicField$h = (obj, key, value) => __defNormalProp$q(obj, typeof key !== "symbol" ? key + "" : key, value);
+  var __spreadProps$c = (a, b) => __defProps$c(a, __getOwnPropDescs$c(b));
+  var __publicField$h = (obj, key, value) => __defNormalProp$r(obj, typeof key !== "symbol" ? key + "" : key, value);
   var __async$j = (__this, __arguments, generator) => {
     return new Promise((resolve, reject) => {
       var fulfilled = (value) => {
@@ -4491,7 +4451,7 @@ var NgwMap = (function (exports) {
       parent,
       noInit
     }) {
-      super(__spreadValues$i(__spreadValues$i({}, _NgwWebmapItem.options), options));
+      super(__spreadValues$j(__spreadValues$j({}, _NgwWebmapItem.options), options));
       __publicField$h(this, "item");
       __publicField$h(this, "webMap");
       __publicField$h(this, "connector");
@@ -4587,7 +4547,7 @@ var NgwMap = (function (exports) {
     getItemOptions(item) {
       const transparency = item.item_type === "layer" && item.layer_transparency;
       const opacity = typeof transparency === "number" ? (100 - transparency) / 100 : void 0;
-      const options = __spreadProps$b(__spreadValues$i({
+      const options = __spreadProps$c(__spreadValues$j({
         visibility: false,
         name: item.display_name
       }, this.options), {
@@ -4607,7 +4567,7 @@ var NgwMap = (function (exports) {
       }
       if (item.item_type === "layer") {
         const { maxZoom, minZoom } = this._getZoomRange(item);
-        Object.assign(options, __spreadProps$b(__spreadValues$i({
+        Object.assign(options, __spreadProps$c(__spreadValues$j({
           updateWmsParams: item.updateWmsParams
         }, options), {
           url: item.url,
@@ -4751,26 +4711,26 @@ var NgwMap = (function (exports) {
   });
   let NgwWebmapItem = _NgwWebmapItem;
 
-  var __defProp$p = Object.defineProperty;
-  var __defProps$a = Object.defineProperties;
-  var __getOwnPropDescs$a = Object.getOwnPropertyDescriptors;
-  var __getOwnPropSymbols$i = Object.getOwnPropertySymbols;
-  var __hasOwnProp$i = Object.prototype.hasOwnProperty;
-  var __propIsEnum$i = Object.prototype.propertyIsEnumerable;
-  var __defNormalProp$p = (obj, key, value) => key in obj ? __defProp$p(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __spreadValues$h = (a, b) => {
-    for (var prop in b || (b = {}))
-      if (__hasOwnProp$i.call(b, prop))
-        __defNormalProp$p(a, prop, b[prop]);
-    if (__getOwnPropSymbols$i)
-      for (var prop of __getOwnPropSymbols$i(b)) {
-        if (__propIsEnum$i.call(b, prop))
-          __defNormalProp$p(a, prop, b[prop]);
+  var __defProp$q = Object.defineProperty;
+  var __defProps$b = Object.defineProperties;
+  var __getOwnPropDescs$b = Object.getOwnPropertyDescriptors;
+  var __getOwnPropSymbols$j = Object.getOwnPropertySymbols;
+  var __hasOwnProp$j = Object.prototype.hasOwnProperty;
+  var __propIsEnum$j = Object.prototype.propertyIsEnumerable;
+  var __defNormalProp$q = (obj, key, value) => key in obj ? __defProp$q(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+  var __spreadValues$i = (a, b) => {
+    for (var prop in b || (b = {}))
+      if (__hasOwnProp$j.call(b, prop))
+        __defNormalProp$q(a, prop, b[prop]);
+    if (__getOwnPropSymbols$j)
+      for (var prop of __getOwnPropSymbols$j(b)) {
+        if (__propIsEnum$j.call(b, prop))
+          __defNormalProp$q(a, prop, b[prop]);
       }
     return a;
   };
-  var __spreadProps$a = (a, b) => __defProps$a(a, __getOwnPropDescs$a(b));
-  var __publicField$g = (obj, key, value) => __defNormalProp$p(obj, typeof key !== "symbol" ? key + "" : key, value);
+  var __spreadProps$b = (a, b) => __defProps$b(a, __getOwnPropDescs$b(b));
+  var __publicField$g = (obj, key, value) => __defNormalProp$q(obj, typeof key !== "symbol" ? key + "" : key, value);
   var __async$i = (__this, __arguments, generator) => {
     return new Promise((resolve, reject) => {
       var fulfilled = (value) => {
@@ -4823,7 +4783,7 @@ var NgwMap = (function (exports) {
     addLayer(options) {
       return __async$i(this, null, function* () {
         var _a;
-        this.options = __spreadValues$h(__spreadValues$h({}, this.options), options);
+        this.options = __spreadValues$i(__spreadValues$i({}, this.options), options);
         this.layer = yield this._getWebMapLayerItem();
         const extentConstrained = (_a = this.webmapResource) == null ? void 0 : _a.constraining_extent;
         if (this.options.useExtentConstrained && this._extent && extentConstrained) {
@@ -4902,7 +4862,7 @@ var NgwMap = (function (exports) {
             (x) => x.label_field
           );
           const keyname = labelField && labelField.keyname;
-          return fetchNgwLayerItems(__spreadValues$h({
+          return fetchNgwLayerItems(__spreadValues$i({
             connector,
             resourceId: bookmarkResId,
             geom: false,
@@ -4971,7 +4931,7 @@ var NgwMap = (function (exports) {
           const connector = this.options.connector;
           const headers = (connector == null ? void 0 : connector.options.auth) ? connector.getAuthorizationHeaders() : void 0;
           const withCredentials = connector.withCredentials;
-          const options = __spreadProps$a(__spreadValues$h({}, this.options), {
+          const options = __spreadProps$b(__spreadValues$i({}, this.options), {
             withCredentials,
             headers,
             drawOrderEnabled: (_a = webmap.draw_order_enabled) != null ? _a : false
@@ -5077,7 +5037,7 @@ var NgwMap = (function (exports) {
             webMap,
             baseUrl: this.options.connector.options.baseUrl || ""
           });
-          item = __spreadValues$h(__spreadValues$h({}, layerItem), layerAdapterOptions);
+          item = __spreadValues$i(__spreadValues$i({}, layerItem), layerAdapterOptions);
         }
       }
       if (typeof ((_a = this.options.nativeOptions) == null ? void 0 : _a.beforeItemCreated) === "function") {
@@ -5087,40 +5047,40 @@ var NgwMap = (function (exports) {
     }
   }
 
-  var __defProp$o = Object.defineProperty;
-  var __defProps$9 = Object.defineProperties;
-  var __getOwnPropDescs$9 = Object.getOwnPropertyDescriptors;
-  var __getOwnPropSymbols$h = Object.getOwnPropertySymbols;
-  var __hasOwnProp$h = Object.prototype.hasOwnProperty;
-  var __propIsEnum$h = Object.prototype.propertyIsEnumerable;
-  var __defNormalProp$o = (obj, key, value) => key in obj ? __defProp$o(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __spreadValues$g = (a, b) => {
+  var __defProp$p = Object.defineProperty;
+  var __defProps$a = Object.defineProperties;
+  var __getOwnPropDescs$a = Object.getOwnPropertyDescriptors;
+  var __getOwnPropSymbols$i = Object.getOwnPropertySymbols;
+  var __hasOwnProp$i = Object.prototype.hasOwnProperty;
+  var __propIsEnum$i = Object.prototype.propertyIsEnumerable;
+  var __defNormalProp$p = (obj, key, value) => key in obj ? __defProp$p(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+  var __spreadValues$h = (a, b) => {
     for (var prop in b || (b = {}))
-      if (__hasOwnProp$h.call(b, prop))
-        __defNormalProp$o(a, prop, b[prop]);
-    if (__getOwnPropSymbols$h)
-      for (var prop of __getOwnPropSymbols$h(b)) {
-        if (__propIsEnum$h.call(b, prop))
-          __defNormalProp$o(a, prop, b[prop]);
+      if (__hasOwnProp$i.call(b, prop))
+        __defNormalProp$p(a, prop, b[prop]);
+    if (__getOwnPropSymbols$i)
+      for (var prop of __getOwnPropSymbols$i(b)) {
+        if (__propIsEnum$i.call(b, prop))
+          __defNormalProp$p(a, prop, b[prop]);
       }
     return a;
   };
-  var __spreadProps$9 = (a, b) => __defProps$9(a, __getOwnPropDescs$9(b));
-  var __objRest$2 = (source, exclude) => {
+  var __spreadProps$a = (a, b) => __defProps$a(a, __getOwnPropDescs$a(b));
+  var __objRest$4 = (source, exclude) => {
     var target = {};
     for (var prop in source)
-      if (__hasOwnProp$h.call(source, prop) && exclude.indexOf(prop) < 0)
+      if (__hasOwnProp$i.call(source, prop) && exclude.indexOf(prop) < 0)
         target[prop] = source[prop];
-    if (source != null && __getOwnPropSymbols$h)
-      for (var prop of __getOwnPropSymbols$h(source)) {
-        if (exclude.indexOf(prop) < 0 && __propIsEnum$h.call(source, prop))
+    if (source != null && __getOwnPropSymbols$i)
+      for (var prop of __getOwnPropSymbols$i(source)) {
+        if (exclude.indexOf(prop) < 0 && __propIsEnum$i.call(source, prop))
           target[prop] = source[prop];
       }
     return target;
   };
   function updateImageParams(params, resourceId) {
-    const _a = params, { bbox, width, height, nd } = _a, rest = __objRest$2(_a, ["bbox", "width", "height", "nd"]);
-    return __spreadProps$9(__spreadValues$g({}, rest), {
+    const _a = params, { bbox, width, height, nd } = _a, rest = __objRest$4(_a, ["bbox", "width", "height", "nd"]);
+    return __spreadProps$a(__spreadValues$h({}, rest), {
       resource: Array.isArray(resourceId) ? resourceId.join(",") : resourceId,
       extent: bbox,
       size: width + "," + height,
@@ -5155,7 +5115,7 @@ var NgwMap = (function (exports) {
   function extendNgwWebmapLayerAdapter(opt) {
     class A extends NgwWebmapLayerAdapter {
       constructor(map, options) {
-        options = __spreadValues$g(__spreadValues$g({}, opt), options);
+        options = __spreadValues$h(__spreadValues$h({}, opt), options);
         super(map, options);
       }
     }
@@ -5234,35 +5194,35 @@ var NgwMap = (function (exports) {
     };
   }
 
-  var __defProp$n = Object.defineProperty;
-  var __getOwnPropSymbols$g = Object.getOwnPropertySymbols;
-  var __hasOwnProp$g = Object.prototype.hasOwnProperty;
-  var __propIsEnum$g = Object.prototype.propertyIsEnumerable;
-  var __defNormalProp$n = (obj, key, value) => key in obj ? __defProp$n(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __spreadValues$f = (a, b) => {
+  var __defProp$o = Object.defineProperty;
+  var __getOwnPropSymbols$h = Object.getOwnPropertySymbols;
+  var __hasOwnProp$h = Object.prototype.hasOwnProperty;
+  var __propIsEnum$h = Object.prototype.propertyIsEnumerable;
+  var __defNormalProp$o = (obj, key, value) => key in obj ? __defProp$o(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+  var __spreadValues$g = (a, b) => {
     for (var prop in b || (b = {}))
-      if (__hasOwnProp$g.call(b, prop))
-        __defNormalProp$n(a, prop, b[prop]);
-    if (__getOwnPropSymbols$g)
-      for (var prop of __getOwnPropSymbols$g(b)) {
-        if (__propIsEnum$g.call(b, prop))
-          __defNormalProp$n(a, prop, b[prop]);
+      if (__hasOwnProp$h.call(b, prop))
+        __defNormalProp$o(a, prop, b[prop]);
+    if (__getOwnPropSymbols$h)
+      for (var prop of __getOwnPropSymbols$h(b)) {
+        if (__propIsEnum$h.call(b, prop))
+          __defNormalProp$o(a, prop, b[prop]);
       }
     return a;
   };
-  var __objRest$1 = (source, exclude) => {
+  var __objRest$3 = (source, exclude) => {
     var target = {};
     for (var prop in source)
-      if (__hasOwnProp$g.call(source, prop) && exclude.indexOf(prop) < 0)
+      if (__hasOwnProp$h.call(source, prop) && exclude.indexOf(prop) < 0)
         target[prop] = source[prop];
-    if (source != null && __getOwnPropSymbols$g)
-      for (var prop of __getOwnPropSymbols$g(source)) {
-        if (exclude.indexOf(prop) < 0 && __propIsEnum$g.call(source, prop))
+    if (source != null && __getOwnPropSymbols$h)
+      for (var prop of __getOwnPropSymbols$h(source)) {
+        if (exclude.indexOf(prop) < 0 && __propIsEnum$h.call(source, prop))
           target[prop] = source[prop];
       }
     return target;
   };
-  var __publicField$f = (obj, key, value) => __defNormalProp$n(obj, typeof key !== "symbol" ? key + "" : key, value);
+  var __publicField$f = (obj, key, value) => __defNormalProp$o(obj, typeof key !== "symbol" ? key + "" : key, value);
   var __async$h = (__this, __arguments, generator) => {
     return new Promise((resolve, reject) => {
       var fulfilled = (value) => {
@@ -5283,11 +5243,11 @@ var NgwMap = (function (exports) {
       step((generator = generator.apply(__this, __arguments)).next());
     });
   };
-  const URL = "https://qms.nextgis.com";
-  function createQmsAdapter(webMapOrOptions, url = URL, createOpt = {}) {
+  const URL$1 = "https://qms.nextgis.com";
+  function createQmsAdapter(webMapOrOptions, url = URL$1, createOpt = {}) {
     let webMap;
     if ("webMap" in webMapOrOptions) {
-      const _a = webMapOrOptions, { webMap: webMap_, url: url_ } = _a, adapterOptions = __objRest$1(_a, ["webMap", "url"]);
+      const _a = webMapOrOptions, { webMap: webMap_, url: url_ } = _a, adapterOptions = __objRest$3(_a, ["webMap", "url"]);
       webMap = webMap_;
       if (url_) {
         url = url_;
@@ -5299,7 +5259,7 @@ var NgwMap = (function (exports) {
       webMap = webMapOrOptions;
     }
     if (!url) {
-      url = URL;
+      url = URL$1;
     }
     class QmsAdapter {
       constructor(map, options) {
@@ -5307,7 +5267,7 @@ var NgwMap = (function (exports) {
         __publicField$f(this, "options");
         __publicField$f(this, "map");
         this.map = map;
-        const opt = __spreadValues$f(__spreadValues$f({}, createOpt), options);
+        const opt = __spreadValues$g(__spreadValues$g({}, createOpt), options);
         this.options = opt;
         this.options.baselayer = true;
         if (opt.qms) {
@@ -5335,7 +5295,7 @@ var NgwMap = (function (exports) {
                 "hideLayer"
               ]);
               if (type === "TILE") {
-                options = __spreadValues$f(__spreadValues$f({
+                options = __spreadValues$g(__spreadValues$g({
                   order: 0,
                   maxZoom: webMap.options.maxZoom,
                   minZoom: webMap.options.minZoom
@@ -5359,30 +5319,30 @@ var NgwMap = (function (exports) {
     return QmsAdapter;
   }
 
-  var __defProp$m = Object.defineProperty;
-  var __getOwnPropSymbols$f = Object.getOwnPropertySymbols;
-  var __hasOwnProp$f = Object.prototype.hasOwnProperty;
-  var __propIsEnum$f = Object.prototype.propertyIsEnumerable;
-  var __defNormalProp$m = (obj, key, value) => key in obj ? __defProp$m(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __spreadValues$e = (a, b) => {
+  var __defProp$n = Object.defineProperty;
+  var __getOwnPropSymbols$g = Object.getOwnPropertySymbols;
+  var __hasOwnProp$g = Object.prototype.hasOwnProperty;
+  var __propIsEnum$g = Object.prototype.propertyIsEnumerable;
+  var __defNormalProp$n = (obj, key, value) => key in obj ? __defProp$n(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+  var __spreadValues$f = (a, b) => {
     for (var prop in b || (b = {}))
-      if (__hasOwnProp$f.call(b, prop))
-        __defNormalProp$m(a, prop, b[prop]);
-    if (__getOwnPropSymbols$f)
-      for (var prop of __getOwnPropSymbols$f(b)) {
-        if (__propIsEnum$f.call(b, prop))
-          __defNormalProp$m(a, prop, b[prop]);
+      if (__hasOwnProp$g.call(b, prop))
+        __defNormalProp$n(a, prop, b[prop]);
+    if (__getOwnPropSymbols$g)
+      for (var prop of __getOwnPropSymbols$g(b)) {
+        if (__propIsEnum$g.call(b, prop))
+          __defNormalProp$n(a, prop, b[prop]);
       }
     return a;
   };
-  var __publicField$e = (obj, key, value) => __defNormalProp$m(obj, typeof key !== "symbol" ? key + "" : key, value);
+  var __publicField$e = (obj, key, value) => __defNormalProp$n(obj, typeof key !== "symbol" ? key + "" : key, value);
   class QmsKit {
     constructor(options) {
       __publicField$e(this, "options", {
         url: "https://qms.nextgis.com"
       });
       __publicField$e(this, "url");
-      this.options = __spreadValues$e(__spreadValues$e({}, this.options), options);
+      this.options = __spreadValues$f(__spreadValues$f({}, this.options), options);
       this.url = this.options.url;
     }
     getLayerAdapters() {
@@ -5401,27 +5361,27 @@ var NgwMap = (function (exports) {
     createQmsAdapter
   });
 
-  var __defProp$l = Object.defineProperty;
-  var __defProps$8 = Object.defineProperties;
-  var __getOwnPropDescs$8 = Object.getOwnPropertyDescriptors;
-  var __getOwnPropSymbols$e = Object.getOwnPropertySymbols;
+  var __defProp$m = Object.defineProperty;
+  var __defProps$9 = Object.defineProperties;
+  var __getOwnPropDescs$9 = Object.getOwnPropertyDescriptors;
+  var __getOwnPropSymbols$f = Object.getOwnPropertySymbols;
   var __getProtoOf$2 = Object.getPrototypeOf;
-  var __hasOwnProp$e = Object.prototype.hasOwnProperty;
-  var __propIsEnum$e = Object.prototype.propertyIsEnumerable;
+  var __hasOwnProp$f = Object.prototype.hasOwnProperty;
+  var __propIsEnum$f = Object.prototype.propertyIsEnumerable;
   var __reflectGet$2 = Reflect.get;
-  var __defNormalProp$l = (obj, key, value) => key in obj ? __defProp$l(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __spreadValues$d = (a, b) => {
+  var __defNormalProp$m = (obj, key, value) => key in obj ? __defProp$m(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+  var __spreadValues$e = (a, b) => {
     for (var prop in b || (b = {}))
-      if (__hasOwnProp$e.call(b, prop))
-        __defNormalProp$l(a, prop, b[prop]);
-    if (__getOwnPropSymbols$e)
-      for (var prop of __getOwnPropSymbols$e(b)) {
-        if (__propIsEnum$e.call(b, prop))
-          __defNormalProp$l(a, prop, b[prop]);
+      if (__hasOwnProp$f.call(b, prop))
+        __defNormalProp$m(a, prop, b[prop]);
+    if (__getOwnPropSymbols$f)
+      for (var prop of __getOwnPropSymbols$f(b)) {
+        if (__propIsEnum$f.call(b, prop))
+          __defNormalProp$m(a, prop, b[prop]);
       }
     return a;
   };
-  var __spreadProps$8 = (a, b) => __defProps$8(a, __getOwnPropDescs$8(b));
+  var __spreadProps$9 = (a, b) => __defProps$9(a, __getOwnPropDescs$9(b));
   var __superGet$2 = (cls, obj, key) => __reflectGet$2(__getProtoOf$2(cls), key, obj);
   var __async$g = (__this, __arguments, generator) => {
     return new Promise((resolve, reject) => {
@@ -5467,7 +5427,7 @@ var NgwMap = (function (exports) {
               addLayer(opt) {
                 return __async$g(this, null, function* () {
                   if (url) {
-                    return __superGet$2(BasemapTileAdapter.prototype, this, "addLayer").call(this, __spreadProps$8(__spreadValues$d({}, opt), { url }));
+                    return __superGet$2(BasemapTileAdapter.prototype, this, "addLayer").call(this, __spreadProps$9(__spreadValues$e({}, opt), { url }));
                   }
                 });
               }
@@ -5576,28 +5536,28 @@ var NgwMap = (function (exports) {
     return filterOptions;
   }
 
-  var __defProp$k = Object.defineProperty;
-  var __defProps$7 = Object.defineProperties;
-  var __getOwnPropDescs$7 = Object.getOwnPropertyDescriptors;
-  var __getOwnPropSymbols$d = Object.getOwnPropertySymbols;
+  var __defProp$l = Object.defineProperty;
+  var __defProps$8 = Object.defineProperties;
+  var __getOwnPropDescs$8 = Object.getOwnPropertyDescriptors;
+  var __getOwnPropSymbols$e = Object.getOwnPropertySymbols;
   var __getProtoOf$1 = Object.getPrototypeOf;
-  var __hasOwnProp$d = Object.prototype.hasOwnProperty;
-  var __propIsEnum$d = Object.prototype.propertyIsEnumerable;
+  var __hasOwnProp$e = Object.prototype.hasOwnProperty;
+  var __propIsEnum$e = Object.prototype.propertyIsEnumerable;
   var __reflectGet$1 = Reflect.get;
-  var __defNormalProp$k = (obj, key, value) => key in obj ? __defProp$k(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __spreadValues$c = (a, b) => {
+  var __defNormalProp$l = (obj, key, value) => key in obj ? __defProp$l(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+  var __spreadValues$d = (a, b) => {
     for (var prop in b || (b = {}))
-      if (__hasOwnProp$d.call(b, prop))
-        __defNormalProp$k(a, prop, b[prop]);
-    if (__getOwnPropSymbols$d)
-      for (var prop of __getOwnPropSymbols$d(b)) {
-        if (__propIsEnum$d.call(b, prop))
-          __defNormalProp$k(a, prop, b[prop]);
+      if (__hasOwnProp$e.call(b, prop))
+        __defNormalProp$l(a, prop, b[prop]);
+    if (__getOwnPropSymbols$e)
+      for (var prop of __getOwnPropSymbols$e(b)) {
+        if (__propIsEnum$e.call(b, prop))
+          __defNormalProp$l(a, prop, b[prop]);
       }
     return a;
   };
-  var __spreadProps$7 = (a, b) => __defProps$7(a, __getOwnPropDescs$7(b));
-  var __publicField$d = (obj, key, value) => __defNormalProp$k(obj, typeof key !== "symbol" ? key + "" : key, value);
+  var __spreadProps$8 = (a, b) => __defProps$8(a, __getOwnPropDescs$8(b));
+  var __publicField$d = (obj, key, value) => __defNormalProp$l(obj, typeof key !== "symbol" ? key + "" : key, value);
   var __superGet$1 = (cls, obj, key) => __reflectGet$1(__getProtoOf$1(cls), key, obj);
   var __async$e = (__this, __arguments, generator) => {
     return new Promise((resolve, reject) => {
@@ -5653,7 +5613,7 @@ var NgwMap = (function (exports) {
         filterOpt = filterOpt || {};
         filterOpt.signal = internalSignal;
         _lastFilterArgs = { filters, options: filterOpt };
-        return fetchNgwLayerFeatureCollection(__spreadValues$c({
+        return fetchNgwLayerFeatureCollection(__spreadValues$d({
           resourceId,
           filters,
           connector,
@@ -5688,9 +5648,9 @@ var NgwMap = (function (exports) {
             }
             if (options.adapterOptions) {
               if (addLayerOptionsPriority) {
-                opt = __spreadValues$c(__spreadValues$c({}, options.adapterOptions), opt);
+                opt = __spreadValues$d(__spreadValues$d({}, options.adapterOptions), opt);
               } else {
-                opt = __spreadValues$c(__spreadValues$c({}, opt), options.adapterOptions);
+                opt = __spreadValues$d(__spreadValues$d({}, opt), options.adapterOptions);
               }
             }
             if (opt.data && Object.keys(opt.data).length === 0) {
@@ -5775,7 +5735,7 @@ var NgwMap = (function (exports) {
             try {
               this.emitter.emit("preupdate", filterArgs);
               webMap._emitLayerEvent("layer:preupdate", options.id || "", filterArgs);
-              const data = yield getData(filterArgs.filters, __spreadProps$7(__spreadValues$c({}, filterArgs.options), {
+              const data = yield getData(filterArgs.filters, __spreadProps$8(__spreadValues$d({}, filterArgs.options), {
                 srs: this.options.srs
               }));
               let newData = data;
@@ -5818,7 +5778,7 @@ var NgwMap = (function (exports) {
             abort();
             if (this.filter && _fullDataLoad) {
               this.filter((e) => {
-                const props_ = e.feature && e.feature.properties && prepareNgwFieldsToPropertiesFilter(__spreadValues$c({}, e.feature.properties));
+                const props_ = e.feature && e.feature.properties && prepareNgwFieldsToPropertiesFilter(__spreadValues$d({}, e.feature.properties));
                 if (props_) {
                   return propertiesFilter(props_, filters);
                 }
@@ -5828,7 +5788,7 @@ var NgwMap = (function (exports) {
               if (this.clearLayer) {
                 this.clearLayer();
               }
-              const data = yield getData(filters, __spreadProps$7(__spreadValues$c({}, opt), {
+              const data = yield getData(filters, __spreadProps$8(__spreadValues$d({}, opt), {
                 srs: this.options.srs
               }));
               this.setData(data);
@@ -5928,26 +5888,166 @@ var NgwMap = (function (exports) {
     });
   }
 
-  var __defProp$j = Object.defineProperty;
-  var __defProps$6 = Object.defineProperties;
-  var __getOwnPropDescs$6 = Object.getOwnPropertyDescriptors;
-  var __getOwnPropSymbols$c = Object.getOwnPropertySymbols;
-  var __hasOwnProp$c = Object.prototype.hasOwnProperty;
-  var __propIsEnum$c = Object.prototype.propertyIsEnumerable;
-  var __defNormalProp$j = (obj, key, value) => key in obj ? __defProp$j(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __spreadValues$b = (a, b) => {
+  function isPropertyFilter(value) {
+    return Array.isArray(value) && value.length === 3 && typeof value[0] === "string" && typeof value[1] === "string";
+  }
+  function isPropertiesFilterGroup(value) {
+    return Array.isArray(value) && !isPropertyFilter(value);
+  }
+  function toGetExpr(field) {
+    return ["get", field];
+  }
+  function toConditionExpr(filter) {
+    const [fieldRaw, op, value] = filter;
+    const field = String(fieldRaw);
+    const getExpr = toGetExpr(field);
+    switch (op) {
+      case "eq":
+        if (value === null) {
+          return ["is_null", getExpr];
+        }
+        return ["==", getExpr, value];
+      case "ne":
+        if (value === null) {
+          return ["!is_null", getExpr];
+        }
+        return ["!=", getExpr, value];
+      case "gt":
+        if (typeof value !== "number" && typeof value !== "string") {
+          throw new Error(
+            `Operator "gt" requires number or string for "${field}"`
+          );
+        }
+        return [">", getExpr, value];
+      case "lt":
+        if (typeof value !== "number" && typeof value !== "string") {
+          throw new Error(
+            `Operator "lt" requires number or string for "${field}"`
+          );
+        }
+        return ["<", getExpr, value];
+      case "ge":
+        if (typeof value !== "number" && typeof value !== "string") {
+          throw new Error(
+            `Operator "ge" requires number or string for "${field}"`
+          );
+        }
+        return [">=", getExpr, value];
+      case "le":
+        if (typeof value !== "number" && typeof value !== "string") {
+          throw new Error(
+            `Operator "le" requires number or string for "${field}"`
+          );
+        }
+        return ["<=", getExpr, value];
+      case "in":
+        if (!Array.isArray(value) || !value.every((x) => typeof x === "string" || typeof x === "number")) {
+          throw new Error(
+            `Operator "in" requires (string | number)[] for "${field}"`
+          );
+        }
+        if (!value.length) {
+          throw new Error(
+            `Operator "in" requires non-empty array for "${field}"`
+          );
+        }
+        return ["in", getExpr, ...value];
+      case "notin":
+        if (!Array.isArray(value) || !value.every((x) => typeof x === "string" || typeof x === "number")) {
+          throw new Error(
+            `Operator "notin" requires (string | number)[] for "${field}"`
+          );
+        }
+        if (!value.length) {
+          throw new Error(
+            `Operator "notin" requires non-empty array for "${field}"`
+          );
+        }
+        return ["!in", getExpr, ...value];
+      case "like":
+      case "ilike":
+        throw new Error(
+          `Operator "${op}" is not supported by server FilterExpression`
+        );
+      default: {
+        const exhaustive = op;
+        throw new Error(`Unsupported operator: ${exhaustive}`);
+      }
+    }
+  }
+  function toGroupExpr(filters) {
+    let logicalOp = "all";
+    const children = [];
+    for (const item of filters) {
+      if (item === "all" || item === "any") {
+        logicalOp = item;
+        continue;
+      }
+      if (isPropertyFilter(item)) {
+        children.push(toConditionExpr(item));
+        continue;
+      }
+      if (isPropertiesFilterGroup(item)) {
+        children.push(toGroupExpr(item));
+        continue;
+      }
+      throw new Error("Invalid PropertiesFilter node");
+    }
+    return [logicalOp, ...children];
+  }
+  function propertiesFilterToExpression(filters) {
+    if (!(filters == null ? void 0 : filters.length)) {
+      return [];
+    }
+    return toGroupExpr(filters);
+  }
+  function propertiesFilterToExpressionString(filters) {
+    if (!(filters == null ? void 0 : filters.length)) {
+      return void 0;
+    }
+    return JSON.stringify(
+      propertiesFilterToExpression(filters)
+    );
+  }
+
+  function createLayerFilterParam(resourceId, filter) {
+    return {
+      [`filter[${resourceId}]`]: propertiesFilterToExpressionString(filter)
+    };
+  }
+
+  var __defProp$k = Object.defineProperty;
+  var __defProps$7 = Object.defineProperties;
+  var __getOwnPropDescs$7 = Object.getOwnPropertyDescriptors;
+  var __getOwnPropSymbols$d = Object.getOwnPropertySymbols;
+  var __hasOwnProp$d = Object.prototype.hasOwnProperty;
+  var __propIsEnum$d = Object.prototype.propertyIsEnumerable;
+  var __defNormalProp$k = (obj, key, value) => key in obj ? __defProp$k(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+  var __spreadValues$c = (a, b) => {
     for (var prop in b || (b = {}))
-      if (__hasOwnProp$c.call(b, prop))
-        __defNormalProp$j(a, prop, b[prop]);
-    if (__getOwnPropSymbols$c)
-      for (var prop of __getOwnPropSymbols$c(b)) {
-        if (__propIsEnum$c.call(b, prop))
-          __defNormalProp$j(a, prop, b[prop]);
+      if (__hasOwnProp$d.call(b, prop))
+        __defNormalProp$k(a, prop, b[prop]);
+    if (__getOwnPropSymbols$d)
+      for (var prop of __getOwnPropSymbols$d(b)) {
+        if (__propIsEnum$d.call(b, prop))
+          __defNormalProp$k(a, prop, b[prop]);
       }
     return a;
   };
-  var __spreadProps$6 = (a, b) => __defProps$6(a, __getOwnPropDescs$6(b));
-  var __publicField$c = (obj, key, value) => __defNormalProp$j(obj, typeof key !== "symbol" ? key + "" : key, value);
+  var __spreadProps$7 = (a, b) => __defProps$7(a, __getOwnPropDescs$7(b));
+  var __objRest$2 = (source, exclude) => {
+    var target = {};
+    for (var prop in source)
+      if (__hasOwnProp$d.call(source, prop) && exclude.indexOf(prop) < 0)
+        target[prop] = source[prop];
+    if (source != null && __getOwnPropSymbols$d)
+      for (var prop of __getOwnPropSymbols$d(source)) {
+        if (exclude.indexOf(prop) < 0 && __propIsEnum$d.call(source, prop))
+          target[prop] = source[prop];
+      }
+    return target;
+  };
+  var __publicField$c = (obj, key, value) => __defNormalProp$k(obj, typeof key !== "symbol" ? key + "" : key, value);
   var __async$c = (__this, __arguments, generator) => {
     return new Promise((resolve, reject) => {
       var fulfilled = (value) => {
@@ -6011,19 +6111,38 @@ var NgwMap = (function (exports) {
               baseUrl: connector.options.baseUrl || ""
             });
             if (opt) {
-              const layerAdapterOptions = __spreadProps$6(__spreadValues$b(__spreadValues$b({}, opt), layerOptions.adapterOptions), {
-                params: { resource: resourceId },
+              const _a = layerOptions.adapterOptions || {}, { propertiesFilter } = _a, restAdapterOptions = __objRest$2(_a, ["propertiesFilter"]);
+              const filterParams = createLayerFilterParam(
+                resourceId,
+                propertiesFilter
+              );
+              const layerAdapterOptions = __spreadProps$7(__spreadValues$c(__spreadValues$c({}, opt), restAdapterOptions), {
+                params: __spreadValues$c({
+                  resource: resourceId
+                }, filterParams),
+                url: adapter === "TILE" && opt.url ? updateUrlParams(opt.url, __spreadValues$c({
+                  resource: String(resourceId)
+                }, filterParams)) : opt.url,
                 layers: opt.layers || String(resourceId),
                 resourceId
               });
               if (layerOptions.adapterOptions && defined(layerOptions.adapterOptions.setViewDelay)) {
                 layerAdapterOptions.setViewDelay = layerOptions.adapterOptions.setViewDelay;
               }
-              this.options = __spreadValues$b(__spreadValues$b({}, this.options), layerAdapterOptions);
+              this.options = __spreadValues$c(__spreadValues$c({}, this.options), layerAdapterOptions);
             }
           }
           addLayer(addOptions) {
-            return super.addLayer(__spreadValues$b(__spreadValues$b({}, this.options), addOptions));
+            return super.addLayer(__spreadValues$c(__spreadValues$c({}, this.options), addOptions));
+          }
+          propertiesFilter(filters) {
+            return __async$c(this, null, function* () {
+              var _a;
+              const opt = this.options;
+              const params = __spreadValues$c(__spreadValues$c({}, opt.params || {}), createLayerFilterParam(this.resourceId, filters));
+              opt.params = params;
+              (_a = this.updateLayer) == null ? void 0 : _a.call(this, { params });
+            });
           }
           getIdentificationIds() {
             return __async$c(this, null, function* () {
@@ -6045,7 +6164,7 @@ var NgwMap = (function (exports) {
             return __async$c(this, null, function* () {
               const id = this.options.id;
               if (id !== void 0) {
-                const ngwLegend = yield connector.route("render.legend_symbols", { id: resourceId }).get(__spreadValues$b({
+                const ngwLegend = yield connector.route("render.legend_symbols", { id: resourceId }).get(__spreadValues$c({
                   cache: true
                 }, options));
                 const legend = new Legend({
@@ -6067,25 +6186,25 @@ var NgwMap = (function (exports) {
     });
   }
 
-  var __defProp$i = Object.defineProperty;
-  var __defProps$5 = Object.defineProperties;
-  var __getOwnPropDescs$5 = Object.getOwnPropertyDescriptors;
-  var __getOwnPropSymbols$b = Object.getOwnPropertySymbols;
-  var __hasOwnProp$b = Object.prototype.hasOwnProperty;
-  var __propIsEnum$b = Object.prototype.propertyIsEnumerable;
-  var __defNormalProp$i = (obj, key, value) => key in obj ? __defProp$i(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __spreadValues$a = (a, b) => {
+  var __defProp$j = Object.defineProperty;
+  var __defProps$6 = Object.defineProperties;
+  var __getOwnPropDescs$6 = Object.getOwnPropertyDescriptors;
+  var __getOwnPropSymbols$c = Object.getOwnPropertySymbols;
+  var __hasOwnProp$c = Object.prototype.hasOwnProperty;
+  var __propIsEnum$c = Object.prototype.propertyIsEnumerable;
+  var __defNormalProp$j = (obj, key, value) => key in obj ? __defProp$j(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+  var __spreadValues$b = (a, b) => {
     for (var prop in b || (b = {}))
-      if (__hasOwnProp$b.call(b, prop))
-        __defNormalProp$i(a, prop, b[prop]);
-    if (__getOwnPropSymbols$b)
-      for (var prop of __getOwnPropSymbols$b(b)) {
-        if (__propIsEnum$b.call(b, prop))
-          __defNormalProp$i(a, prop, b[prop]);
+      if (__hasOwnProp$c.call(b, prop))
+        __defNormalProp$j(a, prop, b[prop]);
+    if (__getOwnPropSymbols$c)
+      for (var prop of __getOwnPropSymbols$c(b)) {
+        if (__propIsEnum$c.call(b, prop))
+          __defNormalProp$j(a, prop, b[prop]);
       }
     return a;
   };
-  var __spreadProps$5 = (a, b) => __defProps$5(a, __getOwnPropDescs$5(b));
+  var __spreadProps$6 = (a, b) => __defProps$6(a, __getOwnPropDescs$6(b));
   var __async$b = (__this, __arguments, generator) => {
     return new Promise((resolve, reject) => {
       var fulfilled = (value) => {
@@ -6133,7 +6252,7 @@ var NgwMap = (function (exports) {
       const firstStyle = childrenStyles && childrenStyles[0];
       if (firstStyle) {
         return createAsyncAdapter(
-          __spreadProps$5(__spreadValues$a({}, layerOptions), { resource: firstStyle.resource.id }),
+          __spreadProps$6(__spreadValues$b({}, layerOptions), { resource: firstStyle.resource.id }),
           webMap,
           connector
         );
@@ -6156,7 +6275,7 @@ var NgwMap = (function (exports) {
         }
         if (item) {
           const cls = item.resource.cls;
-          const layerOptions = __spreadProps$5(__spreadValues$a({}, options), {
+          const layerOptions = __spreadProps$6(__spreadValues$b({}, options), {
             resource: resourceId
           });
           const adapterOptions = {
@@ -6193,10 +6312,10 @@ var NgwMap = (function (exports) {
                   item.resource.parent.id
                 );
                 if (parentItem) {
-                  const parentOptions = __spreadProps$5(__spreadValues$a({}, options), {
+                  const parentOptions = __spreadProps$6(__spreadValues$b({}, options), {
                     resource: item.resource.parent.id
                   });
-                  adapter = createGeoJsonAdapter(__spreadProps$5(__spreadValues$a({}, adapterOptions), {
+                  adapter = createGeoJsonAdapter(__spreadProps$6(__spreadValues$b({}, adapterOptions), {
                     item: parentItem,
                     layerOptions: parentOptions
                   }));
@@ -6240,23 +6359,23 @@ var NgwMap = (function (exports) {
     });
   }
 
-  var __defProp$h = Object.defineProperty;
-  var __getOwnPropSymbols$a = Object.getOwnPropertySymbols;
-  var __hasOwnProp$a = Object.prototype.hasOwnProperty;
-  var __propIsEnum$a = Object.prototype.propertyIsEnumerable;
-  var __defNormalProp$h = (obj, key, value) => key in obj ? __defProp$h(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __spreadValues$9 = (a, b) => {
+  var __defProp$i = Object.defineProperty;
+  var __getOwnPropSymbols$b = Object.getOwnPropertySymbols;
+  var __hasOwnProp$b = Object.prototype.hasOwnProperty;
+  var __propIsEnum$b = Object.prototype.propertyIsEnumerable;
+  var __defNormalProp$i = (obj, key, value) => key in obj ? __defProp$i(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+  var __spreadValues$a = (a, b) => {
     for (var prop in b || (b = {}))
-      if (__hasOwnProp$a.call(b, prop))
-        __defNormalProp$h(a, prop, b[prop]);
-    if (__getOwnPropSymbols$a)
-      for (var prop of __getOwnPropSymbols$a(b)) {
-        if (__propIsEnum$a.call(b, prop))
-          __defNormalProp$h(a, prop, b[prop]);
+      if (__hasOwnProp$b.call(b, prop))
+        __defNormalProp$i(a, prop, b[prop]);
+    if (__getOwnPropSymbols$b)
+      for (var prop of __getOwnPropSymbols$b(b)) {
+        if (__propIsEnum$b.call(b, prop))
+          __defNormalProp$i(a, prop, b[prop]);
       }
     return a;
   };
-  var __publicField$b = (obj, key, value) => __defNormalProp$h(obj, typeof key !== "symbol" ? key + "" : key, value);
+  var __publicField$b = (obj, key, value) => __defNormalProp$i(obj, typeof key !== "symbol" ? key + "" : key, value);
   var __async$a = (__this, __arguments, generator) => {
     return new Promise((resolve, reject) => {
       var fulfilled = (value) => {
@@ -6312,7 +6431,7 @@ var NgwMap = (function (exports) {
                 connector: this.connector,
                 webMap
               };
-              const layer = yield webMap.addLayer(NgwWebmapLayerAdapter, __spreadValues$9({
+              const layer = yield webMap.addLayer(NgwWebmapLayerAdapter, __spreadValues$a({
                 visibility: true,
                 fit: true,
                 pixelRadius: this.options.pixelRadius
@@ -6343,23 +6462,23 @@ var NgwMap = (function (exports) {
     }
   }
 
-  var __defProp$g = Object.defineProperty;
-  var __getOwnPropSymbols$9 = Object.getOwnPropertySymbols;
-  var __hasOwnProp$9 = Object.prototype.hasOwnProperty;
-  var __propIsEnum$9 = Object.prototype.propertyIsEnumerable;
-  var __defNormalProp$g = (obj, key, value) => key in obj ? __defProp$g(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __spreadValues$8 = (a, b) => {
+  var __defProp$h = Object.defineProperty;
+  var __getOwnPropSymbols$a = Object.getOwnPropertySymbols;
+  var __hasOwnProp$a = Object.prototype.hasOwnProperty;
+  var __propIsEnum$a = Object.prototype.propertyIsEnumerable;
+  var __defNormalProp$h = (obj, key, value) => key in obj ? __defProp$h(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+  var __spreadValues$9 = (a, b) => {
     for (var prop in b || (b = {}))
-      if (__hasOwnProp$9.call(b, prop))
-        __defNormalProp$g(a, prop, b[prop]);
-    if (__getOwnPropSymbols$9)
-      for (var prop of __getOwnPropSymbols$9(b)) {
-        if (__propIsEnum$9.call(b, prop))
-          __defNormalProp$g(a, prop, b[prop]);
+      if (__hasOwnProp$a.call(b, prop))
+        __defNormalProp$h(a, prop, b[prop]);
+    if (__getOwnPropSymbols$a)
+      for (var prop of __getOwnPropSymbols$a(b)) {
+        if (__propIsEnum$a.call(b, prop))
+          __defNormalProp$h(a, prop, b[prop]);
       }
     return a;
   };
-  var __publicField$a = (obj, key, value) => __defNormalProp$g(obj, typeof key !== "symbol" ? key + "" : key, value);
+  var __publicField$a = (obj, key, value) => __defNormalProp$h(obj, typeof key !== "symbol" ? key + "" : key, value);
   var __async$9 = (__this, __arguments, generator) => {
     return new Promise((resolve, reject) => {
       var fulfilled = (value) => {
@@ -6407,7 +6526,7 @@ var NgwMap = (function (exports) {
       if (this._item) {
         return Promise.resolve(this._item);
       }
-      return fetchNgwLayerItem(__spreadValues$8({
+      return fetchNgwLayerItem(__spreadValues$9({
         connector: this.connector,
         featureId: this.id,
         resourceId: this.layerId,
@@ -6446,7 +6565,7 @@ var NgwMap = (function (exports) {
       if (this._extent) {
         return Promise.resolve(this._extent);
       }
-      return fetchNgwLayerItemExtent(__spreadValues$8({
+      return fetchNgwLayerItemExtent(__spreadValues$9({
         connector: this.connector,
         featureId: this.id,
         resourceId: this.layerId
@@ -6520,7 +6639,8 @@ var NgwMap = (function (exports) {
           component: "pyramid"
         }
       });
-      if (settings && settings.company_logo && settings.company_logo.enabled) {
+      const company_logo = settings && "company_logo" in settings ? settings.company_logo : void 0;
+      if (company_logo && company_logo.enabled) {
         const anchor = document.createElement("a");
         anchor.style.position = "absolute";
         anchor.style.bottom = "0";
@@ -6555,10 +6675,10 @@ var NgwMap = (function (exports) {
         } else {
           return;
         }
-        if (settings.company_logo.link !== null && settings.company_logo.link.trim() !== "") {
-          anchor.href = settings.company_logo.link;
+        if (company_logo.link !== null && company_logo.link.trim() !== "") {
+          anchor.href = company_logo.link;
           anchor.target = "_blank";
-          if (settings.company_logo.link.search(/:\/\/nextgis/) !== -1) {
+          if (company_logo.link.search(/:\/\/nextgis/) !== -1) {
             img.alt = "Get your own Web GIS at nextgis.com";
           }
         }
@@ -6568,25 +6688,25 @@ var NgwMap = (function (exports) {
     });
   }
 
-  var __defProp$f = Object.defineProperty;
-  var __defProps$4 = Object.defineProperties;
-  var __getOwnPropDescs$4 = Object.getOwnPropertyDescriptors;
-  var __getOwnPropSymbols$8 = Object.getOwnPropertySymbols;
-  var __hasOwnProp$8 = Object.prototype.hasOwnProperty;
-  var __propIsEnum$8 = Object.prototype.propertyIsEnumerable;
-  var __defNormalProp$f = (obj, key, value) => key in obj ? __defProp$f(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __spreadValues$7 = (a, b) => {
+  var __defProp$g = Object.defineProperty;
+  var __defProps$5 = Object.defineProperties;
+  var __getOwnPropDescs$5 = Object.getOwnPropertyDescriptors;
+  var __getOwnPropSymbols$9 = Object.getOwnPropertySymbols;
+  var __hasOwnProp$9 = Object.prototype.hasOwnProperty;
+  var __propIsEnum$9 = Object.prototype.propertyIsEnumerable;
+  var __defNormalProp$g = (obj, key, value) => key in obj ? __defProp$g(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+  var __spreadValues$8 = (a, b) => {
     for (var prop in b || (b = {}))
-      if (__hasOwnProp$8.call(b, prop))
-        __defNormalProp$f(a, prop, b[prop]);
-    if (__getOwnPropSymbols$8)
-      for (var prop of __getOwnPropSymbols$8(b)) {
-        if (__propIsEnum$8.call(b, prop))
-          __defNormalProp$f(a, prop, b[prop]);
+      if (__hasOwnProp$9.call(b, prop))
+        __defNormalProp$g(a, prop, b[prop]);
+    if (__getOwnPropSymbols$9)
+      for (var prop of __getOwnPropSymbols$9(b)) {
+        if (__propIsEnum$9.call(b, prop))
+          __defNormalProp$g(a, prop, b[prop]);
       }
     return a;
   };
-  var __spreadProps$4 = (a, b) => __defProps$4(a, __getOwnPropDescs$4(b));
+  var __spreadProps$5 = (a, b) => __defProps$5(a, __getOwnPropDescs$5(b));
   function getIdentifyItems(identify, multiple = false) {
     const resources = [];
     const paramsList = [];
@@ -6649,7 +6769,7 @@ var NgwMap = (function (exports) {
           if (withGeom && withGeom.geom) {
             const geom = withGeom.geom;
             return Promise.resolve(
-              createGeoJsonFeature(__spreadProps$4(__spreadValues$7({}, withGeom), {
+              createGeoJsonFeature(__spreadProps$5(__spreadValues$8({}, withGeom), {
                 geom
               }))
             );
@@ -6659,7 +6779,7 @@ var NgwMap = (function (exports) {
     }
     const params = getIdentifyItems(identify);
     if (params && params.length) {
-      return fetchNgwLayerFeature(__spreadValues$7(__spreadProps$4(__spreadValues$7({}, requestOptions), { connector }), params[0]));
+      return fetchNgwLayerFeature(__spreadValues$8(__spreadProps$5(__spreadValues$8({}, requestOptions), { connector }), params[0]));
     }
     return Promise.resolve(void 0);
   }
@@ -6667,7 +6787,7 @@ var NgwMap = (function (exports) {
     const { connector, identify } = options;
     const params = getIdentifyItems(identify);
     if (params && params.length) {
-      return fetchNgwLayerItem(__spreadValues$7(__spreadValues$7({
+      return fetchNgwLayerItem(__spreadValues$8(__spreadValues$8({
         connector
       }, options.requestOptions), params[0]));
     }
@@ -6717,7 +6837,7 @@ var NgwMap = (function (exports) {
     const [lng, lat] = ev.lngLat;
     const { geom, radius } = options;
     const geom_ = geom != null ? geom : getCirclePolygonCoordinates(lng, lat, radius);
-    return featureLayerIdentify(__spreadProps$4(__spreadValues$7({}, options), { geom: geom_ }));
+    return featureLayerIdentify(__spreadProps$5(__spreadValues$8({}, options), { geom: geom_ }));
   }
   function createIdentifyItem(opt) {
     return new IdentifyItem(opt);
@@ -6733,6 +6853,7 @@ var NgwMap = (function (exports) {
 
   function createToggleControl(createButtonControl, options) {
     const link = document.createElement("div");
+    const statusListeners = /* @__PURE__ */ new Set();
     let status = false;
     if (options.getStatus) {
       status = options.getStatus();
@@ -6792,6 +6913,9 @@ var NgwMap = (function (exports) {
       _setClass(options.addClass, true);
     }
     setClass();
+    function notifyStatusChange(control) {
+      statusListeners.forEach((listener) => listener(status, control));
+    }
     const changeStatus = (status_) => {
       if (status_ !== void 0) {
         status = status_;
@@ -6800,13 +6924,36 @@ var NgwMap = (function (exports) {
       setTitle();
       setClass();
     };
+    const getStatus = () => status;
     const onClick = (status_) => {
+      if (status_ === void 0 && status && buttonControl.disableOnSecondClick) {
+        return;
+      }
+      const previousStatus = status;
       status = status_ !== void 0 ? status_ : !status;
       if (options.onClick) {
-        const afterClick = options.onClick(status);
-        Promise.resolve(afterClick).then(() => changeStatus()).catch(() => status = !status);
+        let afterClick;
+        try {
+          afterClick = options.onClick(status);
+        } catch (er) {
+          status = previousStatus;
+          changeStatus();
+          throw er;
+        }
+        Promise.resolve(afterClick).then(() => {
+          changeStatus();
+          if (previousStatus !== status) {
+            notifyStatusChange(buttonControl);
+          }
+        }).catch(() => {
+          status = previousStatus;
+          changeStatus();
+        });
       } else {
         changeStatus();
+        if (previousStatus !== status) {
+          notifyStatusChange(buttonControl);
+        }
       }
     };
     const buttonControl = createButtonControl({
@@ -6815,6 +6962,15 @@ var NgwMap = (function (exports) {
     });
     buttonControl.onClick = onClick;
     buttonControl.changeStatus = changeStatus;
+    buttonControl.getStatus = getStatus;
+    buttonControl.switch = options.switch;
+    if (options.disableOnSecondClick !== void 0) {
+      buttonControl.disableOnSecondClick = options.disableOnSecondClick;
+    }
+    buttonControl.onStatusChange = (listener) => {
+      statusListeners.add(listener);
+      return () => statusListeners.delete(listener);
+    };
     return buttonControl;
   }
 
@@ -7439,19 +7595,19 @@ var NgwMap = (function (exports) {
     typeof: evaluateArgs(([arg]) => typeOfValue(arg))
   };
 
-  var __defProp$e = Object.defineProperty;
-  var __getOwnPropSymbols$7 = Object.getOwnPropertySymbols;
-  var __hasOwnProp$7 = Object.prototype.hasOwnProperty;
-  var __propIsEnum$7 = Object.prototype.propertyIsEnumerable;
-  var __defNormalProp$e = (obj, key, value) => key in obj ? __defProp$e(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __spreadValues$6 = (a, b) => {
+  var __defProp$f = Object.defineProperty;
+  var __getOwnPropSymbols$8 = Object.getOwnPropertySymbols;
+  var __hasOwnProp$8 = Object.prototype.hasOwnProperty;
+  var __propIsEnum$8 = Object.prototype.propertyIsEnumerable;
+  var __defNormalProp$f = (obj, key, value) => key in obj ? __defProp$f(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+  var __spreadValues$7 = (a, b) => {
     for (var prop in b || (b = {}))
-      if (__hasOwnProp$7.call(b, prop))
-        __defNormalProp$e(a, prop, b[prop]);
-    if (__getOwnPropSymbols$7)
-      for (var prop of __getOwnPropSymbols$7(b)) {
-        if (__propIsEnum$7.call(b, prop))
-          __defNormalProp$e(a, prop, b[prop]);
+      if (__hasOwnProp$8.call(b, prop))
+        __defNormalProp$f(a, prop, b[prop]);
+    if (__getOwnPropSymbols$8)
+      for (var prop of __getOwnPropSymbols$8(b)) {
+        if (__propIsEnum$8.call(b, prop))
+          __defNormalProp$f(a, prop, b[prop]);
       }
     return a;
   };
@@ -7463,7 +7619,7 @@ var NgwMap = (function (exports) {
     }
     return false;
   }
-  const expressions = __spreadValues$6(__spreadValues$6(__spreadValues$6(__spreadValues$6(__spreadValues$6(__spreadValues$6({}, mathExpressions), typeExpressions), stringExpressions), lookupExpressions), decisionExpressions), interpolationExpressions);
+  const expressions = __spreadValues$7(__spreadValues$7(__spreadValues$7(__spreadValues$7(__spreadValues$7(__spreadValues$7({}, mathExpressions), typeExpressions), stringExpressions), lookupExpressions), decisionExpressions), interpolationExpressions);
   function evaluate(expression, data = {}) {
     const [name, ...args] = expression;
     const expressionFun = expressions[name];
@@ -7476,19 +7632,19 @@ var NgwMap = (function (exports) {
     throw new Error(`Expression "${name}" is not supported.`);
   }
 
-  var __defProp$d = Object.defineProperty;
-  var __getOwnPropSymbols$6 = Object.getOwnPropertySymbols;
-  var __hasOwnProp$6 = Object.prototype.hasOwnProperty;
-  var __propIsEnum$6 = Object.prototype.propertyIsEnumerable;
-  var __defNormalProp$d = (obj, key, value) => key in obj ? __defProp$d(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __spreadValues$5 = (a, b) => {
+  var __defProp$e = Object.defineProperty;
+  var __getOwnPropSymbols$7 = Object.getOwnPropertySymbols;
+  var __hasOwnProp$7 = Object.prototype.hasOwnProperty;
+  var __propIsEnum$7 = Object.prototype.propertyIsEnumerable;
+  var __defNormalProp$e = (obj, key, value) => key in obj ? __defProp$e(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+  var __spreadValues$6 = (a, b) => {
     for (var prop in b || (b = {}))
-      if (__hasOwnProp$6.call(b, prop))
-        __defNormalProp$d(a, prop, b[prop]);
-    if (__getOwnPropSymbols$6)
-      for (var prop of __getOwnPropSymbols$6(b)) {
-        if (__propIsEnum$6.call(b, prop))
-          __defNormalProp$d(a, prop, b[prop]);
+      if (__hasOwnProp$7.call(b, prop))
+        __defNormalProp$e(a, prop, b[prop]);
+    if (__getOwnPropSymbols$7)
+      for (var prop of __getOwnPropSymbols$7(b)) {
+        if (__propIsEnum$7.call(b, prop))
+          __defNormalProp$e(a, prop, b[prop]);
       }
     return a;
   };
@@ -7521,7 +7677,7 @@ var NgwMap = (function (exports) {
         for (const p in expressions) {
           fromCb[p] = expressions[p](feature);
         }
-        return __spreadValues$5(__spreadValues$5({}, paint), fromCb);
+        return __spreadValues$6(__spreadValues$6({}, paint), fromCb);
       };
     }
     return;
@@ -7546,19 +7702,19 @@ var NgwMap = (function (exports) {
     return false;
   }
 
-  var __defProp$c = Object.defineProperty;
-  var __getOwnPropSymbols$5 = Object.getOwnPropertySymbols;
-  var __hasOwnProp$5 = Object.prototype.hasOwnProperty;
-  var __propIsEnum$5 = Object.prototype.propertyIsEnumerable;
-  var __defNormalProp$c = (obj, key, value) => key in obj ? __defProp$c(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __spreadValues$4 = (a, b) => {
+  var __defProp$d = Object.defineProperty;
+  var __getOwnPropSymbols$6 = Object.getOwnPropertySymbols;
+  var __hasOwnProp$6 = Object.prototype.hasOwnProperty;
+  var __propIsEnum$6 = Object.prototype.propertyIsEnumerable;
+  var __defNormalProp$d = (obj, key, value) => key in obj ? __defProp$d(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+  var __spreadValues$5 = (a, b) => {
     for (var prop in b || (b = {}))
-      if (__hasOwnProp$5.call(b, prop))
-        __defNormalProp$c(a, prop, b[prop]);
-    if (__getOwnPropSymbols$5)
-      for (var prop of __getOwnPropSymbols$5(b)) {
-        if (__propIsEnum$5.call(b, prop))
-          __defNormalProp$c(a, prop, b[prop]);
+      if (__hasOwnProp$6.call(b, prop))
+        __defNormalProp$d(a, prop, b[prop]);
+    if (__getOwnPropSymbols$6)
+      for (var prop of __getOwnPropSymbols$6(b)) {
+        if (__propIsEnum$6.call(b, prop))
+          __defNormalProp$d(a, prop, b[prop]);
       }
     return a;
   };
@@ -7587,7 +7743,7 @@ var NgwMap = (function (exports) {
     return (feature) => {
       const paint = paintsFilters.find((x) => featureFilter(feature, x[0]));
       if (paint) {
-        return __spreadValues$4(__spreadValues$4({}, mask), paint[1]);
+        return __spreadValues$5(__spreadValues$5({}, mask), paint[1]);
       }
       return mask;
     };
@@ -7611,8 +7767,8 @@ var NgwMap = (function (exports) {
   }
   function finalizePaint({ paint, defaultPaint }) {
     var _a;
-    let newPaint = __spreadValues$4({}, defaultPaint);
-    newPaint = __spreadValues$4(__spreadValues$4({}, newPaint), paint);
+    let newPaint = __spreadValues$5({}, defaultPaint);
+    newPaint = __spreadValues$5(__spreadValues$5({}, newPaint), paint);
     newPaint.fill = (_a = newPaint.fill) != null ? _a : true;
     newPaint.stroke = newPaint.stroke !== void 0 ? newPaint.stroke : !newPaint.fill || !!(newPaint.strokeColor || newPaint.strokeOpacity);
     return newPaint;
@@ -7625,7 +7781,7 @@ var NgwMap = (function (exports) {
     if (!paint) {
       throw new Error("paint is empty");
     }
-    let newPaint = __spreadValues$4({}, defaultPaint);
+    let newPaint = __spreadValues$5({}, defaultPaint);
     if (isPaintCallback(paint)) {
       const getPaintFunction = (feature) => {
         const getPaint = preparePaint({
@@ -7741,9 +7897,9 @@ var NgwMap = (function (exports) {
     return opt;
   }
 
-  var __defProp$b = Object.defineProperty;
-  var __defNormalProp$b = (obj, key, value) => key in obj ? __defProp$b(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __publicField$9 = (obj, key, value) => __defNormalProp$b(obj, typeof key !== "symbol" ? key + "" : key, value);
+  var __defProp$c = Object.defineProperty;
+  var __defNormalProp$c = (obj, key, value) => key in obj ? __defProp$c(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+  var __publicField$9 = (obj, key, value) => __defNormalProp$c(obj, typeof key !== "symbol" ? key + "" : key, value);
   class KeyCodes {
     constructor() {
       __publicField$9(this, "backspace", 8);
@@ -7820,9 +7976,9 @@ var NgwMap = (function (exports) {
     // "single quote"
   }
 
-  var __defProp$a = Object.defineProperty;
-  var __defNormalProp$a = (obj, key, value) => key in obj ? __defProp$a(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __publicField$8 = (obj, key, value) => __defNormalProp$a(obj, typeof key !== "symbol" ? key + "" : key, value);
+  var __defProp$b = Object.defineProperty;
+  var __defNormalProp$b = (obj, key, value) => key in obj ? __defProp$b(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+  var __publicField$8 = (obj, key, value) => __defNormalProp$b(obj, typeof key !== "symbol" ? key + "" : key, value);
   class Keys {
     constructor() {
       __publicField$8(this, "keyCodeAlias", new KeyCodes());
@@ -7868,9 +8024,9 @@ var NgwMap = (function (exports) {
     }
   }
 
-  var __defProp$9 = Object.defineProperty;
-  var __defNormalProp$9 = (obj, key, value) => key in obj ? __defProp$9(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __publicField$7 = (obj, key, value) => __defNormalProp$9(obj, typeof key !== "symbol" ? key + "" : key, value);
+  var __defProp$a = Object.defineProperty;
+  var __defNormalProp$a = (obj, key, value) => key in obj ? __defProp$a(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+  var __publicField$7 = (obj, key, value) => __defNormalProp$a(obj, typeof key !== "symbol" ? key + "" : key, value);
   class StateItem {
     constructor(webMap, opt) {
       this.webMap = webMap;
@@ -7901,9 +8057,9 @@ var NgwMap = (function (exports) {
     }
   }
 
-  var __defProp$8 = Object.defineProperty;
-  var __defNormalProp$8 = (obj, key, value) => key in obj ? __defProp$8(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __publicField$6 = (obj, key, value) => __defNormalProp$8(obj, typeof key !== "symbol" ? key + "" : key, value);
+  var __defProp$9 = Object.defineProperty;
+  var __defNormalProp$9 = (obj, key, value) => key in obj ? __defProp$9(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+  var __publicField$6 = (obj, key, value) => __defNormalProp$9(obj, typeof key !== "symbol" ? key + "" : key, value);
   class BoundState extends StateItem {
     constructor() {
       super(...arguments);
@@ -7929,9 +8085,9 @@ var NgwMap = (function (exports) {
     }
   }
 
-  var __defProp$7 = Object.defineProperty;
-  var __defNormalProp$7 = (obj, key, value) => key in obj ? __defProp$7(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __publicField$5 = (obj, key, value) => __defNormalProp$7(obj, typeof key !== "symbol" ? key + "" : key, value);
+  var __defProp$8 = Object.defineProperty;
+  var __defNormalProp$8 = (obj, key, value) => key in obj ? __defProp$8(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+  var __publicField$5 = (obj, key, value) => __defNormalProp$8(obj, typeof key !== "symbol" ? key + "" : key, value);
   class CenterState extends StateItem {
     constructor() {
       super(...arguments);
@@ -7958,9 +8114,9 @@ var NgwMap = (function (exports) {
     }
   }
 
-  var __defProp$6 = Object.defineProperty;
-  var __defNormalProp$6 = (obj, key, value) => key in obj ? __defProp$6(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __publicField$4 = (obj, key, value) => __defNormalProp$6(obj, typeof key !== "symbol" ? key + "" : key, value);
+  var __defProp$7 = Object.defineProperty;
+  var __defNormalProp$7 = (obj, key, value) => key in obj ? __defProp$7(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+  var __publicField$4 = (obj, key, value) => __defNormalProp$7(obj, typeof key !== "symbol" ? key + "" : key, value);
   class ZoomState extends StateItem {
     constructor() {
       super(...arguments);
@@ -7988,9 +8144,9 @@ var NgwMap = (function (exports) {
     }
   }
 
-  var __defProp$5 = Object.defineProperty;
-  var __defNormalProp$5 = (obj, key, value) => key in obj ? __defProp$5(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __publicField$3 = (obj, key, value) => __defNormalProp$5(obj, typeof key !== "symbol" ? key + "" : key, value);
+  var __defProp$6 = Object.defineProperty;
+  var __defNormalProp$6 = (obj, key, value) => key in obj ? __defProp$6(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+  var __publicField$3 = (obj, key, value) => __defNormalProp$6(obj, typeof key !== "symbol" ? key + "" : key, value);
   var __async$6 = (__this, __arguments, generator) => {
     return new Promise((resolve, reject) => {
       var fulfilled = (value) => {
@@ -8537,26 +8693,26 @@ var NgwMap = (function (exports) {
   __publicField$3(_WebMapMain, "getPaintFunctions");
   let WebMapMain = _WebMapMain;
 
-  var __defProp$4 = Object.defineProperty;
-  var __defProps$3 = Object.defineProperties;
-  var __getOwnPropDescs$3 = Object.getOwnPropertyDescriptors;
-  var __getOwnPropSymbols$4 = Object.getOwnPropertySymbols;
-  var __hasOwnProp$4 = Object.prototype.hasOwnProperty;
-  var __propIsEnum$4 = Object.prototype.propertyIsEnumerable;
-  var __defNormalProp$4 = (obj, key, value) => key in obj ? __defProp$4(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __spreadValues$3 = (a, b) => {
+  var __defProp$5 = Object.defineProperty;
+  var __defProps$4 = Object.defineProperties;
+  var __getOwnPropDescs$4 = Object.getOwnPropertyDescriptors;
+  var __getOwnPropSymbols$5 = Object.getOwnPropertySymbols;
+  var __hasOwnProp$5 = Object.prototype.hasOwnProperty;
+  var __propIsEnum$5 = Object.prototype.propertyIsEnumerable;
+  var __defNormalProp$5 = (obj, key, value) => key in obj ? __defProp$5(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+  var __spreadValues$4 = (a, b) => {
     for (var prop in b || (b = {}))
-      if (__hasOwnProp$4.call(b, prop))
-        __defNormalProp$4(a, prop, b[prop]);
-    if (__getOwnPropSymbols$4)
-      for (var prop of __getOwnPropSymbols$4(b)) {
-        if (__propIsEnum$4.call(b, prop))
-          __defNormalProp$4(a, prop, b[prop]);
+      if (__hasOwnProp$5.call(b, prop))
+        __defNormalProp$5(a, prop, b[prop]);
+    if (__getOwnPropSymbols$5)
+      for (var prop of __getOwnPropSymbols$5(b)) {
+        if (__propIsEnum$5.call(b, prop))
+          __defNormalProp$5(a, prop, b[prop]);
       }
     return a;
   };
-  var __spreadProps$3 = (a, b) => __defProps$3(a, __getOwnPropDescs$3(b));
-  var __publicField$2 = (obj, key, value) => __defNormalProp$4(obj, typeof key !== "symbol" ? key + "" : key, value);
+  var __spreadProps$4 = (a, b) => __defProps$4(a, __getOwnPropDescs$4(b));
+  var __publicField$2 = (obj, key, value) => __defNormalProp$5(obj, typeof key !== "symbol" ? key + "" : key, value);
   var __async$5 = (__this, __arguments, generator) => {
     return new Promise((resolve, reject) => {
       var fulfilled = (value) => {
@@ -8691,7 +8847,7 @@ var NgwMap = (function (exports) {
       return __async$5(this, null, function* () {
         const layer = yield this.addLayer(
           adapter,
-          __spreadProps$3(__spreadValues$3({}, options), {
+          __spreadProps$4(__spreadValues$4({}, options), {
             baselayer: true
           }),
           void 0
@@ -8728,7 +8884,7 @@ var NgwMap = (function (exports) {
         }
         const geoJsonOptions = options;
         this._updateGeoJsonOptions(geoJsonOptions);
-        options = __spreadValues$3({
+        options = __spreadValues$4({
           id: String(id),
           order: _order
         }, options);
@@ -8753,7 +8909,7 @@ var NgwMap = (function (exports) {
         }
         if (adapterEngine !== void 0) {
           const _adapter = new adapterEngine(this.mapAdapter.map, options);
-          _adapter.options = __spreadValues$3(__spreadValues$3({}, options), _adapter.options);
+          _adapter.options = __spreadValues$4(__spreadValues$4({}, options), _adapter.options);
           if (_adapter.options.baselayer) {
             options.baselayer = true;
             options.order = 0;
@@ -8940,7 +9096,7 @@ var NgwMap = (function (exports) {
     }
     /** Shortcut for {@link WebMapLayers.addLayer} to create TileLayer adapter */
     addTileLayer(url, options = {}) {
-      return this.addLayer("TILE", __spreadProps$3(__spreadValues$3({}, options), { url }));
+      return this.addLayer("TILE", __spreadProps$4(__spreadValues$4({}, options), { url }));
     }
     addImageLayer(urlOrOptions, options) {
       let url;
@@ -8950,7 +9106,7 @@ var NgwMap = (function (exports) {
         url = urlOrOptions.url;
         options = urlOrOptions;
       }
-      return this.addLayer("IMAGE", __spreadProps$3(__spreadValues$3({}, options), { url }));
+      return this.addLayer("IMAGE", __spreadProps$4(__spreadValues$4({}, options), { url }));
     }
     /**
      * Show added layer on the map by it definition.
@@ -9413,9 +9569,24 @@ var NgwMap = (function (exports) {
     }
   }
 
-  var __defProp$3 = Object.defineProperty;
-  var __defNormalProp$3 = (obj, key, value) => key in obj ? __defProp$3(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __publicField$1 = (obj, key, value) => __defNormalProp$3(obj, typeof key !== "symbol" ? key + "" : key, value);
+  var __defProp$4 = Object.defineProperty;
+  var __getOwnPropSymbols$4 = Object.getOwnPropertySymbols;
+  var __hasOwnProp$4 = Object.prototype.hasOwnProperty;
+  var __propIsEnum$4 = Object.prototype.propertyIsEnumerable;
+  var __defNormalProp$4 = (obj, key, value) => key in obj ? __defProp$4(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+  var __objRest$1 = (source, exclude) => {
+    var target = {};
+    for (var prop in source)
+      if (__hasOwnProp$4.call(source, prop) && exclude.indexOf(prop) < 0)
+        target[prop] = source[prop];
+    if (source != null && __getOwnPropSymbols$4)
+      for (var prop of __getOwnPropSymbols$4(source)) {
+        if (exclude.indexOf(prop) < 0 && __propIsEnum$4.call(source, prop))
+          target[prop] = source[prop];
+      }
+    return target;
+  };
+  var __publicField$1 = (obj, key, value) => __defNormalProp$4(obj, typeof key !== "symbol" ? key + "" : key, value);
   var __async$4 = (__this, __arguments, generator) => {
     return new Promise((resolve, reject) => {
       var fulfilled = (value) => {
@@ -9443,21 +9614,24 @@ var NgwMap = (function (exports) {
         "top-right": [],
         "bottom-right": [],
         "top-left": [],
-        "bottom-left": []
+        "bottom-left": [],
+        inside: []
       });
       __publicField$1(this, "_isControlLoading", {
         "top-right": false,
         "bottom-right": false,
         "top-left": false,
-        "bottom-left": false
+        "bottom-left": false,
+        inside: false
       });
     }
     addControl(controlDef, position, options) {
       return __async$4(this, null, function* () {
         let control;
+        const { addOptions, createOptions } = this._splitControlOptions(options);
         position = position != null ? position : "top-left";
         if (typeof controlDef === "string") {
-          control = this.getControl(controlDef, options);
+          control = this.getControl(controlDef, createOptions);
         } else {
           control = controlDef;
         }
@@ -9465,10 +9639,10 @@ var NgwMap = (function (exports) {
           return new Promise((resolve) => {
             const promise = () => __async$4(this, null, function* () {
               const _control = yield control;
-              const c = this.mapAdapter.addControl(_control, position);
+              const c = this.mapAdapter.addControl(_control, position, addOptions);
               resolve(c);
             });
-            this._setControlQueue(position, promise);
+            this._setControlQueue(this._getControlQueueKey(position), promise);
           });
         }
       });
@@ -9570,6 +9744,9 @@ var NgwMap = (function (exports) {
         return this.mapAdapter.getControlContainer();
       }
     }
+    _getControlQueueKey(position) {
+      return typeof position === "string" ? position : "inside";
+    }
     _setControlQueue(position, cb) {
       this._loadControlQueue[position].push(cb);
       if (!this._isControlLoading[position]) {
@@ -9589,6 +9766,20 @@ var NgwMap = (function (exports) {
         }
       });
     }
+    _splitControlOptions(options) {
+      if (!options) {
+        return {};
+      }
+      const _a = options, { id, order } = _a, createOptions = __objRest$1(_a, ["id", "order"]);
+      const addOptions = this._getAddControlOptions(id, order);
+      return {
+        addOptions,
+        createOptions
+      };
+    }
+    _getAddControlOptions(id, order) {
+      return id !== void 0 || order !== void 0 ? { id, order } : void 0;
+    }
   };
   __publicField$1(_WebMapControls, "controls", {
     CONTROL: (webMap, options) => {
@@ -9603,10 +9794,26 @@ var NgwMap = (function (exports) {
   });
   let WebMapControls = _WebMapControls;
 
+  var __defProp$3 = Object.defineProperty;
+  var __defProps$3 = Object.defineProperties;
+  var __getOwnPropDescs$3 = Object.getOwnPropertyDescriptors;
   var __getOwnPropSymbols$3 = Object.getOwnPropertySymbols;
   var __hasOwnProp$3 = Object.prototype.hasOwnProperty;
   var __propIsEnum$3 = Object.prototype.propertyIsEnumerable;
   var __knownSymbol = (name, symbol) => (symbol = Symbol[name]) ? symbol : Symbol.for("Symbol." + name);
+  var __defNormalProp$3 = (obj, key, value) => key in obj ? __defProp$3(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+  var __spreadValues$3 = (a, b) => {
+    for (var prop in b || (b = {}))
+      if (__hasOwnProp$3.call(b, prop))
+        __defNormalProp$3(a, prop, b[prop]);
+    if (__getOwnPropSymbols$3)
+      for (var prop of __getOwnPropSymbols$3(b)) {
+        if (__propIsEnum$3.call(b, prop))
+          __defNormalProp$3(a, prop, b[prop]);
+      }
+    return a;
+  };
+  var __spreadProps$3 = (a, b) => __defProps$3(a, __getOwnPropDescs$3(b));
   var __objRest = (source, exclude) => {
     var target = {};
     for (var prop in source)
@@ -9734,8 +9941,11 @@ var NgwMap = (function (exports) {
               }
             }
           }
-          const _a = controlOptions, { position } = _a, options = __objRest(_a, ["position"]);
-          this.addControl(controlAdapterName, position || "top-left", options);
+          const _a = controlOptions, { id, order, position } = _a, options = __objRest(_a, ["id", "order", "position"]);
+          this.addControl(controlAdapterName, position || "top-left", __spreadProps$3(__spreadValues$3({}, options), {
+            id,
+            order
+          }));
         });
       }
       this._emitStatusEvent("controls:create");
@@ -9986,7 +10196,7 @@ var NgwMap = (function (exports) {
     addNgwLayer(options) {
       return __async$1(this, null, function* () {
         yield this.onMapLoad();
-        const { keyname, resourceId } = options;
+        const { keyname, resourceId, filters } = options;
         if (keyname || resourceId !== void 0) {
           deprecatedWarn(
             "set `resource` options instead of `keyname` or `resourceId`"
@@ -10000,12 +10210,15 @@ var NgwMap = (function (exports) {
         }
         if (defined(this.options.baseUrl)) {
           try {
+            options.adapterOptions = options.adapterOptions || {};
             if (defined(this.options.setViewDelay)) {
-              options.adapterOptions = options.adapterOptions || {};
               if (!defined(options.adapterOptions.setViewDelay)) {
                 options.adapterOptions.setViewDelay = this.options.setViewDelay;
               }
             }
+            if (defined(filters)) {
+              options.adapterOptions.propertiesFilter = filters;
+            }
             const adapter = createNgwLayerAdapter(options, this, this.connector);
             const adapterOpts = __spreadValues(__spreadValues({
               visibility: true
@@ -10097,7 +10310,6 @@ var NgwMap = (function (exports) {
       const promise = fetchIdentifyGeoJson({
         identify,
         connector: this.connector,
-        multiple,
         requestOptions: { signal: abortController.signal }
       });
       if (promise && "then" in promise) {