@nextgis/ngw-leaflet 3.0.0-alpha.3 → 3.0.0-alpha.5

package/lib/ngw-leaflet.global.js

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/ngw-leaflet; version: 3.0.0-alpha.3; author: NextGIS */
+/** Bundle of @nextgis/ngw-leaflet; version: 3.0.0-alpha.5; author: NextGIS */
 var NgwLeaflet = (function () {
   'use strict';
 
@@ -65,7 +65,7 @@ var NgwLeaflet = (function () {
     this.domain = null;
     if (EventEmitter.usingDomains) {
       // if there is an active domain, then attach to it.
-      if (domain.active ) ;
+      if (domain.active) ;
     }
 
     if (!this._events || this._events === Object.getPrototypeOf(this)._events) {
@@ -14947,6 +14947,20 @@ var NgwLeaflet = (function () {
   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}`;
+  }
 
   function boundsToArray(bounds) {
     const ne = bounds.getNorthEast();
@@ -15051,15 +15065,15 @@ var NgwLeaflet = (function () {
     };
   }
 
-  var __defProp$Y = Object.defineProperty;
-  var __defNormalProp$Y = (obj, key, value) => key in obj ? __defProp$Y(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __publicField$E = (obj, key, value) => __defNormalProp$Y(obj, typeof key !== "symbol" ? key + "" : key, value);
+  var __defProp$11 = Object.defineProperty;
+  var __defNormalProp$11 = (obj, key, value) => key in obj ? __defProp$11(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+  var __publicField$H = (obj, key, value) => __defNormalProp$11(obj, typeof key !== "symbol" ? key + "" : key, value);
   class BaseAdapter {
     constructor(map, options) {
       this.map = map;
       this.options = options;
-      __publicField$E(this, "layer");
-      __publicField$E(this, "pane", "order-0");
+      __publicField$H(this, "layer");
+      __publicField$H(this, "pane", "order-0");
       if (options.order !== void 0) {
         const pane = "order-" + options.order;
         let exist = map.getPane(pane);
@@ -15088,19 +15102,19 @@ var NgwLeaflet = (function () {
     };
   }
 
-  var __defProp$X = Object.defineProperty;
-  var __getOwnPropSymbols$G = Object.getOwnPropertySymbols;
-  var __hasOwnProp$G = Object.prototype.hasOwnProperty;
-  var __propIsEnum$G = 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$F = (a, b) => {
+  var __defProp$10 = Object.defineProperty;
+  var __getOwnPropSymbols$I = Object.getOwnPropertySymbols;
+  var __hasOwnProp$I = Object.prototype.hasOwnProperty;
+  var __propIsEnum$I = Object.prototype.propertyIsEnumerable;
+  var __defNormalProp$10 = (obj, key, value) => key in obj ? __defProp$10(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$G.call(b, prop))
-        __defNormalProp$X(a, prop, b[prop]);
-    if (__getOwnPropSymbols$G)
-      for (var prop of __getOwnPropSymbols$G(b)) {
-        if (__propIsEnum$G.call(b, prop))
-          __defNormalProp$X(a, prop, b[prop]);
+      if (__hasOwnProp$I.call(b, prop))
+        __defNormalProp$10(a, prop, b[prop]);
+    if (__getOwnPropSymbols$I)
+      for (var prop of __getOwnPropSymbols$I(b)) {
+        if (__propIsEnum$I.call(b, prop))
+          __defNormalProp$10(a, prop, b[prop]);
       }
     return a;
   };
@@ -15110,7 +15124,7 @@ var NgwLeaflet = (function () {
   }) {
     const layer_ = source.target;
     const feature = layer_.feature;
-    const opt = __spreadValues$F({
+    const opt = __spreadValues$H({
       layer,
       feature,
       event: convertMapClickEvent(source),
@@ -15119,30 +15133,30 @@ var NgwLeaflet = (function () {
     return opt;
   }
 
-  var __defProp$W = Object.defineProperty;
-  var __getOwnPropSymbols$F = Object.getOwnPropertySymbols;
-  var __hasOwnProp$F = Object.prototype.hasOwnProperty;
-  var __propIsEnum$F = 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$E = (a, b) => {
+  var __defProp$$ = Object.defineProperty;
+  var __getOwnPropSymbols$H = Object.getOwnPropertySymbols;
+  var __hasOwnProp$H = Object.prototype.hasOwnProperty;
+  var __propIsEnum$H = Object.prototype.propertyIsEnumerable;
+  var __defNormalProp$$ = (obj, key, value) => key in obj ? __defProp$$(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$F.call(b, prop))
-        __defNormalProp$W(a, prop, b[prop]);
-    if (__getOwnPropSymbols$F)
-      for (var prop of __getOwnPropSymbols$F(b)) {
-        if (__propIsEnum$F.call(b, prop))
-          __defNormalProp$W(a, prop, b[prop]);
+      if (__hasOwnProp$H.call(b, prop))
+        __defNormalProp$$(a, prop, b[prop]);
+    if (__getOwnPropSymbols$H)
+      for (var prop of __getOwnPropSymbols$H(b)) {
+        if (__propIsEnum$H.call(b, prop))
+          __defNormalProp$$(a, prop, b[prop]);
       }
     return a;
   };
-  var __publicField$D = (obj, key, value) => __defNormalProp$W(obj, typeof key !== "symbol" ? key + "" : key, value);
+  var __publicField$G = (obj, key, value) => __defNormalProp$$(obj, typeof key !== "symbol" ? key + "" : key, value);
   class GeoJsonEvents {
     constructor(layer) {
-      __publicField$D(this, "layer");
-      __publicField$D(this, "_onclick");
-      __publicField$D(this, "_ondblclick");
-      __publicField$D(this, "_mouseout");
-      __publicField$D(this, "_mouseover");
+      __publicField$G(this, "layer");
+      __publicField$G(this, "_onclick");
+      __publicField$G(this, "_ondblclick");
+      __publicField$G(this, "_mouseout");
+      __publicField$G(this, "_mouseover");
       this.layer = layer;
     }
     handleMouseEvents(layer) {
@@ -15151,7 +15165,7 @@ var NgwLeaflet = (function () {
       if (onClick_) {
         this._onclick = (e) => {
           const selected = !!this.layer._getSelected(layer);
-          onClick_(__spreadValues$E({
+          onClick_(__spreadValues$G({
             selected
           }, this._createMouseEvent(e)));
         };
@@ -15161,7 +15175,7 @@ var NgwLeaflet = (function () {
         this._ondblclick = (e) => {
           leafletSrcExports.DomEvent.stopPropagation(e);
           const selected = !!this.layer._getSelected(layer);
-          onDoubleClick(__spreadValues$E({
+          onDoubleClick(__spreadValues$G({
             selected
           }, this._createMouseEvent(e)));
         };
@@ -15839,19 +15853,19 @@ var NgwLeaflet = (function () {
     typeof: evaluateArgs(([arg]) => typeOfValue(arg))
   };
 
-  var __defProp$V = Object.defineProperty;
-  var __getOwnPropSymbols$E = Object.getOwnPropertySymbols;
-  var __hasOwnProp$E = Object.prototype.hasOwnProperty;
-  var __propIsEnum$E = 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$D = (a, b) => {
+  var __defProp$_ = Object.defineProperty;
+  var __getOwnPropSymbols$G = Object.getOwnPropertySymbols;
+  var __hasOwnProp$G = Object.prototype.hasOwnProperty;
+  var __propIsEnum$G = Object.prototype.propertyIsEnumerable;
+  var __defNormalProp$_ = (obj, key, value) => key in obj ? __defProp$_(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$E.call(b, prop))
-        __defNormalProp$V(a, prop, b[prop]);
-    if (__getOwnPropSymbols$E)
-      for (var prop of __getOwnPropSymbols$E(b)) {
-        if (__propIsEnum$E.call(b, prop))
-          __defNormalProp$V(a, prop, b[prop]);
+      if (__hasOwnProp$G.call(b, prop))
+        __defNormalProp$_(a, prop, b[prop]);
+    if (__getOwnPropSymbols$G)
+      for (var prop of __getOwnPropSymbols$G(b)) {
+        if (__propIsEnum$G.call(b, prop))
+          __defNormalProp$_(a, prop, b[prop]);
       }
     return a;
   };
@@ -15863,7 +15877,7 @@ var NgwLeaflet = (function () {
     }
     return false;
   }
-  const expressions = __spreadValues$D(__spreadValues$D(__spreadValues$D(__spreadValues$D(__spreadValues$D(__spreadValues$D({}, mathExpressions), typeExpressions), stringExpressions), lookupExpressions), decisionExpressions), interpolationExpressions);
+  const expressions = __spreadValues$F(__spreadValues$F(__spreadValues$F(__spreadValues$F(__spreadValues$F(__spreadValues$F({}, mathExpressions), typeExpressions), stringExpressions), lookupExpressions), decisionExpressions), interpolationExpressions);
   function evaluate(expression, data = {}) {
     const [name, ...args] = expression;
     const expressionFun = expressions[name];
@@ -15876,19 +15890,19 @@ var NgwLeaflet = (function () {
     throw new Error(`Expression "${name}" is not supported.`);
   }
 
-  var __defProp$U = Object.defineProperty;
-  var __getOwnPropSymbols$D = Object.getOwnPropertySymbols;
-  var __hasOwnProp$D = Object.prototype.hasOwnProperty;
-  var __propIsEnum$D = 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$C = (a, b) => {
+  var __defProp$Z = Object.defineProperty;
+  var __getOwnPropSymbols$F = Object.getOwnPropertySymbols;
+  var __hasOwnProp$F = Object.prototype.hasOwnProperty;
+  var __propIsEnum$F = 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$E = (a, b) => {
     for (var prop in b || (b = {}))
-      if (__hasOwnProp$D.call(b, prop))
-        __defNormalProp$U(a, prop, b[prop]);
-    if (__getOwnPropSymbols$D)
-      for (var prop of __getOwnPropSymbols$D(b)) {
-        if (__propIsEnum$D.call(b, prop))
-          __defNormalProp$U(a, prop, b[prop]);
+      if (__hasOwnProp$F.call(b, prop))
+        __defNormalProp$Z(a, prop, b[prop]);
+    if (__getOwnPropSymbols$F)
+      for (var prop of __getOwnPropSymbols$F(b)) {
+        if (__propIsEnum$F.call(b, prop))
+          __defNormalProp$Z(a, prop, b[prop]);
       }
     return a;
   };
@@ -15921,25 +15935,25 @@ var NgwLeaflet = (function () {
         for (const p in expressions) {
           fromCb[p] = expressions[p](feature);
         }
-        return __spreadValues$C(__spreadValues$C({}, paint), fromCb);
+        return __spreadValues$E(__spreadValues$E({}, paint), fromCb);
       };
     }
     return;
   }
 
-  var __defProp$T = Object.defineProperty;
-  var __getOwnPropSymbols$C = Object.getOwnPropertySymbols;
-  var __hasOwnProp$C = Object.prototype.hasOwnProperty;
-  var __propIsEnum$C = 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$B = (a, b) => {
+  var __defProp$Y = Object.defineProperty;
+  var __getOwnPropSymbols$E = Object.getOwnPropertySymbols;
+  var __hasOwnProp$E = Object.prototype.hasOwnProperty;
+  var __propIsEnum$E = 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$D = (a, b) => {
     for (var prop in b || (b = {}))
-      if (__hasOwnProp$C.call(b, prop))
-        __defNormalProp$T(a, prop, b[prop]);
-    if (__getOwnPropSymbols$C)
-      for (var prop of __getOwnPropSymbols$C(b)) {
-        if (__propIsEnum$C.call(b, prop))
-          __defNormalProp$T(a, prop, b[prop]);
+      if (__hasOwnProp$E.call(b, prop))
+        __defNormalProp$Y(a, prop, b[prop]);
+    if (__getOwnPropSymbols$E)
+      for (var prop of __getOwnPropSymbols$E(b)) {
+        if (__propIsEnum$E.call(b, prop))
+          __defNormalProp$Y(a, prop, b[prop]);
       }
     return a;
   };
@@ -15986,7 +16000,7 @@ var NgwLeaflet = (function () {
     return false;
   }
   function featureFilter(feature, filters) {
-    const properties = __spreadValues$B({}, feature.properties);
+    const properties = __spreadValues$D({}, feature.properties);
     if (properties) {
       properties.$id = feature.id;
       return propertiesFilter(properties, filters);
@@ -16021,19 +16035,19 @@ var NgwLeaflet = (function () {
     return logic === "any" ? filters_.some(filterFunction) : filters_.every(filterFunction);
   }
 
-  var __defProp$S = Object.defineProperty;
-  var __getOwnPropSymbols$B = Object.getOwnPropertySymbols;
-  var __hasOwnProp$B = Object.prototype.hasOwnProperty;
-  var __propIsEnum$B = 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$A = (a, b) => {
+  var __defProp$X = Object.defineProperty;
+  var __getOwnPropSymbols$D = Object.getOwnPropertySymbols;
+  var __hasOwnProp$D = Object.prototype.hasOwnProperty;
+  var __propIsEnum$D = 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$C = (a, b) => {
     for (var prop in b || (b = {}))
-      if (__hasOwnProp$B.call(b, prop))
-        __defNormalProp$S(a, prop, b[prop]);
-    if (__getOwnPropSymbols$B)
-      for (var prop of __getOwnPropSymbols$B(b)) {
-        if (__propIsEnum$B.call(b, prop))
-          __defNormalProp$S(a, prop, b[prop]);
+      if (__hasOwnProp$D.call(b, prop))
+        __defNormalProp$X(a, prop, b[prop]);
+    if (__getOwnPropSymbols$D)
+      for (var prop of __getOwnPropSymbols$D(b)) {
+        if (__propIsEnum$D.call(b, prop))
+          __defNormalProp$X(a, prop, b[prop]);
       }
     return a;
   };
@@ -16062,7 +16076,7 @@ var NgwLeaflet = (function () {
     return (feature) => {
       const paint = paintsFilters.find((x) => featureFilter(feature, x[0]));
       if (paint) {
-        return __spreadValues$A(__spreadValues$A({}, mask), paint[1]);
+        return __spreadValues$C(__spreadValues$C({}, mask), paint[1]);
       }
       return mask;
     };
@@ -16086,8 +16100,8 @@ var NgwLeaflet = (function () {
   }
   function finalizePaint({ paint, defaultPaint }) {
     var _a;
-    let newPaint = __spreadValues$A({}, defaultPaint);
-    newPaint = __spreadValues$A(__spreadValues$A({}, newPaint), paint);
+    let newPaint = __spreadValues$C({}, defaultPaint);
+    newPaint = __spreadValues$C(__spreadValues$C({}, 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;
@@ -16100,7 +16114,7 @@ var NgwLeaflet = (function () {
     if (!paint) {
       throw new Error("paint is empty");
     }
-    let newPaint = __spreadValues$A({}, defaultPaint);
+    let newPaint = __spreadValues$C({}, defaultPaint);
     if (isPaintCallback(paint)) {
       const getPaintFunction = (feature) => {
         const getPaint = preparePaint({
@@ -16157,41 +16171,41 @@ var NgwLeaflet = (function () {
     return newPaint;
   }
 
-  var __defProp$R = Object.defineProperty;
-  var __defProps$l = Object.defineProperties;
-  var __getOwnPropDescs$l = Object.getOwnPropertyDescriptors;
-  var __getOwnPropSymbols$A = Object.getOwnPropertySymbols;
-  var __hasOwnProp$A = Object.prototype.hasOwnProperty;
-  var __propIsEnum$A = 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$z = (a, b) => {
+  var __defProp$W = Object.defineProperty;
+  var __defProps$n = Object.defineProperties;
+  var __getOwnPropDescs$n = Object.getOwnPropertyDescriptors;
+  var __getOwnPropSymbols$C = Object.getOwnPropertySymbols;
+  var __hasOwnProp$C = Object.prototype.hasOwnProperty;
+  var __propIsEnum$C = 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$B = (a, b) => {
     for (var prop in b || (b = {}))
-      if (__hasOwnProp$A.call(b, prop))
-        __defNormalProp$R(a, prop, b[prop]);
-    if (__getOwnPropSymbols$A)
-      for (var prop of __getOwnPropSymbols$A(b)) {
-        if (__propIsEnum$A.call(b, prop))
-          __defNormalProp$R(a, prop, b[prop]);
+      if (__hasOwnProp$C.call(b, prop))
+        __defNormalProp$W(a, prop, b[prop]);
+    if (__getOwnPropSymbols$C)
+      for (var prop of __getOwnPropSymbols$C(b)) {
+        if (__propIsEnum$C.call(b, prop))
+          __defNormalProp$W(a, prop, b[prop]);
       }
     return a;
   };
-  var __spreadProps$l = (a, b) => __defProps$l(a, __getOwnPropDescs$l(b));
-  var __objRest$5 = (source, exclude) => {
+  var __spreadProps$n = (a, b) => __defProps$n(a, __getOwnPropDescs$n(b));
+  var __objRest$8 = (source, exclude) => {
     var target = {};
     for (var prop in source)
-      if (__hasOwnProp$A.call(source, prop) && exclude.indexOf(prop) < 0)
+      if (__hasOwnProp$C.call(source, prop) && exclude.indexOf(prop) < 0)
         target[prop] = source[prop];
-    if (source != null && __getOwnPropSymbols$A)
-      for (var prop of __getOwnPropSymbols$A(source)) {
-        if (exclude.indexOf(prop) < 0 && __propIsEnum$A.call(source, prop))
+    if (source != null && __getOwnPropSymbols$C)
+      for (var prop of __getOwnPropSymbols$C(source)) {
+        if (exclude.indexOf(prop) < 0 && __propIsEnum$C.call(source, prop))
           target[prop] = source[prop];
       }
     return target;
   };
-  var __publicField$C = (obj, key, value) => __defNormalProp$R(obj, key + "" , value);
+  var __publicField$F = (obj, key, value) => __defNormalProp$W(obj, key + "" , value);
   class GeoJsonPaint {
     constructor(layer) {
-      __publicField$C(this, "layer");
+      __publicField$F(this, "layer");
       this.layer = layer;
     }
     setPaintEachLayer(paint) {
@@ -16259,7 +16273,7 @@ var NgwLeaflet = (function () {
       return PAINT;
     }
     _createDivIcon(icon) {
-      const _a = icon, { html, rotate, className } = _a, toLIconOpt = __objRest$5(_a, ["html", "rotate", "className"]);
+      const _a = icon, { html, rotate, className } = _a, toLIconOpt = __objRest$8(_a, ["html", "rotate", "className"]);
       const element = document.createElement("div");
       if (className) {
         element.className = className;
@@ -16270,7 +16284,7 @@ var NgwLeaflet = (function () {
       if (html) {
         element.innerHTML = html;
       }
-      const divIcon = new leafletSrcExports.DivIcon(__spreadProps$l(__spreadValues$z({
+      const divIcon = new leafletSrcExports.DivIcon(__spreadProps$n(__spreadValues$B({
         className: ""
       }, toLIconOpt), {
         html: element
@@ -16296,7 +16310,7 @@ var NgwLeaflet = (function () {
       }
       return (_, latlng) => {
         const p = PAINT;
-        return new leafletSrcExports.CircleMarker(latlng, this.preparePaint(__spreadValues$z(__spreadValues$z({}, p), icon)));
+        return new leafletSrcExports.CircleMarker(latlng, this.preparePaint(__spreadValues$B(__spreadValues$B({}, p), icon)));
       };
     }
     createPaintOptions(paint) {
@@ -16318,27 +16332,27 @@ var NgwLeaflet = (function () {
     }
   }
 
-  var __defProp$Q = Object.defineProperty;
-  var __defProps$k = Object.defineProperties;
-  var __getOwnPropDescs$k = Object.getOwnPropertyDescriptors;
-  var __getOwnPropSymbols$z = Object.getOwnPropertySymbols;
-  var __hasOwnProp$z = Object.prototype.hasOwnProperty;
-  var __propIsEnum$z = 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$y = (a, b) => {
+  var __defProp$V = Object.defineProperty;
+  var __defProps$m = Object.defineProperties;
+  var __getOwnPropDescs$m = Object.getOwnPropertyDescriptors;
+  var __getOwnPropSymbols$B = Object.getOwnPropertySymbols;
+  var __hasOwnProp$B = Object.prototype.hasOwnProperty;
+  var __propIsEnum$B = 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$A = (a, b) => {
     for (var prop in b || (b = {}))
-      if (__hasOwnProp$z.call(b, prop))
-        __defNormalProp$Q(a, prop, b[prop]);
-    if (__getOwnPropSymbols$z)
-      for (var prop of __getOwnPropSymbols$z(b)) {
-        if (__propIsEnum$z.call(b, prop))
-          __defNormalProp$Q(a, prop, b[prop]);
+      if (__hasOwnProp$B.call(b, prop))
+        __defNormalProp$V(a, prop, b[prop]);
+    if (__getOwnPropSymbols$B)
+      for (var prop of __getOwnPropSymbols$B(b)) {
+        if (__propIsEnum$B.call(b, prop))
+          __defNormalProp$V(a, prop, b[prop]);
       }
     return a;
   };
-  var __spreadProps$k = (a, b) => __defProps$k(a, __getOwnPropDescs$k(b));
-  var __publicField$B = (obj, key, value) => __defNormalProp$Q(obj, typeof key !== "symbol" ? key + "" : key, value);
-  var __async$s = (__this, __arguments, generator) => {
+  var __spreadProps$m = (a, b) => __defProps$m(a, __getOwnPropDescs$m(b));
+  var __publicField$E = (obj, key, value) => __defNormalProp$V(obj, typeof key !== "symbol" ? key + "" : key, value);
+  var __async$u = (__this, __arguments, generator) => {
     return new Promise((resolve, reject) => {
       var fulfilled = (value) => {
         try {
@@ -16361,22 +16375,22 @@ var NgwLeaflet = (function () {
   class GeoJsonAdapter extends BaseAdapter {
     constructor(map, options) {
       super(map, options);
-      __publicField$B(this, "layer");
-      __publicField$B(this, "selected", false);
-      __publicField$B(this, "type");
-      __publicField$B(this, "_layers", []);
-      __publicField$B(this, "_events");
-      __publicField$B(this, "paint");
-      __publicField$B(this, "selectedPaint");
-      __publicField$B(this, "_selectedLayers", []);
-      __publicField$B(this, "_filteredLayers", []);
-      __publicField$B(this, "_filterFun");
-      __publicField$B(this, "_openedPopup", []);
-      __publicField$B(this, "_paint");
-      __publicField$B(this, "$updateTooltip", debounce(() => {
+      __publicField$E(this, "layer");
+      __publicField$E(this, "selected", false);
+      __publicField$E(this, "type");
+      __publicField$E(this, "_layers", []);
+      __publicField$E(this, "_events");
+      __publicField$E(this, "paint");
+      __publicField$E(this, "selectedPaint");
+      __publicField$E(this, "_selectedLayers", []);
+      __publicField$E(this, "_filteredLayers", []);
+      __publicField$E(this, "_filterFun");
+      __publicField$E(this, "_openedPopup", []);
+      __publicField$E(this, "_paint");
+      __publicField$E(this, "$updateTooltip", debounce(() => {
         this.updateTooltip();
       }, 300));
-      __publicField$B(this, "$unselect", () => {
+      __publicField$E(this, "$unselect", () => {
         this.unselect();
       });
       this._events = new GeoJsonEvents(this);
@@ -16385,7 +16399,7 @@ var NgwLeaflet = (function () {
     addLayer(options) {
       Object.assign(this.options, options);
       this.paint = options.paint;
-      this.layer = new leafletSrcExports.FeatureGroup([], __spreadProps$k(__spreadValues$y({}, options.nativeOptions), {
+      this.layer = new leafletSrcExports.FeatureGroup([], __spreadProps$m(__spreadValues$A({}, options.nativeOptions), {
         pane: this.pane
       }));
       this.selectedPaint = options.selectedPaint;
@@ -16434,7 +16448,7 @@ var NgwLeaflet = (function () {
     }
     getSelected() {
       return this._selectedLayers.map((x) => {
-        return __spreadValues$y({
+        return __spreadValues$A({
           target: this,
           feature: x.feature,
           layer: x
@@ -16453,14 +16467,14 @@ var NgwLeaflet = (function () {
         const filteredLayers = [];
         this._layers.forEach(({ feature, layer }) => {
           if (layer) {
-            const ok = fun ? fun(__spreadValues$y({
+            const ok = fun ? fun(__spreadValues$A({
               target: this,
               feature,
               layer
             }, createFeaturePositionOptions(feature))) : true;
             if (ok) {
               layer_.addLayer(layer);
-              filteredLayers.push(__spreadValues$y({
+              filteredLayers.push(__spreadValues$A({
                 target: this,
                 feature,
                 layer
@@ -16481,7 +16495,7 @@ var NgwLeaflet = (function () {
     getLayers() {
       return this._layers.map(({ layer, feature }) => {
         const visible = layer && !!layer._map;
-        return __spreadValues$y({
+        return __spreadValues$A({
           feature,
           layer,
           visible,
@@ -16599,13 +16613,13 @@ var NgwLeaflet = (function () {
       }
     }
     updatePaint(paint) {
-      this.paint = __spreadValues$y(__spreadValues$y({}, this.paint), paint);
+      this.paint = __spreadValues$A(__spreadValues$A({}, this.paint), paint);
       for (const l of this._layers) {
         this._paint.setPaint(l, this.paint);
       }
     }
     updateSelectedPaint(paint) {
-      this.selectedPaint = __spreadValues$y(__spreadValues$y({}, this.selectedPaint), paint);
+      this.selectedPaint = __spreadValues$A(__spreadValues$A({}, this.selectedPaint), paint);
       for (const l of this._selectedLayers) {
         this._paint.setPaint(l, this.selectedPaint);
       }
@@ -16622,7 +16636,7 @@ var NgwLeaflet = (function () {
         if (feature.properties && labelField) {
           message = feature.properties[labelField];
         } else if (label) {
-          message = label(__spreadValues$y(__spreadValues$y({
+          message = label(__spreadValues$A(__spreadValues$A({
             target: this
           }, layerDef), createFeaturePositionOptions(feature)));
         }
@@ -16633,7 +16647,7 @@ var NgwLeaflet = (function () {
       }
     }
     _openPopup(_0) {
-      return __async$s(this, arguments, function* (def, options = {}, type, latLng) {
+      return __async$u(this, arguments, function* (def, options = {}, type, latLng) {
         var _a, _b;
         const { feature, layer } = def;
         const {
@@ -16641,7 +16655,7 @@ var NgwLeaflet = (function () {
           autoPan,
           maxWidth,
           closeButton: closeButton_
-        } = __spreadValues$y({
+        } = __spreadValues$A({
           minWidth: 300
         }, options);
         const closeButton = closeButton_ != null ? closeButton_ : !this.options.selectOnHover;
@@ -16657,7 +16671,7 @@ var NgwLeaflet = (function () {
         };
         let content;
         if (options.createPopupContent) {
-          content = yield options.createPopupContent(__spreadValues$y({
+          content = yield options.createPopupContent(__spreadValues$A({
             layer,
             feature,
             target: this,
@@ -16733,9 +16747,9 @@ var NgwLeaflet = (function () {
           lopt = {
             style: (feature) => {
               if (feature) {
-                return this._paint.preparePaint(__spreadValues$y(__spreadValues$y({}, PAINT), paint(feature)));
+                return this._paint.preparePaint(__spreadValues$A(__spreadValues$A({}, PAINT), paint(feature)));
               } else {
-                return this._paint.preparePaint(__spreadProps$k(__spreadValues$y({}, PAINT), { type: "path" }));
+                return this._paint.preparePaint(__spreadProps$m(__spreadValues$A({}, PAINT), { type: "path" }));
               }
             }
           };
@@ -16751,7 +16765,7 @@ var NgwLeaflet = (function () {
     _onEachFeature(feature, layer) {
       const layer_ = this.layer;
       if (layer_) {
-        const def = __spreadValues$y({
+        const def = __spreadValues$A({
           target: this,
           feature,
           layer
@@ -16786,7 +16800,7 @@ var NgwLeaflet = (function () {
           setTimeout(() => {
             if (popup) {
               this._openPopup(
-                __spreadValues$y({
+                __spreadValues$A({
                   target: this,
                   layer,
                   feature
@@ -16804,7 +16818,7 @@ var NgwLeaflet = (function () {
       leafletSrcExports.DomEvent.stopPropagation(e);
       const layer = e.target;
       const feature = layer.feature;
-      const def = __spreadValues$y({
+      const def = __spreadValues$A({
         target: this,
         layer,
         feature
@@ -16837,7 +16851,7 @@ var NgwLeaflet = (function () {
       }
       if (this.options.onSelect) {
         const features = def.feature ? [def.feature] : [];
-        this.options.onSelect(__spreadValues$y({
+        this.options.onSelect(__spreadValues$A({
           type,
           layer: this,
           features
@@ -16929,20 +16943,20 @@ var NgwLeaflet = (function () {
     return [promise, abortFunc];
   }
 
-  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$A = (obj, key, value) => __defNormalProp$P(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$D = (obj, key, value) => __defNormalProp$U(obj, typeof key !== "symbol" ? key + "" : key, value);
   class Queue {
     /**
      * @param {PromiseQueueOptions} options - Configuration options for the queue.
      */
     constructor({ concurrency = 1, delay = 0 } = {}) {
-      __publicField$A(this, "queue", []);
-      __publicField$A(this, "concurrency");
-      __publicField$A(this, "activeCount", 0);
-      __publicField$A(this, "timeoutId");
-      __publicField$A(this, "delay");
-      __publicField$A(this, "toAbort", []);
+      __publicField$D(this, "queue", []);
+      __publicField$D(this, "concurrency");
+      __publicField$D(this, "activeCount", 0);
+      __publicField$D(this, "timeoutId");
+      __publicField$D(this, "delay");
+      __publicField$D(this, "toAbort", []);
       this.concurrency = concurrency;
       this.delay = delay;
     }
@@ -17018,13 +17032,13 @@ var NgwLeaflet = (function () {
 
   const imageQueue = new Queue({ concurrency: 6, delay: 200 });
 
-  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$z = (obj, key, value) => __defNormalProp$O(obj, key + "" , value);
+  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$C = (obj, key, value) => __defNormalProp$T(obj, key + "" , value);
   class ImageOverlay extends leafletSrcExports.ImageOverlay {
     constructor(imageUrl, bounds, options) {
       super(imageUrl, bounds, options);
-      __publicField$z(this, "_aborter");
+      __publicField$C(this, "_aborter");
     }
     cancelLoad() {
       if (this._aborter) {
@@ -17053,13 +17067,14 @@ var NgwLeaflet = (function () {
     }
   }
 
-  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$y = (obj, key, value) => __defNormalProp$N(obj, typeof key !== "symbol" ? key + "" : key, value);
+  var __defProp$S = Object.defineProperty;
+  var __defNormalProp$S = (obj, key, value) => key in obj ? __defProp$S(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+  var __publicField$B = (obj, key, value) => __defNormalProp$S(obj, typeof key !== "symbol" ? key + "" : key, value);
   class ImageLayer extends leafletSrcExports.Layer {
     constructor(url, options) {
+      var _a;
       super(options);
-      __publicField$y(this, "defaultWmsParams", {
+      __publicField$B(this, "defaultWmsParams", {
         service: "WMS",
         request: "GetMap",
         version: "1.1.1",
@@ -17068,7 +17083,7 @@ var NgwLeaflet = (function () {
         format: "image/jpeg",
         transparent: false
       });
-      __publicField$y(this, "options", {
+      __publicField$B(this, "options", {
         crs: null,
         uppercase: false,
         attribution: "",
@@ -17081,11 +17096,11 @@ var NgwLeaflet = (function () {
         viewPortBuffer: 0,
         setViewDelay: 100
       });
-      __publicField$y(this, "wmsParams");
-      __publicField$y(this, "_url");
-      __publicField$y(this, "_currentUrl");
-      __publicField$y(this, "_currentOverlay");
-      __publicField$y(this, "_loadedOverlay");
+      __publicField$B(this, "wmsParams");
+      __publicField$B(this, "_url");
+      __publicField$B(this, "_currentUrl");
+      __publicField$B(this, "_currentOverlay");
+      __publicField$B(this, "_loadedOverlay");
       this._url = url;
       const params = {};
       const opts = {};
@@ -17098,7 +17113,11 @@ var NgwLeaflet = (function () {
         }
       }
       leafletSrcExports.Util.setOptions(this, opts);
-      this.wmsParams = leafletSrcExports.Util.extend({}, this.defaultWmsParams, params);
+      this.wmsParams = leafletSrcExports.Util.extend(
+        {},
+        this.defaultWmsParams,
+        (_a = params == null ? void 0 : params.params) != null ? _a : {}
+      );
     }
     setParams(params) {
       leafletSrcExports.Util.extend(this.wmsParams, params);
@@ -17245,34 +17264,34 @@ var NgwLeaflet = (function () {
     }
   }
 
-  var __defProp$M = Object.defineProperty;
-  var __getOwnPropSymbols$y = Object.getOwnPropertySymbols;
-  var __hasOwnProp$y = Object.prototype.hasOwnProperty;
-  var __propIsEnum$y = 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$x = (a, b) => {
+  var __defProp$R = Object.defineProperty;
+  var __getOwnPropSymbols$A = Object.getOwnPropertySymbols;
+  var __hasOwnProp$A = Object.prototype.hasOwnProperty;
+  var __propIsEnum$A = 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$z = (a, b) => {
     for (var prop in b || (b = {}))
-      if (__hasOwnProp$y.call(b, prop))
-        __defNormalProp$M(a, prop, b[prop]);
-    if (__getOwnPropSymbols$y)
-      for (var prop of __getOwnPropSymbols$y(b)) {
-        if (__propIsEnum$y.call(b, prop))
-          __defNormalProp$M(a, prop, b[prop]);
+      if (__hasOwnProp$A.call(b, prop))
+        __defNormalProp$R(a, prop, b[prop]);
+    if (__getOwnPropSymbols$A)
+      for (var prop of __getOwnPropSymbols$A(b)) {
+        if (__propIsEnum$A.call(b, prop))
+          __defNormalProp$R(a, prop, b[prop]);
       }
     return a;
   };
-  var __publicField$x = (obj, key, value) => __defNormalProp$M(obj, typeof key !== "symbol" ? key + "" : key, value);
+  var __publicField$A = (obj, key, value) => __defNormalProp$R(obj, typeof key !== "symbol" ? key + "" : key, value);
   class ImageAdapter extends BaseAdapter {
     constructor() {
       super(...arguments);
-      __publicField$x(this, "layer");
+      __publicField$A(this, "layer");
     }
     addLayer(options) {
       const url = options && options.url;
       if (url) {
-        options = __spreadValues$x({ transparent: true }, options);
+        options = __spreadValues$z({ transparent: true }, options);
         const updateWmsParamsFromOpt = options.updateWmsParams;
-        this.layer = new ImageLayer(url, __spreadValues$x(__spreadValues$x(__spreadValues$x({
+        this.layer = new ImageLayer(url, __spreadValues$z(__spreadValues$z(__spreadValues$z({
           pane: this.pane,
           headers: options.headers,
           setViewDelay: options.setViewDelay
@@ -17287,8 +17306,15 @@ var NgwLeaflet = (function () {
         return this.layer;
       }
     }
+    updateLayer(options) {
+      if (this.layer) {
+        const params = (options == null ? void 0 : options.params) || {};
+        leafletSrcExports.Util.extend(this.layer.wmsParams, params);
+        this.layer.update();
+      }
+    }
   }
-  __publicField$x(ImageAdapter, "queue", imageQueue);
+  __publicField$A(ImageAdapter, "queue", imageQueue);
 
   function makeRemote(Base) {
     return class RemoteTileLayer extends Base {
@@ -17350,33 +17376,33 @@ var NgwLeaflet = (function () {
   }
   const TileLayer = makeRemote(TileLayerBase);
 
-  var __defProp$L = 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$L = (obj, key, value) => key in obj ? __defProp$L(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __spreadValues$w = (a, b) => {
+  var __defProp$Q = Object.defineProperty;
+  var __defProps$l = Object.defineProperties;
+  var __getOwnPropDescs$l = Object.getOwnPropertyDescriptors;
+  var __getOwnPropSymbols$z = Object.getOwnPropertySymbols;
+  var __hasOwnProp$z = Object.prototype.hasOwnProperty;
+  var __propIsEnum$z = 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$y = (a, b) => {
     for (var prop in b || (b = {}))
-      if (__hasOwnProp$x.call(b, prop))
-        __defNormalProp$L(a, prop, b[prop]);
-    if (__getOwnPropSymbols$x)
-      for (var prop of __getOwnPropSymbols$x(b)) {
-        if (__propIsEnum$x.call(b, prop))
-          __defNormalProp$L(a, prop, b[prop]);
+      if (__hasOwnProp$z.call(b, prop))
+        __defNormalProp$Q(a, prop, b[prop]);
+    if (__getOwnPropSymbols$z)
+      for (var prop of __getOwnPropSymbols$z(b)) {
+        if (__propIsEnum$z.call(b, prop))
+          __defNormalProp$Q(a, prop, b[prop]);
       }
     return a;
   };
-  var __spreadProps$j = (a, b) => __defProps$j(a, __getOwnPropDescs$j(b));
-  var __objRest$4 = (source, exclude) => {
+  var __spreadProps$l = (a, b) => __defProps$l(a, __getOwnPropDescs$l(b));
+  var __objRest$7 = (source, exclude) => {
     var target = {};
     for (var prop in source)
-      if (__hasOwnProp$x.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$x)
-      for (var prop of __getOwnPropSymbols$x(source)) {
-        if (exclude.indexOf(prop) < 0 && __propIsEnum$x.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;
@@ -17385,9 +17411,9 @@ var NgwLeaflet = (function () {
     addLayer(options) {
       this.options = Object.assign(this.options, options);
       if (options) {
-        const _a = options, { url } = _a, opt = __objRest$4(_a, ["url"]);
+        const _a = options, { url } = _a, opt = __objRest$7(_a, ["url"]);
         if (url) {
-          const tileLayerOptions = __spreadValues$w({
+          const tileLayerOptions = __spreadValues$y({
             pane: this.pane,
             attribution: opt.attribution,
             minZoom: opt.minZoom,
@@ -17398,7 +17424,7 @@ var NgwLeaflet = (function () {
           }
           let layer;
           if (opt.headers || opt.withCredentials) {
-            layer = new TileLayer(url, __spreadProps$j(__spreadValues$w({}, tileLayerOptions), {
+            layer = new TileLayer(url, __spreadProps$l(__spreadValues$y({}, tileLayerOptions), {
               headers: opt.headers,
               withCredentials: opt.withCredentials,
               setViewDelay: opt.setViewDelay
@@ -17410,41 +17436,40 @@ var NgwLeaflet = (function () {
         }
       }
     }
-    updateLayer() {
+    updateLayer(options) {
       if (this.layer) {
         const currentUrl = this.layer._url;
-        const timestamp = (/* @__PURE__ */ new Date()).getTime();
-        const separator = currentUrl.includes("?") ? "&" : "?";
-        const newUrl = currentUrl.replace(/(\?|&)timestamp=\d*/g, "") + separator + `timestamp=${timestamp}`;
-        this.layer.setUrl(newUrl);
+        if (options == null ? void 0 : options.params) {
+          this.layer.setUrl(updateUrlParams(currentUrl, options.params));
+        }
         this.layer.redraw();
       }
     }
   }
 
-  var __defProp$K = 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$K = (obj, key, value) => key in obj ? __defProp$K(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$w.call(b, prop))
-        __defNormalProp$K(a, prop, b[prop]);
-    if (__getOwnPropSymbols$w)
-      for (var prop of __getOwnPropSymbols$w(b)) {
-        if (__propIsEnum$w.call(b, prop))
-          __defNormalProp$K(a, prop, b[prop]);
-      }
+  var __defProp$P = 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$P = (obj, key, value) => key in obj ? __defProp$P(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$y.call(b, prop))
+        __defNormalProp$P(a, prop, b[prop]);
+    if (__getOwnPropSymbols$y)
+      for (var prop of __getOwnPropSymbols$y(b)) {
+        if (__propIsEnum$y.call(b, prop))
+          __defNormalProp$P(a, prop, b[prop]);
+      }
     return a;
   };
-  var __spreadProps$i = (a, b) => __defProps$i(a, __getOwnPropDescs$i(b));
+  var __spreadProps$k = (a, b) => __defProps$k(a, __getOwnPropDescs$k(b));
   class OsmAdapter extends TileAdapter {
     addLayer(options) {
       const url = "https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png";
-      return super.addLayer(__spreadProps$i(__spreadValues$v({
+      return super.addLayer(__spreadProps$k(__spreadValues$x({
         name: "OpenStreetMap",
         attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
       }, options), {
@@ -17460,33 +17485,33 @@ var NgwLeaflet = (function () {
   }
   const WmsLayer = makeRemote(WmsLayerBase);
 
-  var __defProp$J = 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$J = (obj, key, value) => key in obj ? __defProp$J(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __spreadValues$u = (a, b) => {
+  var __defProp$O = 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$O = (obj, key, value) => key in obj ? __defProp$O(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$v.call(b, prop))
-        __defNormalProp$J(a, prop, b[prop]);
-    if (__getOwnPropSymbols$v)
-      for (var prop of __getOwnPropSymbols$v(b)) {
-        if (__propIsEnum$v.call(b, prop))
-          __defNormalProp$J(a, prop, b[prop]);
+      if (__hasOwnProp$x.call(b, prop))
+        __defNormalProp$O(a, prop, b[prop]);
+    if (__getOwnPropSymbols$x)
+      for (var prop of __getOwnPropSymbols$x(b)) {
+        if (__propIsEnum$x.call(b, prop))
+          __defNormalProp$O(a, prop, b[prop]);
       }
     return a;
   };
-  var __spreadProps$h = (a, b) => __defProps$h(a, __getOwnPropDescs$h(b));
-  var __objRest$3 = (source, exclude) => {
+  var __spreadProps$j = (a, b) => __defProps$j(a, __getOwnPropDescs$j(b));
+  var __objRest$6 = (source, exclude) => {
     var target = {};
     for (var prop in source)
-      if (__hasOwnProp$v.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$v)
-      for (var prop of __getOwnPropSymbols$v(source)) {
-        if (exclude.indexOf(prop) < 0 && __propIsEnum$v.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;
@@ -17494,9 +17519,9 @@ var NgwLeaflet = (function () {
   class WmsAdapter extends BaseAdapter {
     addLayer(options) {
       Object.assign(this.options, options);
-      const _a = options, { url } = _a, opt = __objRest$3(_a, ["url"]);
+      const _a = options, { url } = _a, opt = __objRest$6(_a, ["url"]);
       if (url) {
-        const layerOptions = __spreadValues$u({
+        const layerOptions = __spreadValues$w({
           pane: this.pane,
           attribution: opt.attribution,
           minZoom: opt.minZoom,
@@ -17507,7 +17532,7 @@ var NgwLeaflet = (function () {
         }, options.nativeOptions);
         let layer;
         if (opt.headers || opt.withCredentials) {
-          layer = new WmsLayer(url, __spreadProps$h(__spreadValues$u({}, layerOptions), {
+          layer = new WmsLayer(url, __spreadProps$j(__spreadValues$w({}, layerOptions), {
             headers: opt.headers,
             withCredentials: opt.withCredentials
           }));
@@ -17527,33 +17552,33 @@ var NgwLeaflet = (function () {
     ];
   }
 
-  var __defProp$I = Object.defineProperty;
-  var __getOwnPropSymbols$u = Object.getOwnPropertySymbols;
-  var __hasOwnProp$u = Object.prototype.hasOwnProperty;
-  var __propIsEnum$u = 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$t = (a, b) => {
+  var __defProp$N = Object.defineProperty;
+  var __getOwnPropSymbols$w = Object.getOwnPropertySymbols;
+  var __hasOwnProp$w = Object.prototype.hasOwnProperty;
+  var __propIsEnum$w = 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$v = (a, b) => {
     for (var prop in b || (b = {}))
-      if (__hasOwnProp$u.call(b, prop))
-        __defNormalProp$I(a, prop, b[prop]);
-    if (__getOwnPropSymbols$u)
-      for (var prop of __getOwnPropSymbols$u(b)) {
-        if (__propIsEnum$u.call(b, prop))
-          __defNormalProp$I(a, prop, b[prop]);
+      if (__hasOwnProp$w.call(b, prop))
+        __defNormalProp$N(a, prop, b[prop]);
+    if (__getOwnPropSymbols$w)
+      for (var prop of __getOwnPropSymbols$w(b)) {
+        if (__propIsEnum$w.call(b, prop))
+          __defNormalProp$N(a, prop, b[prop]);
       }
     return a;
   };
-  var __publicField$w = (obj, key, value) => __defNormalProp$I(obj, typeof key !== "symbol" ? key + "" : key, value);
+  var __publicField$z = (obj, key, value) => __defNormalProp$N(obj, typeof key !== "symbol" ? key + "" : key, value);
   const _LeafletMapAdapter = class _LeafletMapAdapter {
     constructor() {
-      __publicField$w(this, "options", { target: "map" });
-      __publicField$w(this, "layerAdapters", _LeafletMapAdapter.layerAdapters);
-      __publicField$w(this, "controlAdapters", _LeafletMapAdapter.controlAdapters);
-      __publicField$w(this, "emitter", new EventEmitter());
-      __publicField$w(this, "map");
-      __publicField$w(this, "_resizeObserver");
-      __publicField$w(this, "_unselectCb", []);
-      __publicField$w(this, "_universalEvents", [
+      __publicField$z(this, "options", { target: "map" });
+      __publicField$z(this, "layerAdapters", _LeafletMapAdapter.layerAdapters);
+      __publicField$z(this, "controlAdapters", _LeafletMapAdapter.controlAdapters);
+      __publicField$z(this, "emitter", new EventEmitter());
+      __publicField$z(this, "map");
+      __publicField$z(this, "_resizeObserver");
+      __publicField$z(this, "_unselectCb", []);
+      __publicField$z(this, "_universalEvents", [
         "move",
         "zoom",
         "zoomend",
@@ -17561,14 +17586,14 @@ var NgwLeaflet = (function () {
         "moveend",
         "movestart"
       ]);
-      __publicField$w(this, "_positionEvents", [
+      __publicField$z(this, "_positionEvents", [
         "mousemove",
         "mouseout",
         "mouseover"
       ]);
     }
     create(options) {
-      this.options = __spreadValues$t({}, options);
+      this.options = __spreadValues$v({}, options);
       if (this.options.target) {
         const {
           zoom,
@@ -17578,7 +17603,7 @@ var NgwLeaflet = (function () {
           maxBounds: mb,
           mapAdapterOptions
         } = this.options;
-        this.map = this.options.map || new leafletSrcExports.Map(this.options.target, __spreadValues$t({
+        this.map = this.options.map || new leafletSrcExports.Map(this.options.target, __spreadValues$v({
           attributionControl: false,
           zoomControl: false,
           maxBounds: mb ? arrayToBoundsExpression(mb) : void 0,
@@ -17861,7 +17886,7 @@ var NgwLeaflet = (function () {
       }
     }
   };
-  __publicField$w(_LeafletMapAdapter, "layerAdapters", {
+  __publicField$z(_LeafletMapAdapter, "layerAdapters", {
     GEOJSON: GeoJsonAdapter,
     IMAGE: ImageAdapter,
     TILE: TileAdapter,
@@ -17869,11 +17894,11 @@ var NgwLeaflet = (function () {
     // // MVT: MvtAdapter,
     OSM: OsmAdapter
   });
-  __publicField$w(_LeafletMapAdapter, "controlAdapters", {
+  __publicField$z(_LeafletMapAdapter, "controlAdapters", {
     ZOOM: leafletSrcExports.Control.Zoom,
     ATTRIBUTION: AttributionControl
   });
-  __publicField$w(_LeafletMapAdapter, "Map", leafletSrcExports.Map);
+  __publicField$z(_LeafletMapAdapter, "Map", leafletSrcExports.Map);
   let LeafletMapAdapter = _LeafletMapAdapter;
 
   const svgPath = {
@@ -17948,12 +17973,12 @@ var NgwLeaflet = (function () {
     };
   }
 
-  var __defProp$H = Object.defineProperty;
-  var __defNormalProp$H = (obj, key, value) => key in obj ? __defProp$H(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __publicField$v = (obj, key, value) => __defNormalProp$H(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$y = (obj, key, value) => __defNormalProp$M(obj, typeof key !== "symbol" ? key + "" : key, value);
   const _Cache = class _Cache {
     constructor(options = {}) {
-      __publicField$v(this, "cache", []);
+      __publicField$y(this, "cache", []);
       var _a;
       const namespace = (_a = options.namespace) != null ? _a : "default";
       if (_Cache.instance[namespace]) {
@@ -18059,12 +18084,12 @@ var NgwLeaflet = (function () {
       return objectDeepEqual(itemProps || {}, objectRemoveEmpty(props));
     }
   };
-  __publicField$v(_Cache, "instance", {});
+  __publicField$y(_Cache, "instance", {});
   let Cache = _Cache;
 
   var pkg = {
   	name: "@nextgis/ngw-connector",
-  	version: "3.0.0-alpha.3",
+  	version: "3.0.0-alpha.5",
   	_priority: 12,
   	description: "A lightweight HTTP client optimized for use with NextGIS Web API",
   	main: "index.js",
@@ -18073,15 +18098,15 @@ var NgwLeaflet = (function () {
   	jsdelivr: "lib/ngw-connector.global.prod.js",
   	types: "lib/index.d.ts",
   	dependencies: {
-  		"@nextgis/cache": "^3.0.0-alpha.3",
-  		"@nextgis/cancelable-promise": "^3.0.0-alpha.3",
-  		"@nextgis/utils": "^3.0.0-alpha.3",
+  		"@nextgis/cache": "^3.0.0-alpha.5",
+  		"@nextgis/cancelable-promise": "^3.0.0-alpha.5",
+  		"@nextgis/utils": "^3.0.0-alpha.5",
   		"@types/events": "^3.0.0",
   		events: "*",
   		"form-data": "^4.0.0"
   	},
   	devDependencies: {
-  		"@nextgis/build-tools": "^3.0.0-alpha.3"
+  		"@nextgis/build-tools": "^3.0.0-alpha.5"
   	},
   	scripts: {
   		clean: "rimraf ./lib",
@@ -18115,87 +18140,179 @@ var NgwLeaflet = (function () {
   		type: "git",
   		url: "git://github.com/nextgis/nextgis_frontend.git"
   	},
+  	engines: {
+  		node: ">=18.20.4"
+  	},
   	gitHead: "edc68033f914f6c95c4125b9738bba6d36e990b4"
   };
 
-  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$u = (obj, key, value) => __defNormalProp$G(obj, typeof key !== "symbol" ? key + "" : key, value);
+  const CONNECTORS = [];
+  function addConnector(connector) {
+    CONNECTORS.push(connector);
+  }
+  function findConnector(options) {
+    return CONNECTORS.find((x) => {
+      if (x.options.baseUrl === options.baseUrl) {
+        if (options.auth) {
+          if (x.options.auth) {
+            return objectDeepEqual(x.options.auth, options.auth);
+          }
+        } else {
+          return true;
+        }
+      }
+    });
+  }
+  function removeConnector(connector) {
+    const index = CONNECTORS.indexOf(connector);
+    if (index !== -1) {
+      CONNECTORS.splice(index, 1);
+    }
+  }
+
+  class AbortError extends Error {
+    constructor(message = "AbortError") {
+      super(message);
+      this.name = "AbortError";
+    }
+  }
+
+  var __defProp$L = Object.defineProperty;
+  var __defNormalProp$L = (obj, key, value) => key in obj ? __defProp$L(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+  var __publicField$x = (obj, key, value) => __defNormalProp$L(obj, typeof key !== "symbol" ? key + "" : key, value);
   class NgwError extends Error {
     constructor(er) {
       super();
-      __publicField$u(this, "name", "NgwError");
-      __publicField$u(this, "title");
-      __publicField$u(this, "message");
-      __publicField$u(this, "detail");
-      __publicField$u(this, "exception");
-      __publicField$u(this, "status_code");
-      __publicField$u(this, "data");
-      __publicField$u(this, "guru_meditation");
+      __publicField$x(this, "name", "NgwError");
+      __publicField$x(this, "title");
+      __publicField$x(this, "message");
+      __publicField$x(this, "detail");
+      __publicField$x(this, "exception");
+      __publicField$x(this, "status_code");
+      __publicField$x(this, "data");
+      __publicField$x(this, "guru_meditation");
       Object.assign(this, er);
       Object.setPrototypeOf(this, NgwError.prototype);
     }
   }
 
-  var __defProp$F = Object.defineProperty;
-  var __defNormalProp$F = (obj, key, value) => key in obj ? __defProp$F(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __publicField$t = (obj, key, value) => __defNormalProp$F(obj, typeof key !== "symbol" ? key + "" : key, value);
+  var __defProp$K = Object.defineProperty;
+  var __defNormalProp$K = (obj, key, value) => key in obj ? __defProp$K(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+  var __publicField$w = (obj, key, value) => __defNormalProp$K(obj, typeof key !== "symbol" ? key + "" : key, value);
+  class InsufficientPermissionsError extends NgwError {
+    constructor(obj) {
+      super(obj);
+      __publicField$w(this, "name", "InsufficientPermissionsError");
+      __publicField$w(this, "exception", "nextgisweb.core.exception.InsufficientPermissions");
+      Object.setPrototypeOf(this, InsufficientPermissionsError.prototype);
+    }
+  }
+
+  var __defProp$J = Object.defineProperty;
+  var __defNormalProp$J = (obj, key, value) => key in obj ? __defProp$J(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+  var __publicField$v = (obj, key, value) => __defNormalProp$J(obj, typeof key !== "symbol" ? key + "" : key, value);
   class ResourceNotFoundError extends NgwError {
     constructor(obj) {
       super(obj);
-      __publicField$t(this, "name", "ResourceNotFoundError");
-      __publicField$t(this, "exception", "nextgisweb.resource.exception.ResourceNotFound");
+      __publicField$v(this, "name", "ResourceNotFoundError");
+      __publicField$v(this, "exception", "nextgisweb.resource.exception.ResourceNotFound");
       Object.setPrototypeOf(this, ResourceNotFoundError.prototype);
     }
   }
 
-  function isObject(val) {
-    return Object.prototype.toString.call(val) === "[object Object]";
+  var __defProp$I = Object.defineProperty;
+  var __defNormalProp$I = (obj, key, value) => key in obj ? __defProp$I(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+  var __publicField$u = (obj, key, value) => __defNormalProp$I(obj, typeof key !== "symbol" ? key + "" : key, value);
+  class BaseAPIError extends Error {
+    constructor(message) {
+      super(message || "Something went wrong.");
+      __publicField$u(this, "title");
+      this.name = "BaseAPIError";
+      this.title = "Unknown API error";
+      if (Error.captureStackTrace) {
+        Error.captureStackTrace(this, BaseAPIError);
+      }
+    }
   }
-
-  function resourceCompare(res1, res2) {
-    return objectDeepEqual(res1, res2);
+  class NetworksResponseError extends BaseAPIError {
+    // prettier-ignore
+    constructor(message) {
+      super(message || "There is no response from the server or problem connecting to server.");
+      __publicField$u(this, "detail");
+      this.title = "Network error";
+      this.detail = "Check network connectivity and try again later.";
+    }
   }
-
-  const exclude = ["description"];
-  function resourceToQuery(resource, prefix = "") {
-    prefix = prefix ? prefix + "__" : "";
-    const query = {};
-    for (const [key, value] of Object.entries(resource)) {
-      if (exclude.indexOf(key) === -1) {
-        if (isObject(value)) {
-          if (key === "owner_user") {
-            const children = resourceToQuery(value, key);
-            Object.assign(query, children);
-          } else if (key === "parent" && "id" in value) {
-            query.parent_id = value.id;
-          }
-        } else if (defined(value)) {
-          query[prefix + key] = value;
-        }
+  class InvalidResponseError extends BaseAPIError {
+    constructor(message) {
+      super(message || "Something went wrong.");
+      this.title = "Unexpected server response";
+    }
+  }
+  class ServerResponseError extends BaseAPIError {
+    constructor(data) {
+      super(data.message);
+      __publicField$u(this, "detail");
+      __publicField$u(this, "data");
+      this.title = data.title || this.title;
+      this.detail = data.detail || null;
+      this.data = data;
+    }
+  }
+  class LunkwillError extends Error {
+    // prettier-ignore
+    constructor(message, data = {}) {
+      super(message || "Unexpected error while processing long-running request.");
+      __publicField$u(this, "title");
+      __publicField$u(this, "data");
+      this.name = "LunkwillError";
+      this.title = "Long-running request error";
+      this.data = data;
+      if (Error.captureStackTrace) {
+        Error.captureStackTrace(this, LunkwillError);
       }
     }
-    return query;
+  }
+  class LunkwillRequestCancelled extends LunkwillError {
+    constructor(data) {
+      super("Long-running request was cancelled.", data);
+    }
+  }
+  class LunkwillRequestFailed extends LunkwillError {
+    constructor(data) {
+      super(void 0, data);
+    }
   }
 
-  var __defProp$E = Object.defineProperty;
-  var __getOwnPropSymbols$t = Object.getOwnPropertySymbols;
-  var __hasOwnProp$t = Object.prototype.hasOwnProperty;
-  var __propIsEnum$t = 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$s = (a, b) => {
+  var __defProp$H = Object.defineProperty;
+  var __getOwnPropSymbols$v = Object.getOwnPropertySymbols;
+  var __hasOwnProp$v = Object.prototype.hasOwnProperty;
+  var __propIsEnum$v = 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$u = (a, b) => {
     for (var prop in b || (b = {}))
-      if (__hasOwnProp$t.call(b, prop))
-        __defNormalProp$E(a, prop, b[prop]);
-    if (__getOwnPropSymbols$t)
-      for (var prop of __getOwnPropSymbols$t(b)) {
-        if (__propIsEnum$t.call(b, prop))
-          __defNormalProp$E(a, prop, b[prop]);
+      if (__hasOwnProp$v.call(b, prop))
+        __defNormalProp$H(a, prop, b[prop]);
+    if (__getOwnPropSymbols$v)
+      for (var prop of __getOwnPropSymbols$v(b)) {
+        if (__propIsEnum$v.call(b, prop))
+          __defNormalProp$H(a, prop, b[prop]);
       }
     return a;
   };
-  var __publicField$s = (obj, key, value) => __defNormalProp$E(obj, typeof key !== "symbol" ? key + "" : key, value);
-  var __async$r = (__this, __arguments, generator) => {
+  var __objRest$5 = (source, exclude) => {
+    var target = {};
+    for (var prop in source)
+      if (__hasOwnProp$v.call(source, prop) && exclude.indexOf(prop) < 0)
+        target[prop] = source[prop];
+    if (source != null && __getOwnPropSymbols$v)
+      for (var prop of __getOwnPropSymbols$v(source)) {
+        if (exclude.indexOf(prop) < 0 && __propIsEnum$v.call(source, prop))
+          target[prop] = source[prop];
+      }
+    return target;
+  };
+  var __async$t = (__this, __arguments, generator) => {
     return new Promise((resolve, reject) => {
       var fulfilled = (value) => {
         try {
@@ -18215,51 +18332,904 @@ var NgwLeaflet = (function () {
       step((generator = generator.apply(__this, __arguments)).next());
     });
   };
-  class ResourcesControl {
-    constructor({
-      connector,
-      cacheId
-    }) {
-      __publicField$s(this, "cache");
-      __publicField$s(this, "connector");
-      this.connector = connector;
-      this.cache = new Cache({ namespace: cacheId });
-    }
-    // -------------------------------------------------------------------------
-    // Resource Methods
-    // -------------------------------------------------------------------------
-    /**
-     * Receive resource from NGW by id, keyname or search-object parameter.
-     * @param resource - Resource id, keyname or search-object
-     *
-     * @remarks
-     * Fetching resource would be cached to speed up next call
-     */
-    getOne(resource, requestOptions) {
-      const opt = __spreadValues$s({}, requestOptions);
-      if (typeof resource === "string") ; else if (typeof resource === "number") ; else if (isObject(resource)) {
-        if (resource.id !== void 0) {
-          resource.id;
-        } else {
-          if (resource.keyname) {
-            resource.keyname;
-          }
-          if (resource.display_name) {
-            resource.display_name;
-          }
+  function lunkwillCheckResponse(lwResp) {
+    const ct = lwResp.headers.get("content-type");
+    return ct !== void 0 && ct !== null && ct.includes("application/vnd.lunkwill.request-summary+json");
+  }
+  function responseJson(response) {
+    return __async$t(this, null, function* () {
+      try {
+        return response.json();
+      } catch (e) {
+        throw new Error();
+      }
+    });
+  }
+  function lunkwillResponseUrl(lwResp) {
+    return __async$t(this, null, function* () {
+      const lwData = yield responseJson(lwResp);
+      let delay = lwData.delay_ms;
+      const retry = lwData.retry_ms !== void 0 ? lwData.retry_ms : 2e3;
+      const sum = `/api/lunkwill/${lwData.id}/summary`;
+      const res = `/api/lunkwill/${lwData.id}/response`;
+      const sleep = (msec) => new Promise((resolve) => setTimeout(resolve, msec));
+      let failed = false;
+      let ready = false;
+      while (!ready) {
+        yield sleep(failed ? retry : delay);
+        failed = false;
+        let lwResp2;
+        let lwData2;
+        try {
+          lwResp2 = yield fetch(sum, { credentials: "same-origin" });
+          lwData2 = yield lwResp2.json();
+        } catch (e) {
+          failed = true;
+          continue;
+        }
+        switch (lwData2.status) {
+          case void 0:
+            throw new LunkwillError(void 0, lwData2);
+          case "ready":
+            ready = true;
+            break;
+          case "cancelled":
+            throw new LunkwillRequestCancelled(lwData2);
+          case "failed":
+            throw new LunkwillRequestFailed(lwData2);
+          case "spooled":
+          case "processing":
+          case "buffering":
+            delay = lwData2.delay_ms;
+            break;
+          default:
+            throw new LunkwillError(void 0, lwData2);
         }
       }
-      if (typeof resource === "string") {
-        return this._fetchResourceBy({ keyname: resource }, opt);
-      } else if (typeof resource === "number") {
-        return this._fetchResourceById(resource, opt);
-      } else if (isObject(resource)) {
-        return this._fetchResourceBy(resource, opt);
+      return res;
+    });
+  }
+  function lunkwillFetch(lwRespUrl) {
+    return __async$t(this, null, function* () {
+      try {
+        return yield window.fetch(lwRespUrl, { credentials: "same-origin" });
+      } catch (e) {
+        throw new NetworksResponseError();
       }
-      return Promise.resolve(void 0);
-    }
-    getOneOrFail(resource, requestOptions) {
-      return this.getOne(resource, requestOptions).then((res) => {
+    });
+  }
+  const mediaContentTypes = [
+    "application/pdf",
+    "image/png",
+    "image/jpeg",
+    "image/tiff",
+    "text/csv"
+  ];
+  const mediaContentTypesRegex = new RegExp(mediaContentTypes.join("|"));
+  function isMediaContentType(contentType) {
+    return mediaContentTypesRegex.test(contentType);
+  }
+  function encodeQueryParams(value) {
+    const result = [];
+    for (const [k, v] of Object.entries(value)) {
+      if (typeof v === "string" || typeof v === "number" || typeof v === "boolean") {
+        result.push(`${k}=${encodeURIComponent(v)}`);
+      } else if (Array.isArray(v)) {
+        result.push(`${k}=${v.map(encodeURIComponent).join(",")}`);
+      } else {
+        for (const [sk, sv] of Object.entries(v)) {
+          const ske = `${k}[${encodeURIComponent(sk)}]`;
+          if (typeof sv === "string" || typeof sv === "number" || typeof sv === "boolean") {
+            result.push(`${ske}=${encodeURIComponent(sv)}`);
+          } else if (Array.isArray(sv)) {
+            const sve = sv.map(encodeURIComponent);
+            result.push(`${ske}=${sve.join(",")}`);
+          }
+        }
+      }
+    }
+    return result.join("&");
+  }
+  function generateUrl(path, query) {
+    let urlParams = "";
+    if (query !== void 0) {
+      urlParams = "?" + encodeQueryParams(query);
+    }
+    return path + urlParams;
+  }
+  function request(path, options, cacheEngine) {
+    return __async$t(this, null, function* () {
+      var _b;
+      const defaults = {
+        method: "GET",
+        credentials: "same-origin",
+        headers: {}
+      };
+      const _a = __spreadValues$u(__spreadValues$u({}, defaults), options), {
+        withCredentials,
+        responseType,
+        cacheProps,
+        cacheName,
+        lunkwill,
+        cache,
+        query,
+        json
+      } = _a, opt = __objRest$5(_a, [
+        "withCredentials",
+        "responseType",
+        "cacheProps",
+        "cacheName",
+        "lunkwill",
+        "cache",
+        "query",
+        "json"
+      ]);
+      if (withCredentials) {
+        opt.credentials = "include";
+      }
+      let useLunkwill = false;
+      if (lunkwill !== void 0) {
+        lunkwill.toHeaders(opt.headers || {});
+        useLunkwill = true;
+      }
+      const lunkwillReturnUrl = !!opt.lunkwillReturnUrl;
+      delete opt.lunkwillReturnUrl;
+      if (json !== void 0) {
+        opt.body = JSON.stringify(json);
+        const headers = opt.headers || {};
+        headers["Content-Type"] = "application/json";
+        opt.headers = headers;
+      }
+      const url = generateUrl(path, query);
+      const makeRequest = () => __async$t(this, null, function* () {
+        let response;
+        try {
+          response = yield fetch(url, opt);
+        } catch (e) {
+          if (e.name === "AbortError") {
+            throw e;
+          }
+          throw new NetworksResponseError();
+        }
+        if (useLunkwill && lunkwillCheckResponse(response)) {
+          const lwRespUrl = yield lunkwillResponseUrl(response);
+          if (lunkwillReturnUrl) {
+            return lwRespUrl;
+          }
+          response = yield lunkwillFetch(lwRespUrl);
+        }
+        const respCType = response.headers.get("content-type");
+        const respJSON = respCType && (respCType.includes("application/json") || respCType.includes("application/vnd.lunkwill.request-summary+json"));
+        let body;
+        try {
+          const respMedia = respCType && isMediaContentType(respCType);
+          if (responseType === "blob" || respMedia) {
+            body = yield response.blob();
+          } else if (respJSON) {
+            body = yield response.json();
+          } else {
+            throw new InvalidResponseError();
+          }
+        } catch (e) {
+          if (e.name === "AbortError" || e instanceof InvalidResponseError) {
+            throw e;
+          }
+          throw new InvalidResponseError();
+        }
+        if (400 <= response.status && response.status <= 599) {
+          throw new ServerResponseError(body);
+        }
+        return body;
+      });
+      if (cacheEngine && cache && ((_b = opt.method) == null ? void 0 : _b.toUpperCase()) === "GET") {
+        const cacheOptions = cacheProps ? cacheProps : __spreadValues$u({}, objectRemoveEmpty({
+          withCredentials,
+          responseType
+        }));
+        return cacheEngine.add(cacheName || url, makeRequest, cacheOptions, false);
+      }
+      return makeRequest();
+    });
+  }
+
+  var __defProp$G = Object.defineProperty;
+  var __defProps$i = Object.defineProperties;
+  var __getOwnPropDescs$i = Object.getOwnPropertyDescriptors;
+  var __getOwnPropSymbols$u = Object.getOwnPropertySymbols;
+  var __hasOwnProp$u = Object.prototype.hasOwnProperty;
+  var __propIsEnum$u = Object.prototype.propertyIsEnumerable;
+  var __defNormalProp$G = (obj, key, value) => key in obj ? __defProp$G(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+  var __spreadValues$t = (a, b) => {
+    for (var prop in b || (b = {}))
+      if (__hasOwnProp$u.call(b, prop))
+        __defNormalProp$G(a, prop, b[prop]);
+    if (__getOwnPropSymbols$u)
+      for (var prop of __getOwnPropSymbols$u(b)) {
+        if (__propIsEnum$u.call(b, prop))
+          __defNormalProp$G(a, prop, b[prop]);
+      }
+    return a;
+  };
+  var __spreadProps$i = (a, b) => __defProps$i(a, __getOwnPropDescs$i(b));
+  var __objRest$4 = (source, exclude) => {
+    var target = {};
+    for (var prop in source)
+      if (__hasOwnProp$u.call(source, prop) && exclude.indexOf(prop) < 0)
+        target[prop] = source[prop];
+    if (source != null && __getOwnPropSymbols$u)
+      for (var prop of __getOwnPropSymbols$u(source)) {
+        if (exclude.indexOf(prop) < 0 && __propIsEnum$u.call(source, prop))
+          target[prop] = source[prop];
+      }
+    return target;
+  };
+  var __async$s = (__this, __arguments, generator) => {
+    return new Promise((resolve, reject) => {
+      var fulfilled = (value) => {
+        try {
+          step(generator.next(value));
+        } catch (e) {
+          reject(e);
+        }
+      };
+      var rejected = (value) => {
+        try {
+          step(generator.throw(value));
+        } catch (e) {
+          reject(e);
+        }
+      };
+      var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+      step((generator = generator.apply(__this, __arguments)).next());
+    });
+  };
+  function routeURL(name, baseUrl, routeData, ...rest) {
+    const [template, ...params] = routeData[name];
+    const first = rest[0];
+    let sub;
+    if (first === void 0) {
+      sub = [];
+    } else if (typeof first === "object" && first !== null) {
+      if (rest.length > 1) {
+        throw new Error("Too many arguments for route(name, object)!");
+      }
+      sub = [];
+      for (const [p, v] of Object.entries(first)) {
+        sub[params.indexOf(p)] = String(v);
+      }
+    } else {
+      sub = rest.map((v) => String(v));
+    }
+    return fixUrlStr(
+      baseUrl + template.replace(/\{(\w+)\}/g, function(m, a) {
+        const idx = parseInt(a);
+        const value = sub[idx];
+        if (value === void 0) {
+          const msg = `Undefined parameter ${idx} in "${template}".`;
+          throw new Error(msg);
+        }
+        return String(value);
+      })
+    );
+  }
+  function route(name, connector, ...rest) {
+    const result = {
+      url: (opt) => __async$s(this, null, function* () {
+        var _a;
+        const routeData = yield connector.connect();
+        const template = routeURL(
+          name,
+          (_a = connector.options.baseUrl) != null ? _a : "",
+          routeData,
+          ...rest
+        );
+        return generateUrl(template, opt == null ? void 0 : opt.query);
+      })
+    };
+    const methods = ["get", "post", "put", "delete", "patch"];
+    for (const method of methods) {
+      const methodResp = (requestOptions) => __async$s(this, null, function* () {
+        var _b;
+        const _a = requestOptions || {}, { headers: optHeaders } = _a, restOpt = __objRest$4(_a, ["headers"]);
+        const routeData = yield connector.connect();
+        const template = routeURL(
+          name,
+          (_b = connector.options.baseUrl) != null ? _b : "",
+          routeData,
+          ...rest
+        );
+        const headers = objectRemoveEmpty(__spreadValues$t(__spreadValues$t({}, connector.getAuthorizationHeaders()), optHeaders != null ? optHeaders : {}));
+        return request(
+          template,
+          __spreadProps$i(__spreadValues$t({
+            headers
+          }, restOpt), {
+            method
+          }),
+          connector.cache
+        );
+      });
+      result[method] = methodResp;
+    }
+    return result;
+  }
+
+  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$t = (obj, key, value) => __defNormalProp$F(obj, key + "" , value);
+  class NetworkError extends Error {
+    constructor(url) {
+      super();
+      __publicField$t(this, "name", "NetworkError");
+      Object.setPrototypeOf(this, NetworkError.prototype);
+      this.message = `Unable to request ${url}.
+    Possibly invalid NGW URL entered or CORS not configured to get request from ${location.origin}`;
+    }
+  }
+
+  function isObject(val) {
+    return Object.prototype.toString.call(val) === "[object Object]";
+  }
+
+  let loadData;
+  {
+    loadData = (url, callback, options = {}, error, onCancel) => {
+      options.method = options.method || "GET";
+      const xhr = new XMLHttpRequest();
+      xhr.open(options.method || "GET", url, true);
+      if (options.responseType === "blob") {
+        xhr.responseType = options.responseType;
+      }
+      const getResponseText = () => {
+        try {
+          return JSON.parse(xhr.responseText);
+        } catch (er) {
+          return xhr.responseText;
+        }
+      };
+      const processingResponse = (forError = false) => {
+        const cb = forError ? error : callback;
+        if (options.responseType === "blob") {
+          cb(xhr.response);
+        } else {
+          if (xhr.responseText) {
+            cb(getResponseText());
+          } else {
+            error({ message: "" });
+          }
+        }
+      };
+      xhr.onload = () => {
+        if ([401, 403, 404, 422, 500].indexOf(xhr.status) !== -1) {
+          error(new NgwError(getResponseText()));
+        }
+        processingResponse();
+      };
+      xhr.onerror = (er) => {
+        if (xhr.status === 0) {
+          error(new NetworkError(url));
+        } else {
+          error(er);
+        }
+      };
+      xhr.upload.onprogress = function(e) {
+        if (e.lengthComputable) {
+          const percentComplete = e.loaded / e.total * 100;
+          if (options.onProgress) {
+            options.onProgress(percentComplete, e);
+          }
+        }
+      };
+      const headers = options.headers;
+      if (headers) {
+        for (const h in headers) {
+          const header = headers[h];
+          if (typeof header === "string") {
+            xhr.setRequestHeader(h, header);
+          }
+        }
+      }
+      if (options.withCredentials !== void 0) {
+        xhr.withCredentials = options.withCredentials;
+      }
+      let data;
+      if (options.file) {
+        data = new FormData();
+        data.append("file", options.file);
+        if (options.data) {
+          for (const d in options.data) {
+            data.append(d, data[d]);
+          }
+        }
+      } else {
+        data = options.data ? typeof options.data === "string" ? options.data : JSON.stringify(options.data) : null;
+      }
+      if (onCancel) {
+        onCancel(() => {
+          xhr.abort();
+        });
+      }
+      xhr.send(data);
+    };
+  }
+
+  const templateRe = /\{ *([\w_-]+) *\}/g;
+  function template(str, data) {
+    return str.replace(templateRe, (s, key) => {
+      let value = data[key];
+      if (value === void 0) {
+        throw new Error("No value provided for letiable " + s);
+      } else if (typeof value === "function") {
+        value = value(data);
+      }
+      return value;
+    });
+  }
+
+  var __defProp$E = Object.defineProperty;
+  var __defProps$h = Object.defineProperties;
+  var __getOwnPropDescs$h = Object.getOwnPropertyDescriptors;
+  var __getOwnPropSymbols$t = Object.getOwnPropertySymbols;
+  var __hasOwnProp$t = Object.prototype.hasOwnProperty;
+  var __propIsEnum$t = 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$s = (a, b) => {
+    for (var prop in b || (b = {}))
+      if (__hasOwnProp$t.call(b, prop))
+        __defNormalProp$E(a, prop, b[prop]);
+    if (__getOwnPropSymbols$t)
+      for (var prop of __getOwnPropSymbols$t(b)) {
+        if (__propIsEnum$t.call(b, prop))
+          __defNormalProp$E(a, prop, b[prop]);
+      }
+    return a;
+  };
+  var __spreadProps$h = (a, b) => __defProps$h(a, __getOwnPropDescs$h(b));
+  var __objRest$3 = (source, exclude) => {
+    var target = {};
+    for (var prop in source)
+      if (__hasOwnProp$t.call(source, prop) && exclude.indexOf(prop) < 0)
+        target[prop] = source[prop];
+    if (source != null && __getOwnPropSymbols$t)
+      for (var prop of __getOwnPropSymbols$t(source)) {
+        if (exclude.indexOf(prop) < 0 && __propIsEnum$t.call(source, prop))
+          target[prop] = source[prop];
+      }
+    return target;
+  };
+  var __publicField$s = (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) => {
+        try {
+          step(generator.next(value));
+        } catch (e) {
+          reject(e);
+        }
+      };
+      var rejected = (value) => {
+        try {
+          step(generator.throw(value));
+        } catch (e) {
+          reject(e);
+        }
+      };
+      var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+      step((generator = generator.apply(__this, __arguments)).next());
+    });
+  };
+  let ID$2 = 0;
+  let REQUEST_ID = 0;
+  class NgwConnector {
+    constructor(options) {
+      this.options = options;
+      __publicField$s(this, "id", ID$2++);
+      __publicField$s(this, "emitter", new EventEmitter());
+      __publicField$s(this, "user");
+      __publicField$s(this, "cache");
+      __publicField$s(this, "withCredentials");
+      __publicField$s(this, "client", `NextGIS-NGW-Connector/${pkg.version}`);
+      __publicField$s(this, "routeStr", "/api/component/pyramid/route");
+      __publicField$s(this, "activeRequests", {});
+      __publicField$s(this, "requestTransform");
+      const exist = findConnector(options);
+      this.cache = new Cache({ namespace: options.cacheId });
+      if (exist) {
+        return exist;
+      } else {
+        const { route: route2, requestTransform, withCredentials } = this.options;
+        if (route2) {
+          this.routeStr = route2;
+        }
+        if (requestTransform) {
+          this.requestTransform = requestTransform;
+        }
+        if (withCredentials !== void 0) {
+          this.withCredentials = withCredentials;
+        }
+        addConnector(this);
+      }
+    }
+    static create(options) {
+      return new this(options);
+    }
+    /**
+     * Clear the cache.
+     */
+    clearCache() {
+      this.cache.clean();
+    }
+    setRequestTransform(requestTransform) {
+      this.requestTransform = requestTransform;
+    }
+    /**
+     * Fast way to specify the connection address to NextGIS Web.
+     * The current connection will be severed.
+     * @param baseUrl - NGW url
+     */
+    setNgw(baseUrl) {
+      this.logout();
+      this.options.baseUrl = baseUrl;
+      addConnector(this);
+    }
+    /**
+     * Establishing a connection with NextGIS Web to fulfill all other requests.
+     * @remarks
+     * This method need not be called manually as it is used when forming a request in {@link apiRequest | apiRequest}.
+     * Can be used to check connection.
+     * @example
+     * ```javascript
+     * const connector = new NgwConnector({ baseUrl: 'https://demo.nextgis.com' });
+     * connector.connect()
+     *   .then(() => console.log('Ok'))
+     *   .catch((er) => console.log('Connection problem', er));
+     * ```
+     */
+    connect() {
+      return __async$r(this, null, function* () {
+        const auth = this.options.auth;
+        if (auth) {
+          const { login, password } = auth;
+          if (login && password) {
+            yield this._login({ login, password });
+          }
+        }
+        const routeUrl = `${this.routeStr}?client=${this.client}`;
+        return yield this.makeQuery(
+          routeUrl,
+          {},
+          {
+            cacheName: "route",
+            cache: true,
+            cacheProps: {
+              id: this.id,
+              auth,
+              baseUrl: this.options.baseUrl
+            }
+          }
+        );
+      });
+    }
+    /**
+     * Quick way to change NextGIS Web user.
+     * @param credentials - New user credentials
+     */
+    login(credentials, options) {
+      this.logout();
+      addConnector(this);
+      return this._login(credentials, options);
+    }
+    /**
+     * Disconnecting a user. Aborting all current requests
+     */
+    logout() {
+      this.abort();
+      removeConnector(this);
+      this.options.auth = void 0;
+      this.user = void 0;
+      this.clearCache();
+      this.emitter.emit("logout");
+    }
+    getUserInfo(credentials, options) {
+      return __async$r(this, null, function* () {
+        if (this.user && this.user.id) {
+          return this.user;
+        }
+        if (credentials) {
+          this.options.auth = credentials;
+        }
+        const options_ = __spreadValues$s({
+          headers: this.getAuthorizationHeaders(credentials),
+          cache: true
+        }, options);
+        return this.makeQuery(
+          "/api/component/auth/current_user",
+          {},
+          options_
+        );
+      });
+    }
+    /**
+     * Obtaining the required Headers for authentication of requests in the NGW.
+     */
+    getAuthorizationHeaders(credentials) {
+      const client = this.makeClientId(credentials);
+      if (client) {
+        return {
+          Authorization: `Basic ${client}`
+        };
+      }
+      return {};
+    }
+    makeClientId(credentials) {
+      credentials = credentials || this.options.auth;
+      if (credentials) {
+        const { login, password } = credentials;
+        const encodedStr = [login, password].map(encodeURIComponent).join(":");
+        {
+          return window.btoa(encodedStr);
+        }
+      }
+    }
+    /** Stop all api requests */
+    abort() {
+      for (const abortController of Object.values(this.activeRequests)) {
+        abortController.abort();
+      }
+      this.activeRequests = {};
+    }
+    getActiveApiRequests() {
+      return __spreadValues$s({}, this.activeRequests);
+    }
+    route(name, ...rest) {
+      return route(name, this, ...rest);
+    }
+    /**
+     * Send request to NGW.
+     * @param url - URL address to NGW
+     * @param params - Query params
+     * @param options - Request options
+     */
+    makeQuery(_0, _1) {
+      return __async$r(this, arguments, function* (url, params, options = {}) {
+        var _b;
+        url = (this.options.baseUrl ? this.options.baseUrl : "") + url;
+        if (!url) {
+          throw new Error("Empty `url` not allowed");
+        }
+        if (params) {
+          const _a = params, restParams = __objRest$3(_a, ["paramList"]);
+          url = template(url, restParams);
+        }
+        url = encodeURI(fixUrlStr(url));
+        options = __spreadValues$s({ withCredentials: this.withCredentials }, options);
+        const {
+          cache,
+          signal: externalSignal,
+          method = "GET",
+          headers,
+          cacheName,
+          cacheProps,
+          responseType,
+          withCredentials
+        } = options;
+        const internalAbortController = new AbortController();
+        const internalSignal = internalAbortController.signal;
+        if (externalSignal) {
+          if (externalSignal.aborted) {
+            throw new AbortError();
+          }
+          externalSignal.addEventListener("abort", () => {
+            internalAbortController.abort();
+          });
+        }
+        options.signal = internalSignal;
+        const createPromise = () => __async$r(this, null, function* () {
+          const id = REQUEST_ID++;
+          this.activeRequests[id] = internalAbortController;
+          try {
+            return this._loadData(url, options);
+          } finally {
+            this._cleanActiveRequest(id);
+          }
+        });
+        if (cache && method === "GET") {
+          const cacheOptions = cacheProps ? cacheProps : __spreadProps$h(__spreadValues$s({}, objectRemoveEmpty({
+            headers,
+            withCredentials,
+            responseType,
+            baseUrl: this.options.baseUrl,
+            userId: (_b = this.user) == null ? void 0 : _b.id
+          })), {
+            params
+          });
+          return this.cache.add(
+            cacheName || url,
+            createPromise,
+            cacheOptions,
+            false
+          );
+        }
+        return createPromise();
+      });
+    }
+    _loadData(url, options) {
+      options.responseType = options.responseType || "json";
+      return new Promise((resolve, reject) => {
+        var _a;
+        if (this.user) {
+          options = options || {};
+          options.headers = __spreadValues$s(__spreadValues$s({}, this.getAuthorizationHeaders()), options.headers);
+        }
+        if (this.requestTransform) {
+          const [transUrl, transOptions] = this.requestTransform(url, options);
+          url = transUrl;
+          options = transOptions;
+        }
+        let runOnAbort = void 0;
+        loadData(url, resolve, options, reject, (handler) => {
+          runOnAbort = handler;
+        });
+        (_a = options.signal) == null ? void 0 : _a.addEventListener("abort", () => {
+          if (runOnAbort !== void 0) {
+            runOnAbort();
+          }
+          reject(new AbortError());
+        });
+      }).catch((httpError) => {
+        if (httpError.name !== "AbortError") {
+          {
+            console.warn("DEV WARN", httpError);
+          }
+          const er = this._handleHttpError(httpError);
+          if (er) {
+            throw er;
+          }
+        }
+        throw httpError;
+      });
+    }
+    _login(credentials, options) {
+      return __async$r(this, null, function* () {
+        try {
+          const data = yield this.getUserInfo(credentials, options);
+          this.user = data;
+          this.emitter.emit("login", data);
+          return data;
+        } catch (er) {
+          this.emitter.emit("login:error", er);
+          throw er;
+        }
+      });
+    }
+    _cleanActiveRequest(requestId) {
+      delete this.activeRequests[requestId];
+    }
+    _handleHttpError(er) {
+      if (er) {
+        if (er instanceof NgwError) {
+          if (er.exception === "nextgisweb.resource.exception.ResourceNotFound") {
+            throw new ResourceNotFoundError(er);
+          } else if (er.exception === "nextgisweb.core.exception.InsufficientPermissions") {
+            throw new InsufficientPermissionsError(er);
+          }
+        }
+      }
+      return er;
+    }
+  }
+  __publicField$s(NgwConnector, "errors", {
+    NgwError,
+    ResourceNotFoundError
+  });
+
+  function resourceCompare(res1, res2) {
+    return objectDeepEqual(res1, res2);
+  }
+
+  const exclude = ["description"];
+  function resourceToQuery(resource, prefix = "") {
+    prefix = prefix ? prefix + "__" : "";
+    const query = {};
+    for (const [key, value] of Object.entries(resource)) {
+      if (exclude.indexOf(key) === -1) {
+        if (isObject(value)) {
+          if (key === "owner_user") {
+            const children = resourceToQuery(value, key);
+            Object.assign(query, children);
+          } else if (key === "parent" && "id" in value) {
+            query.parent_id = value.id;
+          }
+        } else if (defined(value)) {
+          query[prefix + key] = value;
+        }
+      }
+    }
+    return query;
+  }
+
+  var __defProp$D = Object.defineProperty;
+  var __getOwnPropSymbols$s = Object.getOwnPropertySymbols;
+  var __hasOwnProp$s = Object.prototype.hasOwnProperty;
+  var __propIsEnum$s = 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$r = (a, b) => {
+    for (var prop in b || (b = {}))
+      if (__hasOwnProp$s.call(b, prop))
+        __defNormalProp$D(a, prop, b[prop]);
+    if (__getOwnPropSymbols$s)
+      for (var prop of __getOwnPropSymbols$s(b)) {
+        if (__propIsEnum$s.call(b, prop))
+          __defNormalProp$D(a, prop, b[prop]);
+      }
+    return a;
+  };
+  var __publicField$r = (obj, key, value) => __defNormalProp$D(obj, typeof key !== "symbol" ? key + "" : key, value);
+  var __async$q = (__this, __arguments, generator) => {
+    return new Promise((resolve, reject) => {
+      var fulfilled = (value) => {
+        try {
+          step(generator.next(value));
+        } catch (e) {
+          reject(e);
+        }
+      };
+      var rejected = (value) => {
+        try {
+          step(generator.throw(value));
+        } catch (e) {
+          reject(e);
+        }
+      };
+      var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+      step((generator = generator.apply(__this, __arguments)).next());
+    });
+  };
+  class ResourcesControl {
+    constructor({
+      connector,
+      cacheId
+    }) {
+      __publicField$r(this, "cache");
+      __publicField$r(this, "connector");
+      this.connector = connector;
+      this.cache = new Cache({ namespace: cacheId });
+    }
+    // -------------------------------------------------------------------------
+    // Resource Methods
+    // -------------------------------------------------------------------------
+    /**
+     * Receive resource from NGW by id, keyname or search-object parameter.
+     * @param resource - Resource id, keyname or search-object
+     *
+     * @remarks
+     * Fetching resource would be cached to speed up next call
+     */
+    getOne(resource, requestOptions) {
+      const opt = __spreadValues$r({}, requestOptions);
+      if (typeof resource === "string") ; else if (typeof resource === "number") ; else if (isObject(resource)) {
+        if (resource.id !== void 0) {
+          resource.id;
+        } else {
+          if (resource.keyname) {
+            resource.keyname;
+          }
+          if (resource.display_name) {
+            resource.display_name;
+          }
+        }
+      }
+      if (typeof resource === "string") {
+        return this._fetchResourceBy({ keyname: resource }, opt);
+      } else if (typeof resource === "number") {
+        return this._fetchResourceById(resource, opt);
+      } else if (isObject(resource)) {
+        return this._fetchResourceBy(resource, opt);
+      }
+      return Promise.resolve(void 0);
+    }
+    getOneOrFail(resource, requestOptions) {
+      return this.getOne(resource, requestOptions).then((res) => {
         if (res) {
           return res;
         }
@@ -18313,7 +19283,7 @@ var NgwLeaflet = (function () {
           } else {
             Object.assign(query, resourceToQuery(resource));
           }
-          return this.connector.get("resource.search", requestOptions, __spreadValues$s({
+          return this.connector.get("resource.search", requestOptions, __spreadValues$r({
             serialization: "full"
           }, query)).then((resources) => {
             if ((requestOptions == null ? void 0 : requestOptions.cache) && resources) {
@@ -18390,7 +19360,7 @@ var NgwLeaflet = (function () {
       });
     }
     _cleanResourceItemCache(id) {
-      return __async$r(this, null, function* () {
+      return __async$q(this, null, function* () {
         var _a;
         const all = this.cache.all();
         const toDelete = [];
@@ -18409,310 +19379,56 @@ var NgwLeaflet = (function () {
             }
           }
         }
-        for (const d of toDelete) {
-          this.cache.delete(d);
-        }
-      });
-    }
-    _fetchResourceById(id, requestOptions) {
-      return this.connector.get("resource.item", requestOptions, { id });
-    }
-    _fetchResourceBy(resource, requestOptions) {
-      return this.getMany(resource, requestOptions).then((resources) => {
-        return resources[0];
-      });
-    }
-    _resourceCacheFilter(resource) {
-      return Promise.all(this.cache.matchAll("resource.item")).then(
-        (resources) => {
-          const items = [];
-          resources.filter((x) => {
-            if (x) {
-              if (resource.keyname && x.resource.keyname) {
-                return resource.keyname === x.resource.keyname;
-              }
-              if (defined(resource.id) && defined(x.resource.id)) {
-                return resource.id === x.resource.id;
-              }
-              return resourceCompare(resource, x.resource);
-            }
-          });
-          return items;
-        }
-      );
-    }
-  }
-
-  const CONNECTORS = [];
-  function addConnector(connector) {
-    CONNECTORS.push(connector);
-  }
-  function findConnector(options) {
-    return CONNECTORS.find((x) => {
-      if (x.options.baseUrl === options.baseUrl) {
-        if (options.auth) {
-          if (x.options.auth) {
-            return objectDeepEqual(x.options.auth, options.auth);
-          }
-        } else {
-          return true;
-        }
-      }
-    });
-  }
-  function removeConnector(connector) {
-    const index = CONNECTORS.indexOf(connector);
-    if (index !== -1) {
-      CONNECTORS.splice(index, 1);
-    }
-  }
-
-  class AbortError extends Error {
-    constructor(message = "AbortError") {
-      super(message);
-      this.name = "AbortError";
-    }
-  }
-
-  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$r = (obj, key, value) => __defNormalProp$D(obj, typeof key !== "symbol" ? key + "" : key, value);
-  class InsufficientPermissionsError extends NgwError {
-    constructor(obj) {
-      super(obj);
-      __publicField$r(this, "name", "InsufficientPermissionsError");
-      __publicField$r(this, "exception", "nextgisweb.core.exception.InsufficientPermissions");
-      Object.setPrototypeOf(this, InsufficientPermissionsError.prototype);
-    }
-  }
-
-  const templateRe = /\{ *([\w_-]+) *\}/g;
-  function template(str, data) {
-    return str.replace(templateRe, (s, key) => {
-      let value = data[key];
-      if (value === void 0) {
-        throw new Error("No value provided for letiable " + s);
-      } else if (typeof value === "function") {
-        value = value(data);
-      }
-      return value;
-    });
-  }
-
-  var __defProp$C = Object.defineProperty;
-  var __getOwnPropSymbols$s = Object.getOwnPropertySymbols;
-  var __hasOwnProp$s = Object.prototype.hasOwnProperty;
-  var __propIsEnum$s = Object.prototype.propertyIsEnumerable;
-  var __defNormalProp$C = (obj, key, value) => key in obj ? __defProp$C(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __spreadValues$r = (a, b) => {
-    for (var prop in b || (b = {}))
-      if (__hasOwnProp$s.call(b, prop))
-        __defNormalProp$C(a, prop, b[prop]);
-    if (__getOwnPropSymbols$s)
-      for (var prop of __getOwnPropSymbols$s(b)) {
-        if (__propIsEnum$s.call(b, prop))
-          __defNormalProp$C(a, prop, b[prop]);
-      }
-    return a;
-  };
-  var __async$q = (__this, __arguments, generator) => {
-    return new Promise((resolve, reject) => {
-      var fulfilled = (value) => {
-        try {
-          step(generator.next(value));
-        } catch (e) {
-          reject(e);
-        }
-      };
-      var rejected = (value) => {
-        try {
-          step(generator.throw(value));
-        } catch (e) {
-          reject(e);
-        }
-      };
-      var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-      step((generator = generator.apply(__this, __arguments)).next());
-    });
-  };
-  function apiRequest(opt) {
-    return __async$q(this, null, function* () {
-      const { params, name, connector, requestOptions } = opt;
-      const apiItems = yield connector.connect();
-      let apiItem = apiItems && apiItems[name];
-      if (apiItem) {
-        apiItem = [...apiItem];
-        let url = apiItem.shift();
-        if (apiItem.length) {
-          const replaceParams = {};
-          for (let fry = 0; fry < apiItem.length; fry++) {
-            const arg = apiItem[fry];
-            replaceParams[fry] = `{${arg}}`;
-            if (params[arg] === void 0) {
-              throw new Error(`\`${arg}\` URL API argument is not specified`);
-            }
-          }
-          if (url) {
-            url = template(url, replaceParams);
-          }
-        }
-        if (params) {
-          const paramArray = [];
-          const paramList = params.paramList;
-          if (Array.isArray(paramList)) {
-            paramList.forEach(([key, value]) => {
-              paramArray.push(`${key}=${value}`);
-            });
-          }
-          for (const p in params) {
-            if (apiItem.indexOf(p) === -1) {
-              paramArray.push(`${p}=${params[p]}`);
-            }
-          }
-          if (paramArray.length) {
-            url = `${url}?${paramArray.join("&")}`;
-          }
-        }
-        if (url) {
-          return connector.makeQuery(url, params, __spreadValues$r({
-            cacheName: name
-          }, requestOptions));
-        } else {
-          throw new Error("Request URL is not set");
-        }
-      } else {
-        return void 0;
-      }
-    });
-  }
-
-  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$q = (obj, key, value) => __defNormalProp$B(obj, key + "" , value);
-  class NetworkError extends Error {
-    constructor(url) {
-      super();
-      __publicField$q(this, "name", "NetworkError");
-      Object.setPrototypeOf(this, NetworkError.prototype);
-      this.message = `Unable to request ${url}.
-    Possibly invalid NGW URL entered or CORS not configured to get request from ${location.origin}`;
-    }
-  }
-
-  let loadData;
-  {
-    loadData = (url, callback, options = {}, error, onCancel) => {
-      options.method = options.method || "GET";
-      const xhr = new XMLHttpRequest();
-      xhr.open(options.method || "GET", url, true);
-      if (options.responseType === "blob") {
-        xhr.responseType = options.responseType;
-      }
-      const getResponseText = () => {
-        try {
-          return JSON.parse(xhr.responseText);
-        } catch (er) {
-          return xhr.responseText;
-        }
-      };
-      const processingResponse = (forError = false) => {
-        const cb = forError ? error : callback;
-        if (options.responseType === "blob") {
-          cb(xhr.response);
-        } else {
-          if (xhr.responseText) {
-            cb(getResponseText());
-          } else {
-            error({ message: "" });
-          }
-        }
-      };
-      xhr.onload = () => {
-        if ([401, 403, 404, 422, 500].indexOf(xhr.status) !== -1) {
-          error(new NgwError(getResponseText()));
-        }
-        processingResponse();
-      };
-      xhr.onerror = (er) => {
-        if (xhr.status === 0) {
-          error(new NetworkError(url));
-        } else {
-          error(er);
-        }
-      };
-      xhr.upload.onprogress = function(e) {
-        if (e.lengthComputable) {
-          const percentComplete = e.loaded / e.total * 100;
-          if (options.onProgress) {
-            options.onProgress(percentComplete, e);
-          }
-        }
-      };
-      const headers = options.headers;
-      if (headers) {
-        for (const h in headers) {
-          const header = headers[h];
-          if (typeof header === "string") {
-            xhr.setRequestHeader(h, header);
-          }
-        }
-      }
-      if (options.withCredentials !== void 0) {
-        xhr.withCredentials = options.withCredentials;
-      }
-      let data;
-      if (options.file) {
-        data = new FormData();
-        data.append("file", options.file);
-        if (options.data) {
-          for (const d in options.data) {
-            data.append(d, data[d]);
-          }
+        for (const d of toDelete) {
+          this.cache.delete(d);
         }
-      } else {
-        data = options.data ? typeof options.data === "string" ? options.data : JSON.stringify(options.data) : null;
-      }
-      if (onCancel) {
-        onCancel(() => {
-          xhr.abort();
-        });
-      }
-      xhr.send(data);
-    };
+      });
+    }
+    _fetchResourceById(id, requestOptions) {
+      return this.connector.get("resource.item", requestOptions, { id });
+    }
+    _fetchResourceBy(resource, requestOptions) {
+      return this.getMany(resource, requestOptions).then((resources) => {
+        return resources[0];
+      });
+    }
+    _resourceCacheFilter(resource) {
+      return Promise.all(this.cache.matchAll("resource.item")).then(
+        (resources) => {
+          const items = [];
+          resources.filter((x) => {
+            if (x) {
+              if (resource.keyname && x.resource.keyname) {
+                return resource.keyname === x.resource.keyname;
+              }
+              if (defined(resource.id) && defined(x.resource.id)) {
+                return resource.id === x.resource.id;
+              }
+              return resourceCompare(resource, x.resource);
+            }
+          });
+          return items;
+        }
+      );
+    }
   }
 
-  var __defProp$A = Object.defineProperty;
-  var __defProps$g = Object.defineProperties;
-  var __getOwnPropDescs$g = Object.getOwnPropertyDescriptors;
+  var __defProp$C = Object.defineProperty;
   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 __defNormalProp$C = (obj, key, value) => key in obj ? __defProp$C(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$r.call(b, prop))
-        __defNormalProp$A(a, prop, b[prop]);
+        __defNormalProp$C(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]);
+          __defNormalProp$C(a, prop, b[prop]);
       }
     return a;
   };
-  var __spreadProps$g = (a, b) => __defProps$g(a, __getOwnPropDescs$g(b));
-  var __objRest$2 = (source, exclude) => {
-    var target = {};
-    for (var prop in source)
-      if (__hasOwnProp$r.call(source, prop) && exclude.indexOf(prop) < 0)
-        target[prop] = source[prop];
-    if (source != null && __getOwnPropSymbols$r)
-      for (var prop of __getOwnPropSymbols$r(source)) {
-        if (exclude.indexOf(prop) < 0 && __propIsEnum$r.call(source, prop))
-          target[prop] = source[prop];
-      }
-    return target;
-  };
-  var __publicField$p = (obj, key, value) => __defNormalProp$A(obj, typeof key !== "symbol" ? key + "" : key, value);
   var __async$p = (__this, __arguments, generator) => {
     return new Promise((resolve, reject) => {
       var fulfilled = (value) => {
@@ -18733,172 +19449,76 @@ var NgwLeaflet = (function () {
       step((generator = generator.apply(__this, __arguments)).next());
     });
   };
-  let ID$2 = 0;
-  let REQUEST_ID = 0;
-  class NgwConnector {
-    constructor(options) {
-      this.options = options;
-      __publicField$p(this, "id", ID$2++);
-      __publicField$p(this, "emitter", new EventEmitter());
-      __publicField$p(this, "user");
-      __publicField$p(this, "resources");
-      __publicField$p(this, "cache");
-      __publicField$p(this, "withCredentials");
-      __publicField$p(this, "client", `NextGIS-NGW-Connector/${pkg.version}`);
-      __publicField$p(this, "routeStr", "/api/component/pyramid/route");
-      __publicField$p(this, "activeRequests", {});
-      __publicField$p(this, "requestTransform");
-      const exist = findConnector(options);
-      this.cache = new Cache({ namespace: options.cacheId });
-      if (exist) {
-        return exist;
-      } else {
-        const { route, requestTransform, withCredentials } = this.options;
-        if (route) {
-          this.routeStr = route;
-        }
-        if (requestTransform) {
-          this.requestTransform = requestTransform;
-        }
-        if (withCredentials !== void 0) {
-          this.withCredentials = withCredentials;
-        }
-        this.resources = new ResourcesControl({
-          connector: this,
-          cacheId: options.cacheId
-        });
-        addConnector(this);
-      }
-    }
-    static create(options) {
-      return new this(options);
-    }
-    /**
-     * Clear the cache.
-     */
-    clearCache() {
-      this.cache.clean();
-      this.resources.cache.clean();
-    }
-    setRequestTransform(requestTransform) {
-      this.requestTransform = requestTransform;
-    }
-    /**
-     * Fast way to specify the connection address to NextGIS Web.
-     * The current connection will be severed.
-     * @param baseUrl - NGW url
-     */
-    setNgw(baseUrl) {
-      this.logout();
-      this.options.baseUrl = baseUrl;
-      addConnector(this);
-    }
-    /**
-     * Establishing a connection with NextGIS Web to fulfill all other requests.
-     * @remarks
-     * This method need not be called manually as it is used when forming a request in {@link apiRequest | apiRequest}.
-     * Can be used to check connection.
-     * @example
-     * ```javascript
-     * const connector = new NgwConnector({baseUrl: 'https://demo.nextgis.com'});
-     * connector.connect()
-     *   .then(() => console.log('Ok'))
-     *   .catch((er) => console.log('Connection problem', er));
-     * ```
-     */
-    connect() {
-      return __async$p(this, null, function* () {
-        const auth = this.options.auth;
-        if (auth) {
-          const { login, password } = auth;
-          if (login && password) {
-            yield this._login({ login, password });
+  function apiRequest(opt) {
+    return __async$p(this, null, function* () {
+      const { params, name, connector, requestOptions } = opt;
+      const apiItems = yield connector.connect();
+      let apiItem = apiItems && apiItems[name];
+      if (apiItem) {
+        apiItem = [...apiItem];
+        let url = apiItem.shift();
+        if (apiItem.length) {
+          const replaceParams = {};
+          for (let fry = 0; fry < apiItem.length; fry++) {
+            const arg = apiItem[fry];
+            replaceParams[fry] = `{${arg}}`;
+            if (params[arg] === void 0) {
+              throw new Error(`\`${arg}\` URL API argument is not specified`);
+            }
+          }
+          if (url) {
+            url = template(url, replaceParams);
           }
         }
-        const routeUrl = `${this.routeStr}?client=${this.client}`;
-        return yield this.makeQuery(
-          routeUrl,
-          {},
-          {
-            cacheName: "route",
-            cache: true,
-            cacheProps: {
-              id: this.id,
-              auth,
-              baseUrl: this.options.baseUrl
+        if (params) {
+          const paramArray = [];
+          const paramList = params.paramList;
+          if (Array.isArray(paramList)) {
+            paramList.forEach(([key, value]) => {
+              paramArray.push(`${key}=${value}`);
+            });
+          }
+          for (const p in params) {
+            if (apiItem.indexOf(p) === -1) {
+              paramArray.push(`${p}=${params[p]}`);
             }
           }
-        );
-      });
-    }
-    /**
-     * Quick way to change NextGIS Web user.
-     * @param credentials - New user credentials
-     */
-    login(credentials, options) {
-      this.logout();
-      addConnector(this);
-      return this._login(credentials, options);
-    }
-    /**
-     * Disconnecting a user. Aborting all current requests
-     */
-    logout() {
-      this.abort();
-      removeConnector(this);
-      this.options.auth = void 0;
-      this.user = void 0;
-      this.clearCache();
-      this.emitter.emit("logout");
-    }
-    getUserInfo(credentials, options) {
-      return __async$p(this, null, function* () {
-        if (this.user && this.user.id) {
-          return this.user;
+          if (paramArray.length) {
+            url = `${url}?${paramArray.join("&")}`;
+          }
         }
-        if (credentials) {
-          this.options.auth = credentials;
+        if (url) {
+          return connector.makeQuery(url, params, __spreadValues$q({
+            cacheName: name
+          }, requestOptions));
+        } else {
+          throw new Error("Request URL is not set");
         }
-        const options_ = __spreadValues$q({
-          headers: this.getAuthorizationHeaders(credentials)
-        }, options);
-        return this.makeQuery(
-          "/api/component/auth/current_user",
-          {},
-          options_
-        );
+      } else {
+        return void 0;
+      }
+    });
+  }
+
+  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$q = (obj, key, value) => __defNormalProp$B(obj, key + "" , value);
+  class NgwConnectorExtended extends NgwConnector {
+    constructor(options) {
+      super(options);
+      this.options = options;
+      __publicField$q(this, "resources");
+      this.resources = new ResourcesControl({
+        connector: this,
+        cacheId: options.cacheId
       });
     }
     /**
-     * Obtaining the required Headers for authentication of requests in the NGW.
-     */
-    getAuthorizationHeaders(credentials) {
-      const client = this.makeClientId(credentials);
-      if (client) {
-        return {
-          Authorization: `Basic ${client}`
-        };
-      }
-    }
-    makeClientId(credentials) {
-      credentials = credentials || this.options.auth;
-      if (credentials) {
-        const { login, password } = credentials;
-        const encodedStr = [login, password].map(encodeURIComponent).join(":");
-        {
-          return window.btoa(encodedStr);
-        }
-      }
-    }
-    /** Stop all api requests */
-    abort() {
-      for (const abortController of Object.values(this.activeRequests)) {
-        abortController.abort();
-      }
-      this.activeRequests = {};
-    }
-    getActiveApiRequests() {
-      return __spreadValues$q({}, this.activeRequests);
+     * Clear the cache.
+     */
+    clearCache() {
+      super.clearCache();
+      this.resources.cache.clean();
     }
     /**
      * Send request to NGW api router.
@@ -19017,75 +19637,6 @@ var NgwLeaflet = (function () {
         options
       );
     }
-    /**
-     * Send request to NGW.
-     * @param url - URL address to NGW
-     * @param params - Query params
-     * @param options - Request options
-     */
-    makeQuery(_0, _1) {
-      return __async$p(this, arguments, function* (url, params, options = {}) {
-        var _b;
-        url = (this.options.baseUrl ? this.options.baseUrl : "") + url;
-        if (!url) {
-          throw new Error("Empty `url` not allowed");
-        }
-        if (params) {
-          const _a = params, restParams = __objRest$2(_a, ["paramList"]);
-          url = template(url, restParams);
-        }
-        url = encodeURI(fixUrlStr(url));
-        options = __spreadValues$q({ withCredentials: this.withCredentials }, options);
-        const {
-          cache,
-          signal: externalSignal,
-          method = "GET",
-          headers,
-          cacheName,
-          cacheProps,
-          responseType,
-          withCredentials
-        } = options;
-        const internalAbortController = new AbortController();
-        const internalSignal = internalAbortController.signal;
-        if (externalSignal) {
-          if (externalSignal.aborted) {
-            throw new AbortError();
-          }
-          externalSignal.addEventListener("abort", () => {
-            internalAbortController.abort();
-          });
-        }
-        options.signal = internalSignal;
-        const createPromise = () => __async$p(this, null, function* () {
-          const id = REQUEST_ID++;
-          this.activeRequests[id] = internalAbortController;
-          try {
-            return this._loadData(url, options);
-          } finally {
-            this._cleanActiveRequest(id);
-          }
-        });
-        if (cache && method === "GET") {
-          const cacheOptions = cacheProps ? cacheProps : __spreadProps$g(__spreadValues$q({}, objectRemoveEmpty({
-            headers,
-            withCredentials,
-            responseType,
-            baseUrl: this.options.baseUrl,
-            userId: (_b = this.user) == null ? void 0 : _b.id
-          })), {
-            params
-          });
-          return this.cache.add(
-            cacheName || url,
-            createPromise,
-            cacheOptions,
-            false
-          );
-        }
-        return createPromise();
-      });
-    }
     // -------------------------------------------------------------------------
     // Resource Methods
     // -------------------------------------------------------------------------
@@ -19161,98 +19712,27 @@ var NgwLeaflet = (function () {
     deleteResource(resource) {
       return this.resources.delete(resource);
     }
-    /**
-     * @internal
-     */
-    _loadData(url, options) {
-      options.responseType = options.responseType || "json";
-      return new Promise((resolve, reject) => {
-        var _a;
-        if (this.user) {
-          options = options || {};
-          options.headers = __spreadValues$q(__spreadValues$q({}, this.getAuthorizationHeaders()), options.headers);
-        }
-        if (this.requestTransform) {
-          const [transUrl, transOptions] = this.requestTransform(url, options);
-          url = transUrl;
-          options = transOptions;
-        }
-        let runOnAbort = void 0;
-        loadData(url, resolve, options, reject, (handler) => {
-          runOnAbort = handler;
-        });
-        (_a = options.signal) == null ? void 0 : _a.addEventListener("abort", () => {
-          if (runOnAbort !== void 0) {
-            runOnAbort();
-          }
-          reject(new AbortError());
-        });
-      }).catch((httpError) => {
-        if (httpError.name !== "AbortError") {
-          {
-            console.warn("DEV WARN", httpError);
-          }
-          const er = this._handleHttpError(httpError);
-          if (er) {
-            throw er;
-          }
-        }
-        throw httpError;
-      });
-    }
-    _login(credentials, options) {
-      return __async$p(this, null, function* () {
-        try {
-          const data = yield this.getUserInfo(credentials, options);
-          this.user = data;
-          this.emitter.emit("login", data);
-          return data;
-        } catch (er) {
-          this.emitter.emit("login:error", er);
-          throw er;
-        }
-      });
-    }
-    _cleanActiveRequest(requestId) {
-      delete this.activeRequests[requestId];
-    }
-    _handleHttpError(er) {
-      if (er) {
-        if (er instanceof NgwError) {
-          if (er.exception === "nextgisweb.resource.exception.ResourceNotFound") {
-            throw new ResourceNotFoundError(er);
-          } else if (er.exception === "nextgisweb.core.exception.InsufficientPermissions") {
-            throw new InsufficientPermissionsError(er);
-          }
-        }
-      }
-      return er;
-    }
   }
-  __publicField$p(NgwConnector, "errors", {
-    NgwError,
-    ResourceNotFoundError
-  });
 
-  var __defProp$z = Object.defineProperty;
-  var __defProps$f = Object.defineProperties;
-  var __getOwnPropDescs$f = Object.getOwnPropertyDescriptors;
+  var __defProp$A = Object.defineProperty;
+  var __defProps$g = Object.defineProperties;
+  var __getOwnPropDescs$g = 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 __defNormalProp$A = (obj, key, value) => key in obj ? __defProp$A(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
   var __spreadValues$p = (a, b) => {
     for (var prop in b || (b = {}))
       if (__hasOwnProp$q.call(b, prop))
-        __defNormalProp$z(a, prop, b[prop]);
+        __defNormalProp$A(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]);
+          __defNormalProp$A(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$o = (__this, __arguments, generator) => {
     return new Promise((resolve, reject) => {
       var fulfilled = (value) => {
@@ -19357,13 +19837,13 @@ var NgwLeaflet = (function () {
       for (const f of filters_) {
         if (isPropertyFilter(f)) {
           _queries.push(
-            fetchNgwLayerItemsRequest(__spreadProps$f(__spreadValues$p({}, opt), {
+            fetchNgwLayerItemsRequest(__spreadProps$g(__spreadValues$p({}, opt), {
               paramList: [..._parentAllParams, ...paramList, createParam(f)]
             }))
           );
         } else {
           getQueries(
-            __spreadProps$f(__spreadValues$p({}, opt), {
+            __spreadProps$g(__spreadValues$p({}, opt), {
               filters: f
             }),
             _queries,
@@ -19384,7 +19864,7 @@ var NgwLeaflet = (function () {
       if (propertiesFilterList.length) {
         for (const x of propertiesFilterList) {
           getQueries(
-            __spreadProps$f(__spreadValues$p({}, opt), {
+            __spreadProps$g(__spreadValues$p({}, opt), {
               filters: x
             }),
             _queries,
@@ -19393,7 +19873,7 @@ var NgwLeaflet = (function () {
         }
       } else {
         _queries.push(
-          fetchNgwLayerItemsRequest(__spreadProps$f(__spreadValues$p({}, opt), {
+          fetchNgwLayerItemsRequest(__spreadProps$g(__spreadValues$p({}, opt), {
             paramList: [..._parentAllParams, ...paramList, ...filters2]
           }))
         );
@@ -19458,25 +19938,25 @@ var NgwLeaflet = (function () {
     );
   }
 
-  var __defProp$y = Object.defineProperty;
-  var __defProps$e = Object.defineProperties;
-  var __getOwnPropDescs$e = Object.getOwnPropertyDescriptors;
+  var __defProp$z = Object.defineProperty;
+  var __defProps$f = Object.defineProperties;
+  var __getOwnPropDescs$f = 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 __defNormalProp$z = (obj, key, value) => key in obj ? __defProp$z(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$p.call(b, prop))
-        __defNormalProp$y(a, prop, b[prop]);
+        __defNormalProp$z(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]);
+          __defNormalProp$z(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$n = (__this, __arguments, generator) => {
     return new Promise((resolve, reject) => {
       var fulfilled = (value) => {
@@ -19514,45 +19994,45 @@ var NgwLeaflet = (function () {
         if (resp.geom) {
           return createGeoJsonFeature(resp);
         } else {
-          const onlyGeomItem = yield fetchNgwLayerItem(__spreadProps$e(__spreadValues$o({}, options), {
+          const onlyGeomItem = yield fetchNgwLayerItem(__spreadProps$f(__spreadValues$o({}, options), {
             geom: true,
             fields: null,
             extensions: null
           }));
           const geom = onlyGeomItem.geom;
-          return createGeoJsonFeature(__spreadProps$e(__spreadValues$o({}, resp), { geom }));
+          return createGeoJsonFeature(__spreadProps$f(__spreadValues$o({}, resp), { geom }));
         }
       });
-      return __spreadProps$e(__spreadValues$o({}, resp), {
+      return __spreadProps$f(__spreadValues$o({}, resp), {
         toGeojson
       });
     });
   }
 
-  var __defProp$x = Object.defineProperty;
+  var __defProp$y = 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 __defNormalProp$y = (obj, key, value) => key in obj ? __defProp$y(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$o.call(b, prop))
-        __defNormalProp$x(a, prop, b[prop]);
+        __defNormalProp$y(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]);
+          __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$p = (obj, key, value) => __defNormalProp$y(obj, typeof key !== "symbol" ? key + "" : key, value);
   class BookmarkItem {
     constructor(options) {
       this.options = options;
-      __publicField$o(this, "name");
-      __publicField$o(this, "resourceId");
-      __publicField$o(this, "item");
-      __publicField$o(this, "_extent");
+      __publicField$p(this, "name");
+      __publicField$p(this, "resourceId");
+      __publicField$p(this, "item");
+      __publicField$p(this, "_extent");
       this.resourceId = options.resourceId;
       const item = options.item;
       this.item = item;
@@ -19698,14 +20178,14 @@ var NgwLeaflet = (function () {
     return true;
   }
 
-  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$o = (obj, key, value) => __defNormalProp$x(obj, typeof key !== "symbol" ? key + "" : key, value);
   class TreeHelper {
     constructor(item) {
-      __publicField$n(this, "item");
-      __publicField$n(this, "_children", []);
-      __publicField$n(this, "_parent");
+      __publicField$o(this, "item");
+      __publicField$o(this, "_children", []);
+      __publicField$o(this, "_parent");
       this.item = item;
     }
     setParent(parent) {
@@ -19768,19 +20248,19 @@ var NgwLeaflet = (function () {
     }
   }
 
-  var __defProp$v = Object.defineProperty;
-  var __defNormalProp$v = (obj, key, value) => key in obj ? __defProp$v(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __publicField$m = (obj, key, value) => __defNormalProp$v(obj, typeof key !== "symbol" ? key + "" : key, value);
+  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);
   class BaseProperty {
     constructor(name, item, options) {
-      __publicField$m(this, "options");
-      __publicField$m(this, "emitter", new EventEmitter());
-      __publicField$m(this, "name");
-      __publicField$m(this, "item");
-      __publicField$m(this, "_blocked", false);
-      __publicField$m(this, "_container");
-      __publicField$m(this, "_value");
-      __publicField$m(this, "_removeEventsListener");
+      __publicField$n(this, "options");
+      __publicField$n(this, "emitter", new EventEmitter());
+      __publicField$n(this, "name");
+      __publicField$n(this, "item");
+      __publicField$n(this, "_blocked", false);
+      __publicField$n(this, "_container");
+      __publicField$n(this, "_value");
+      __publicField$n(this, "_removeEventsListener");
       this.item = item;
       this.options = Object.assign({}, options);
       this.name = name;
@@ -19877,23 +20357,23 @@ var NgwLeaflet = (function () {
     }
   }
 
-  var __defProp$u = Object.defineProperty;
+  var __defProp$v = Object.defineProperty;
   var __getOwnPropSymbols$n = Object.getOwnPropertySymbols;
   var __hasOwnProp$n = Object.prototype.hasOwnProperty;
   var __propIsEnum$n = 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 __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$n.call(b, prop))
-        __defNormalProp$u(a, prop, 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$u(a, prop, b[prop]);
+          __defNormalProp$v(a, prop, b[prop]);
       }
     return a;
   };
-  var __publicField$l = (obj, key, value) => __defNormalProp$u(obj, key + "" , value);
+  var __publicField$m = (obj, key, value) => __defNormalProp$v(obj, key + "" , value);
   const _CheckProperty = class _CheckProperty extends BaseProperty {
     constructor(name, item, options) {
       super(name, item, __spreadValues$m(__spreadValues$m({}, _CheckProperty.options), options));
@@ -20001,7 +20481,7 @@ var NgwLeaflet = (function () {
       }
     }
   };
-  __publicField$l(_CheckProperty, "options", {
+  __publicField$m(_CheckProperty, "options", {
     hierarchy: true,
     bubble: false,
     propagation: false,
@@ -20010,31 +20490,31 @@ var NgwLeaflet = (function () {
   });
   let CheckProperty = _CheckProperty;
 
-  var __defProp$t = Object.defineProperty;
+  var __defProp$u = 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 __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) => {
     for (var prop in b || (b = {}))
       if (__hasOwnProp$m.call(b, prop))
-        __defNormalProp$t(a, prop, 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$t(a, prop, b[prop]);
+          __defNormalProp$u(a, prop, b[prop]);
       }
     return a;
   };
-  var __publicField$k = (obj, key, value) => __defNormalProp$t(obj, typeof key !== "symbol" ? key + "" : key, value);
+  var __publicField$l = (obj, key, value) => __defNormalProp$u(obj, typeof key !== "symbol" ? key + "" : key, value);
   const BOOLEAN_TYPE = "boolean";
   const STRING_TYPE = "string";
   const _ItemProperties = class _ItemProperties {
     constructor(item, propertiesList) {
       this.item = item;
-      __publicField$k(this, "options", {});
-      __publicField$k(this, "_properties", {});
-      __publicField$k(this, "_propertiesList", []);
+      __publicField$l(this, "options", {});
+      __publicField$l(this, "_properties", {});
+      __publicField$l(this, "_propertiesList", []);
       if (propertiesList) {
         propertiesList.forEach(this._setPropertyHandler.bind(this));
       }
@@ -20097,35 +20577,35 @@ var NgwLeaflet = (function () {
       return Handler;
     }
   };
-  __publicField$k(_ItemProperties, "handlers", {
+  __publicField$l(_ItemProperties, "handlers", {
     CheckProperty
   });
   let ItemProperties = _ItemProperties;
 
-  var __defProp$s = Object.defineProperty;
+  var __defProp$t = 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 __defNormalProp$t = (obj, key, value) => key in obj ? __defProp$t(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$l.call(b, prop))
-        __defNormalProp$s(a, prop, b[prop]);
+        __defNormalProp$t(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]);
+          __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$k = (obj, key, value) => __defNormalProp$t(obj, typeof key !== "symbol" ? key + "" : key, value);
   let ID$1 = 0;
   class Item {
     constructor(options) {
-      __publicField$j(this, "options", {});
-      __publicField$j(this, "properties");
-      __publicField$j(this, "tree");
-      __publicField$j(this, "id", ID$1);
+      __publicField$k(this, "options", {});
+      __publicField$k(this, "properties");
+      __publicField$k(this, "tree");
+      __publicField$k(this, "id", ID$1);
       ID$1 += 1;
       this.options = __spreadValues$k({}, options);
       this.tree = new TreeHelper(this);
@@ -20179,25 +20659,25 @@ var NgwLeaflet = (function () {
     }
   }
 
-  var __defProp$r = Object.defineProperty;
-  var __defProps$d = Object.defineProperties;
-  var __getOwnPropDescs$d = Object.getOwnPropertyDescriptors;
+  var __defProp$s = Object.defineProperty;
+  var __defProps$e = Object.defineProperties;
+  var __getOwnPropDescs$e = 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 __defNormalProp$s = (obj, key, value) => key in obj ? __defProp$s(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$k.call(b, prop))
-        __defNormalProp$r(a, prop, b[prop]);
+        __defNormalProp$s(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]);
+          __defNormalProp$s(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));
   function getNgwWebmapExtent(webmap) {
     const bottom = webmap["extent_bottom"];
     const left = webmap["extent_left"];
@@ -20265,14 +20745,14 @@ var NgwLeaflet = (function () {
       if (resource.cls && resource.cls.indexOf("style") !== -1) {
         return connector.getResource(resource.parent.id, options).then((res) => {
           if (res) {
-            return fetchNgwLayerExtent(__spreadProps$d(__spreadValues$j({}, options), {
+            return fetchNgwLayerExtent(__spreadProps$e(__spreadValues$j({}, options), {
               resourceId: res.resource.id,
               connector
             }));
           }
         });
       } else {
-        return fetchNgwLayerExtent(__spreadProps$d(__spreadValues$j({}, options), {
+        return fetchNgwLayerExtent(__spreadProps$e(__spreadValues$j({}, options), {
           resourceId: resource.id,
           connector
         }));
@@ -20280,9 +20760,9 @@ var NgwLeaflet = (function () {
     }
   }
 
-  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$i = (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$j = (obj, key, value) => __defNormalProp$r(obj, typeof key !== "symbol" ? key + "" : key, value);
   var __async$m = (__this, __arguments, generator) => {
     return new Promise((resolve, reject) => {
       var fulfilled = (value) => {
@@ -20305,9 +20785,9 @@ var NgwLeaflet = (function () {
   };
   class NgwResource {
     constructor() {
-      __publicField$i(this, "item");
-      __publicField$i(this, "connector");
-      __publicField$i(this, "_extent");
+      __publicField$j(this, "item");
+      __publicField$j(this, "connector");
+      __publicField$j(this, "_extent");
     }
     /** @deprecated use {@link NgwResource.getBounds} instead */
     getExtent() {
@@ -20426,23 +20906,23 @@ var NgwLeaflet = (function () {
     };
   }
 
-  var __defProp$p = Object.defineProperty;
+  var __defProp$q = Object.defineProperty;
   var __getOwnPropSymbols$j = Object.getOwnPropertySymbols;
   var __hasOwnProp$j = Object.prototype.hasOwnProperty;
   var __propIsEnum$j = 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 __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$p(a, prop, 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$p(a, prop, b[prop]);
+          __defNormalProp$q(a, prop, b[prop]);
       }
     return a;
   };
-  var __objRest$1 = (source, exclude) => {
+  var __objRest$2 = (source, exclude) => {
     var target = {};
     for (var prop in source)
       if (__hasOwnProp$j.call(source, prop) && exclude.indexOf(prop) < 0)
@@ -20454,7 +20934,7 @@ var NgwLeaflet = (function () {
       }
     return target;
   };
-  var __publicField$h = (obj, key, value) => __defNormalProp$p(obj, typeof key !== "symbol" ? key + "" : key, value);
+  var __publicField$i = (obj, key, value) => __defNormalProp$q(obj, typeof key !== "symbol" ? key + "" : key, value);
   var __async$k = (__this, __arguments, generator) => {
     return new Promise((resolve, reject) => {
       var fulfilled = (value) => {
@@ -20475,11 +20955,11 @@ var NgwLeaflet = (function () {
       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$2(_a, ["webMap", "url"]);
       webMap = webMap_;
       if (url_) {
         url = url_;
@@ -20491,13 +20971,13 @@ var NgwLeaflet = (function () {
       webMap = webMapOrOptions;
     }
     if (!url) {
-      url = URL;
+      url = URL$1;
     }
     class QmsAdapter {
       constructor(map, options) {
-        __publicField$h(this, "qms");
-        __publicField$h(this, "options");
-        __publicField$h(this, "map");
+        __publicField$i(this, "qms");
+        __publicField$i(this, "options");
+        __publicField$i(this, "map");
         this.map = map;
         const opt = __spreadValues$i(__spreadValues$i({}, createOpt), options);
         this.options = opt;
@@ -20551,29 +21031,29 @@ var NgwLeaflet = (function () {
     return QmsAdapter;
   }
 
-  var __defProp$o = Object.defineProperty;
+  var __defProp$p = Object.defineProperty;
   var __getOwnPropSymbols$i = Object.getOwnPropertySymbols;
   var __hasOwnProp$i = Object.prototype.hasOwnProperty;
   var __propIsEnum$i = 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 __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$o(a, prop, 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$o(a, prop, b[prop]);
+          __defNormalProp$p(a, prop, b[prop]);
       }
     return a;
   };
-  var __publicField$g = (obj, key, value) => __defNormalProp$o(obj, typeof key !== "symbol" ? key + "" : key, value);
+  var __publicField$h = (obj, key, value) => __defNormalProp$p(obj, typeof key !== "symbol" ? key + "" : key, value);
   class QmsKit {
     constructor(options) {
-      __publicField$g(this, "options", {
+      __publicField$h(this, "options", {
         url: "https://qms.nextgis.com"
       });
-      __publicField$g(this, "url");
+      __publicField$h(this, "url");
       this.options = __spreadValues$h(__spreadValues$h({}, this.options), options);
       this.url = this.options.url;
     }
@@ -20589,31 +21069,31 @@ var NgwLeaflet = (function () {
       return createQmsAdapter({ webMap, url: this.url });
     }
   }
-  __publicField$g(QmsKit, "utils", {
+  __publicField$h(QmsKit, "utils", {
     createQmsAdapter
   });
 
-  var __defProp$n = Object.defineProperty;
-  var __defProps$c = Object.defineProperties;
-  var __getOwnPropDescs$c = Object.getOwnPropertyDescriptors;
+  var __defProp$o = Object.defineProperty;
+  var __defProps$d = Object.defineProperties;
+  var __getOwnPropDescs$d = Object.getOwnPropertyDescriptors;
   var __getOwnPropSymbols$h = Object.getOwnPropertySymbols;
   var __getProtoOf$2 = Object.getPrototypeOf;
   var __hasOwnProp$h = Object.prototype.hasOwnProperty;
   var __propIsEnum$h = Object.prototype.propertyIsEnumerable;
   var __reflectGet$2 = Reflect.get;
-  var __defNormalProp$n = (obj, key, value) => key in obj ? __defProp$n(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+  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$h.call(b, prop))
-        __defNormalProp$n(a, prop, 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$n(a, prop, b[prop]);
+          __defNormalProp$o(a, prop, b[prop]);
       }
     return a;
   };
-  var __spreadProps$c = (a, b) => __defProps$c(a, __getOwnPropDescs$c(b));
+  var __spreadProps$d = (a, b) => __defProps$d(a, __getOwnPropDescs$d(b));
   var __superGet$2 = (cls, obj, key) => __reflectGet$2(__getProtoOf$2(cls), key, obj);
   var __async$j = (__this, __arguments, generator) => {
     return new Promise((resolve, reject) => {
@@ -20658,7 +21138,7 @@ var NgwLeaflet = (function () {
             class BasemapTileAdapter extends TileAdapter {
               addLayer(opt) {
                 return __async$j(this, null, function* () {
-                  return __superGet$2(BasemapTileAdapter.prototype, this, "addLayer").call(this, __spreadProps$c(__spreadValues$g({}, opt), { url }));
+                  return __superGet$2(BasemapTileAdapter.prototype, this, "addLayer").call(this, __spreadProps$d(__spreadValues$g({}, opt), { url }));
                 });
               }
             }
@@ -20737,25 +21217,25 @@ var NgwLeaflet = (function () {
     return fields;
   }
 
-  var __defProp$m = Object.defineProperty;
-  var __defProps$b = Object.defineProperties;
-  var __getOwnPropDescs$b = Object.getOwnPropertyDescriptors;
+  var __defProp$n = Object.defineProperty;
+  var __defProps$c = Object.defineProperties;
+  var __getOwnPropDescs$c = Object.getOwnPropertyDescriptors;
   var __getOwnPropSymbols$g = Object.getOwnPropertySymbols;
   var __hasOwnProp$g = Object.prototype.hasOwnProperty;
   var __propIsEnum$g = 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 __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$g.call(b, prop))
-        __defNormalProp$m(a, prop, 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$m(a, prop, b[prop]);
+          __defNormalProp$n(a, prop, b[prop]);
       }
     return a;
   };
-  var __spreadProps$b = (a, b) => __defProps$b(a, __getOwnPropDescs$b(b));
+  var __spreadProps$c = (a, b) => __defProps$c(a, __getOwnPropDescs$c(b));
   var __async$i = (__this, __arguments, generator) => {
     return new Promise((resolve, reject) => {
       var fulfilled = (value) => {
@@ -20781,13 +21261,13 @@ var NgwLeaflet = (function () {
       var _a;
       const filters = options.filters;
       if (filters) {
-        let data = yield createFeatureFieldFilterQueries(__spreadProps$b(__spreadValues$f({}, options), {
+        let data = yield createFeatureFieldFilterQueries(__spreadProps$c(__spreadValues$f({}, options), {
           filters
         }));
         const clientFilterValidate = (_a = options.clientFilterValidate) != null ? _a : isFilterWithAnyCase(filters);
         if (clientFilterValidate) {
           data = data.filter((y) => {
-            const fields = prepareNgwFieldsToPropertiesFilter(__spreadProps$b(__spreadValues$f({}, y.fields), {
+            const fields = prepareNgwFieldsToPropertiesFilter(__spreadProps$c(__spreadValues$f({}, y.fields), {
               id: y.id
             }));
             const result = propertiesFilter(fields, filters);
@@ -20875,28 +21355,28 @@ var NgwLeaflet = (function () {
     return filterOptions;
   }
 
-  var __defProp$l = Object.defineProperty;
-  var __defProps$a = Object.defineProperties;
-  var __getOwnPropDescs$a = Object.getOwnPropertyDescriptors;
+  var __defProp$m = Object.defineProperty;
+  var __defProps$b = Object.defineProperties;
+  var __getOwnPropDescs$b = Object.getOwnPropertyDescriptors;
   var __getOwnPropSymbols$f = Object.getOwnPropertySymbols;
   var __getProtoOf$1 = Object.getPrototypeOf;
   var __hasOwnProp$f = Object.prototype.hasOwnProperty;
   var __propIsEnum$f = Object.prototype.propertyIsEnumerable;
   var __reflectGet$1 = 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 __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$f.call(b, prop))
-        __defNormalProp$l(a, prop, 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$l(a, prop, b[prop]);
+          __defNormalProp$m(a, prop, b[prop]);
       }
     return a;
   };
-  var __spreadProps$a = (a, b) => __defProps$a(a, __getOwnPropDescs$a(b));
-  var __publicField$f = (obj, key, value) => __defNormalProp$l(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$m(obj, typeof key !== "symbol" ? key + "" : key, value);
   var __superGet$1 = (cls, obj, key) => __reflectGet$1(__getProtoOf$1(cls), key, obj);
   var __async$g = (__this, __arguments, generator) => {
     return new Promise((resolve, reject) => {
@@ -20969,11 +21449,11 @@ var NgwLeaflet = (function () {
       class NgwGeoJsonAdapter extends GeoJsonAdapter {
         constructor() {
           super(...arguments);
-          __publicField$f(this, "emitter", new EventEmitter());
-          __publicField$f(this, "__onMapMove");
-          __publicField$f(this, "__onMapMoveStart");
-          __publicField$f(this, "__enableMapMoveListener");
-          __publicField$f(this, "__disableMapMoveListener");
+          __publicField$g(this, "emitter", new EventEmitter());
+          __publicField$g(this, "__onMapMove");
+          __publicField$g(this, "__onMapMoveStart");
+          __publicField$g(this, "__enableMapMoveListener");
+          __publicField$g(this, "__disableMapMoveListener");
         }
         addLayer(opt) {
           return __async$g(this, null, function* () {
@@ -21046,10 +21526,10 @@ var NgwLeaflet = (function () {
         getCount() {
           return fetchNgwLayerCount({ connector, resourceId, cache: true });
         }
-        updateLayer(filterArgs) {
+        updateLayer(opt) {
           return __async$g(this, null, function* () {
             var _a2;
-            filterArgs = filterArgs || _lastFilterArgs || {};
+            const filterArgs = opt || _lastFilterArgs || {};
             if ((_a2 = this.options.strategy) == null ? void 0 : _a2.startsWith("BBOX")) {
               yield webMap.onLoad("create");
               filterArgs.options = filterArgs.options || {};
@@ -21074,7 +21554,7 @@ var NgwLeaflet = (function () {
             try {
               this.emitter.emit("preupdate", filterArgs);
               webMap._emitLayerEvent("layer:preupdate", options.id || "", filterArgs);
-              const data = yield getData(filterArgs.filters, __spreadProps$a(__spreadValues$e({}, filterArgs.options), {
+              const data = yield getData(filterArgs.filters, __spreadProps$b(__spreadValues$e({}, filterArgs.options), {
                 srs: this.options.srs
               }));
               let newData = data;
@@ -21127,7 +21607,7 @@ var NgwLeaflet = (function () {
               if (this.clearLayer) {
                 this.clearLayer();
               }
-              const data = yield getData(filters, __spreadProps$a(__spreadValues$e({}, opt), {
+              const data = yield getData(filters, __spreadProps$b(__spreadValues$e({}, opt), {
                 srs: this.options.srs
               }));
               this.setData(data);
@@ -21316,26 +21796,26 @@ var NgwLeaflet = (function () {
     }
   }
 
-  var __defProp$k = Object.defineProperty;
-  var __defProps$9 = Object.defineProperties;
-  var __getOwnPropDescs$9 = Object.getOwnPropertyDescriptors;
+  var __defProp$l = Object.defineProperty;
+  var __defProps$a = Object.defineProperties;
+  var __getOwnPropDescs$a = Object.getOwnPropertyDescriptors;
   var __getOwnPropSymbols$e = Object.getOwnPropertySymbols;
   var __hasOwnProp$e = Object.prototype.hasOwnProperty;
   var __propIsEnum$e = 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 __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$e.call(b, prop))
-        __defNormalProp$k(a, prop, 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$k(a, prop, b[prop]);
+          __defNormalProp$l(a, prop, b[prop]);
       }
     return a;
   };
-  var __spreadProps$9 = (a, b) => __defProps$9(a, __getOwnPropDescs$9(b));
-  var __publicField$e = (obj, key, value) => __defNormalProp$k(obj, typeof key !== "symbol" ? key + "" : key, value);
+  var __spreadProps$a = (a, b) => __defProps$a(a, __getOwnPropDescs$a(b));
+  var __publicField$f = (obj, key, value) => __defNormalProp$l(obj, typeof key !== "symbol" ? key + "" : key, value);
   var __async$e = (__this, __arguments, generator) => {
     return new Promise((resolve, reject) => {
       var fulfilled = (value) => {
@@ -21356,11 +21836,47 @@ var NgwLeaflet = (function () {
       step((generator = generator.apply(__this, __arguments)).next());
     });
   };
+  class Legend {
+    constructor({
+      layerId,
+      legend,
+      onSymbolRenderChange
+    }) {
+      __publicField$f(this, "layerId");
+      __publicField$f(this, "legend");
+      __publicField$f(this, "onSymbolRenderChange");
+      this.layerId = layerId;
+      this.legend = this.createLegend(legend);
+      this.onSymbolRenderChange = onSymbolRenderChange;
+    }
+    createLegend(items) {
+      return items.map((params) => __spreadProps$a(__spreadValues$d({}, params), {
+        /** @deprecated use display_name instead */
+        name: params.display_name,
+        /** @deprecated use icon instead */
+        symbol: params.icon
+      }));
+    }
+    setSymbolRender(symbolIndex, status) {
+      const legendItem = this.legend.find((l) => l.index === symbolIndex);
+      if (legendItem) {
+        const render = legendItem.render;
+        if (render !== status) {
+          legendItem.render = status;
+          if (this.onSymbolRenderChange) {
+            this.onSymbolRenderChange(
+              this.legend.filter((l) => l.render).map((l) => l.index)
+            );
+          }
+        }
+      }
+    }
+  }
   function createRasterAdapter(_0) {
     return __async$e(this, arguments, function* ({
       layerOptions,
-      webMap,
       connector,
+      webMap,
       item
     }) {
       const resourceCls = item.resource.cls;
@@ -21389,16 +21905,17 @@ var NgwLeaflet = (function () {
           constructor(map, _options) {
             super(map, _options);
             this.map = map;
-            // options = {};
-            __publicField$e(this, "item", item);
-            __publicField$e(this, "resourceId", resourceId);
+            __publicField$f(this, "item", item);
+            __publicField$f(this, "resourceId", resourceId);
+            __publicField$f(this, "_blocked", false);
+            __publicField$f(this, "_layerVisibility");
             const opt = ngwApiToAdapterOptions({
               options: layerOptions,
               webMap,
               baseUrl: connector.options.baseUrl || ""
             });
             if (opt) {
-              const layerAdapterOptions = __spreadProps$9(__spreadValues$d(__spreadValues$d({}, opt), layerOptions.adapterOptions), {
+              const layerAdapterOptions = __spreadProps$a(__spreadValues$d(__spreadValues$d({}, opt), layerOptions.adapterOptions), {
                 params: { resource: resourceId },
                 layers: opt.layers || String(resourceId),
                 resourceId
@@ -21412,25 +21929,19 @@ var NgwLeaflet = (function () {
           addLayer(addOptions) {
             return super.addLayer(__spreadValues$d(__spreadValues$d({}, this.options), addOptions));
           }
-          getLegend(options) {
-            return __async$e(this, null, function* () {
-              const ngwLegend = yield connector.get("render.legend_symbols", __spreadValues$d({
-                params: { id: resourceId },
-                cache: true
-              }, options));
-              const id = this.options.id;
-              if (id !== void 0) {
-                const legend = {
-                  layerId: id,
-                  legend: ngwLegend.map(({ display_name, icon }) => ({
-                    name: display_name,
-                    symbol: icon
-                  }))
-                };
-                return [legend];
+          showLayer() {
+            this._layerVisibility = true;
+            if (this.layer) {
+              if (!this._blocked) {
+                webMap.mapAdapter.showLayer(this.layer);
               }
-              return [];
-            });
+            }
+          }
+          hideLayer() {
+            this._layerVisibility = false;
+            if (this.layer) {
+              webMap.mapAdapter.hideLayer(this.layer);
+            }
           }
           getIdentificationIds() {
             return __async$e(this, null, function* () {
@@ -21446,8 +21957,69 @@ var NgwLeaflet = (function () {
               return [];
             });
           }
-          // beforeRemove() {
-          // }
+          getLegend(options) {
+            return __async$e(this, null, function* () {
+              const id = this.options.id;
+              if (id !== void 0) {
+                const ngwLegend = yield connector.get("render.legend_symbols", __spreadValues$d({
+                  params: { id: resourceId },
+                  cache: true
+                }, options));
+                const legend = new Legend({
+                  layerId: id,
+                  legend: ngwLegend,
+                  onSymbolRenderChange: this._setLegendSymbol.bind(this)
+                });
+                return [legend];
+              }
+              return [];
+            });
+          }
+          _hideLayer() {
+            if (this.options.id) {
+              webMap.mapAdapter.hideLayer(this.layer);
+            }
+          }
+          _showLayer() {
+            if (this.options.id) {
+              if (this._layerVisibility) {
+                webMap.showLayer(this.options.id, { silent: true });
+              }
+            }
+          }
+          _setLegendSymbol(renderIndexes) {
+            const intervals = this._consolidateIntervals(renderIndexes);
+            if (!intervals.length) {
+              this._hideLayer();
+              this._blocked = true;
+            } else {
+              this._blocked = false;
+              this._showLayer();
+            }
+            if (this.updateLayer) {
+              this.updateLayer({
+                params: {
+                  [`symbols[${resourceId}]`]: intervals.join(",") || void 0
+                }
+              });
+            }
+          }
+          _consolidateIntervals(symbols) {
+            const sortedSymbols = symbols.slice().sort((a, b) => a - b);
+            const intervals = [];
+            let start = sortedSymbols[0];
+            let end = start;
+            for (let i = 1; i <= sortedSymbols.length; i++) {
+              if (sortedSymbols[i] === end + 1) {
+                end = sortedSymbols[i];
+              } else {
+                intervals.push(start === end ? `${start}` : `${start}-${end}`);
+                start = sortedSymbols[i];
+                end = start;
+              }
+            }
+            return intervals;
+          }
         };
       } else {
         throw new Error(adapter + " not supported yet. Only TILE");
@@ -21455,25 +22027,25 @@ var NgwLeaflet = (function () {
     });
   }
 
-  var __defProp$j = Object.defineProperty;
-  var __defProps$8 = Object.defineProperties;
-  var __getOwnPropDescs$8 = Object.getOwnPropertyDescriptors;
+  var __defProp$k = Object.defineProperty;
+  var __defProps$9 = Object.defineProperties;
+  var __getOwnPropDescs$9 = Object.getOwnPropertyDescriptors;
   var __getOwnPropSymbols$d = Object.getOwnPropertySymbols;
   var __hasOwnProp$d = Object.prototype.hasOwnProperty;
   var __propIsEnum$d = 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 __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$d.call(b, prop))
-        __defNormalProp$j(a, prop, 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$j(a, prop, b[prop]);
+          __defNormalProp$k(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 __async$d = (__this, __arguments, generator) => {
     return new Promise((resolve, reject) => {
       var fulfilled = (value) => {
@@ -21521,7 +22093,7 @@ var NgwLeaflet = (function () {
       const firstStyle = childrenStyles && childrenStyles[0];
       if (firstStyle) {
         return createAsyncAdapter(
-          __spreadProps$8(__spreadValues$c({}, layerOptions), { resource: firstStyle.resource.id }),
+          __spreadProps$9(__spreadValues$c({}, layerOptions), { resource: firstStyle.resource.id }),
           webMap,
           connector
         );
@@ -21544,7 +22116,7 @@ var NgwLeaflet = (function () {
         }
         if (item) {
           const cls = item.resource.cls;
-          const layerOptions = __spreadProps$8(__spreadValues$c({}, options), {
+          const layerOptions = __spreadProps$9(__spreadValues$c({}, options), {
             resource: resourceId
           });
           const adapterOptions = {
@@ -21581,10 +22153,10 @@ var NgwLeaflet = (function () {
                   item.resource.parent.id
                 );
                 if (parentItem) {
-                  const parentOptions = __spreadProps$8(__spreadValues$c({}, options), {
+                  const parentOptions = __spreadProps$9(__spreadValues$c({}, options), {
                     resource: item.resource.parent.id
                   });
-                  adapter = createGeoJsonAdapter(__spreadProps$8(__spreadValues$c({}, adapterOptions), {
+                  adapter = createGeoJsonAdapter(__spreadProps$9(__spreadValues$c({}, adapterOptions), {
                     item: parentItem,
                     layerOptions: parentOptions
                   }));
@@ -21628,31 +22200,46 @@ var NgwLeaflet = (function () {
     });
   }
 
-  var __defProp$i = Object.defineProperty;
+  var __defProp$j = Object.defineProperty;
+  var __defProps$8 = Object.defineProperties;
+  var __getOwnPropDescs$8 = Object.getOwnPropertyDescriptors;
   var __getOwnPropSymbols$c = Object.getOwnPropertySymbols;
   var __hasOwnProp$c = Object.prototype.hasOwnProperty;
   var __propIsEnum$c = 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 __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$c.call(b, prop))
-        __defNormalProp$i(a, prop, 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$i(a, prop, b[prop]);
+          __defNormalProp$j(a, prop, b[prop]);
       }
     return a;
   };
+  var __spreadProps$8 = (a, b) => __defProps$8(a, __getOwnPropDescs$8(b));
+  var __objRest$1 = (source, exclude) => {
+    var target = {};
+    for (var prop in source)
+      if (__hasOwnProp$c.call(source, prop) && exclude.indexOf(prop) < 0)
+        target[prop] = source[prop];
+    if (source != null && __getOwnPropSymbols$c)
+      for (var prop of __getOwnPropSymbols$c(source)) {
+        if (exclude.indexOf(prop) < 0 && __propIsEnum$c.call(source, prop))
+          target[prop] = source[prop];
+      }
+    return target;
+  };
   function updateImageParams(params, resourceId) {
-    const { bbox, width, height, nd } = params;
-    return {
+    const _a = params, { bbox, width, height, nd } = _a, rest = __objRest$1(_a, ["bbox", "width", "height", "nd"]);
+    return __spreadProps$8(__spreadValues$b({}, rest), {
       resource: Array.isArray(resourceId) ? resourceId.join(",") : resourceId,
       extent: bbox,
       size: width + "," + height,
       timestamp: Date.now(),
       nd: nd != null ? nd : 200
-    };
+    });
   }
   const vectorLayerGeomToPaintTypeAlias = {
     POINT: "point",
@@ -21712,26 +22299,26 @@ var NgwLeaflet = (function () {
     return zoom;
   }
 
-  var __defProp$h = Object.defineProperty;
+  var __defProp$i = Object.defineProperty;
   var __defProps$7 = Object.defineProperties;
   var __getOwnPropDescs$7 = Object.getOwnPropertyDescriptors;
   var __getOwnPropSymbols$b = Object.getOwnPropertySymbols;
   var __hasOwnProp$b = Object.prototype.hasOwnProperty;
   var __propIsEnum$b = 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 __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$b.call(b, prop))
-        __defNormalProp$h(a, prop, 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$h(a, prop, b[prop]);
+          __defNormalProp$i(a, prop, b[prop]);
       }
     return a;
   };
   var __spreadProps$7 = (a, b) => __defProps$7(a, __getOwnPropDescs$7(b));
-  var __publicField$d = (obj, key, value) => __defNormalProp$h(obj, typeof key !== "symbol" ? key + "" : key, value);
+  var __publicField$e = (obj, key, value) => __defNormalProp$i(obj, typeof key !== "symbol" ? key + "" : key, value);
   var __async$c = (__this, __arguments, generator) => {
     return new Promise((resolve, reject) => {
       var fulfilled = (value) => {
@@ -21756,11 +22343,11 @@ var NgwLeaflet = (function () {
     constructor(webMap, item, options, connector, parent, noInit) {
       super(__spreadValues$a(__spreadValues$a({}, _NgwWebmapItem.options), options));
       this.webMap = webMap;
-      __publicField$d(this, "item");
-      __publicField$d(this, "connector");
-      __publicField$d(this, "layer");
-      __publicField$d(this, "emitter", new EventEmitter());
-      __publicField$d(this, "_rootDescendantsCount", 0);
+      __publicField$e(this, "item");
+      __publicField$e(this, "connector");
+      __publicField$e(this, "layer");
+      __publicField$e(this, "emitter", new EventEmitter());
+      __publicField$e(this, "_rootDescendantsCount", 0);
       if (connector) {
         this.connector = connector;
       }
@@ -21822,10 +22409,12 @@ var NgwLeaflet = (function () {
             }, options));
             const legend = {
               layerId: id,
-              legend: ngwLegend.map(({ display_name, icon }) => ({
-                name: display_name,
-                symbol: icon
-              }))
+              legend: ngwLegend.map((legend2) => __spreadValues$a({
+                /** @deprecated use display_name instead */
+                name: legend2.display_name,
+                /** @deprecated use icon instead */
+                symbol: legend2.icon
+              }, legend2))
             };
             return [legend];
           }
@@ -21948,8 +22537,8 @@ var NgwLeaflet = (function () {
       return totalValue;
     }
   };
-  __publicField$d(_NgwWebmapItem, "GetAdapterFromLayerType", {});
-  __publicField$d(_NgwWebmapItem, "options", {
+  __publicField$e(_NgwWebmapItem, "GetAdapterFromLayerType", {});
+  __publicField$e(_NgwWebmapItem, "options", {
     properties: [
       {
         type: "boolean",
@@ -21989,23 +22578,23 @@ var NgwLeaflet = (function () {
   });
   let NgwWebmapItem = _NgwWebmapItem;
 
-  var __defProp$g = Object.defineProperty;
+  var __defProp$h = Object.defineProperty;
   var __getOwnPropSymbols$a = Object.getOwnPropertySymbols;
   var __hasOwnProp$a = Object.prototype.hasOwnProperty;
   var __propIsEnum$a = 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 __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$a.call(b, prop))
-        __defNormalProp$g(a, prop, 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$g(a, prop, b[prop]);
+          __defNormalProp$h(a, prop, b[prop]);
       }
     return a;
   };
-  var __publicField$c = (obj, key, value) => __defNormalProp$g(obj, typeof key !== "symbol" ? key + "" : key, value);
+  var __publicField$d = (obj, key, value) => __defNormalProp$h(obj, typeof key !== "symbol" ? key + "" : key, value);
   var __async$b = (__this, __arguments, generator) => {
     return new Promise((resolve, reject) => {
       var fulfilled = (value) => {
@@ -22035,10 +22624,10 @@ var NgwLeaflet = (function () {
     }) {
       class OnFirstShowAdapter {
         constructor() {
-          __publicField$c(this, "options", {});
-          __publicField$c(this, "layer", []);
-          __publicField$c(this, "_removed", false);
-          __publicField$c(this, "_creatingInProgress", false);
+          __publicField$d(this, "options", {});
+          __publicField$d(this, "layer", []);
+          __publicField$d(this, "_removed", false);
+          __publicField$d(this, "_creatingInProgress", false);
         }
         addLayer() {
           return this.layer;
@@ -22166,26 +22755,26 @@ var NgwLeaflet = (function () {
 
   const WEBMAP_BASELAYER_ID_PREFIX = "webmap-baselayer";
 
-  var __defProp$f = Object.defineProperty;
+  var __defProp$g = Object.defineProperty;
   var __defProps$6 = Object.defineProperties;
   var __getOwnPropDescs$6 = Object.getOwnPropertyDescriptors;
   var __getOwnPropSymbols$9 = Object.getOwnPropertySymbols;
   var __hasOwnProp$9 = Object.prototype.hasOwnProperty;
   var __propIsEnum$9 = 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 __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$9.call(b, prop))
-        __defNormalProp$f(a, prop, 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$f(a, prop, b[prop]);
+          __defNormalProp$g(a, prop, b[prop]);
       }
     return a;
   };
   var __spreadProps$6 = (a, b) => __defProps$6(a, __getOwnPropDescs$6(b));
-  var __publicField$b = (obj, key, value) => __defNormalProp$f(obj, typeof key !== "symbol" ? key + "" : key, value);
+  var __publicField$c = (obj, key, value) => __defNormalProp$g(obj, typeof key !== "symbol" ? key + "" : key, value);
   var __async$9 = (__this, __arguments, generator) => {
     return new Promise((resolve, reject) => {
       var fulfilled = (value) => {
@@ -22210,21 +22799,20 @@ var NgwLeaflet = (function () {
     constructor(map, options) {
       this.map = map;
       this.options = options;
-      __publicField$b(this, "layer");
-      __publicField$b(this, "NgwWebmapItem", NgwWebmapItem);
+      __publicField$c(this, "layer");
+      __publicField$c(this, "NgwWebmapItem", NgwWebmapItem);
       /**
        * Radius for searching objects in pixels
        */
-      __publicField$b(this, "pixelRadius", 10);
+      __publicField$c(this, "pixelRadius", 10);
       // webmapSettings.identify_radius,
-      __publicField$b(this, "resourceId");
-      __publicField$b(this, "webmapClassName", "webmap");
-      __publicField$b(this, "emitter", new EventEmitter());
-      __publicField$b(this, "_extent");
-      __publicField$b(this, "response");
-      __publicField$b(this, "_webmapLayersIds");
-      __publicField$b(this, "_webmapBaselayersIds", []);
-      __publicField$b(this, "_lastActiveBaselayer");
+      __publicField$c(this, "resourceId");
+      __publicField$c(this, "webmapClassName", "webmap");
+      __publicField$c(this, "emitter", new EventEmitter());
+      __publicField$c(this, "_extent");
+      __publicField$c(this, "response");
+      __publicField$c(this, "_webmapBaselayersIds", []);
+      __publicField$c(this, "_lastActiveBaselayer");
       const r = options.resourceId;
       if (Array.isArray(r)) {
         this.resourceId = r[0];
@@ -22267,7 +22855,6 @@ var NgwLeaflet = (function () {
       }
       delete this.layer;
       delete this.response;
-      delete this._webmapLayersIds;
     }
     showLayer() {
       return __async$9(this, null, function* () {
@@ -22358,26 +22945,19 @@ var NgwLeaflet = (function () {
     getIdentificationIds(options) {
       return __async$9(this, null, function* () {
         const visibleLayers = [];
-        let ids = this._webmapLayersIds;
-        if (!ids) {
-          ids = yield this._getWebMapIds(options);
-          this._webmapLayersIds = ids;
-        }
-        if (ids && ids.length) {
-          let deps = this.getDependLayers();
-          deps = deps.sort((a, b) => b.id - a.id);
-          deps.forEach((x) => {
-            const item = x.item;
-            const parentId = item.parentId;
-            if (parentId !== void 0 && item.item_type === "layer" && item.layer_identifiable) {
-              const visible = x.properties.property("visibility");
-              const isVisible = visible.get() && !visible.isBlocked();
-              if (isVisible) {
-                visibleLayers.push(parentId);
-              }
+        let deps = this.getDependLayers();
+        deps = deps.sort((a, b) => b.id - a.id);
+        deps.forEach((x) => {
+          const item = x.item;
+          const parentId = item.style_parent_id;
+          if (parentId !== void 0 && item.item_type === "layer" && item.layer_identifiable) {
+            const visible = x.properties.property("visibility");
+            const isVisible = visible.get() && !visible.isBlocked();
+            if (isVisible) {
+              visibleLayers.push(parentId);
             }
-          });
-        }
+          }
+        });
         return visibleLayers;
       });
     }
@@ -22506,50 +23086,25 @@ var NgwLeaflet = (function () {
       }
       return item;
     }
-    _getWebMapIds(options) {
-      return __async$9(this, null, function* () {
-        const webMapItem = this.layer;
-        if (webMapItem && webMapItem.item.item_type === "root") {
-          const layers = webMapItem.tree.getDescendants();
-          const promises = [];
-          for (const x of layers) {
-            const item = x.item;
-            if (item.item_type === "layer") {
-              const id = item.layer_style_id;
-              const promise = this.options.connector.getResource(id, options).then((y) => {
-                if (y) {
-                  const parentId = Number(y.resource.parent.id);
-                  item.parentId = parentId;
-                  return parentId;
-                }
-              });
-              promises.push(promise);
-            }
-          }
-          const ids = yield Promise.all(promises);
-          return ids.filter((x) => x !== void 0);
-        }
-      });
-    }
   }
 
-  var __defProp$e = Object.defineProperty;
+  var __defProp$f = Object.defineProperty;
   var __getOwnPropSymbols$8 = Object.getOwnPropertySymbols;
   var __hasOwnProp$8 = Object.prototype.hasOwnProperty;
   var __propIsEnum$8 = 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 __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$8.call(b, prop))
-        __defNormalProp$e(a, prop, 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$e(a, prop, b[prop]);
+          __defNormalProp$f(a, prop, b[prop]);
       }
     return a;
   };
-  var __publicField$a = (obj, key, value) => __defNormalProp$e(obj, typeof key !== "symbol" ? key + "" : key, value);
+  var __publicField$b = (obj, key, value) => __defNormalProp$f(obj, typeof key !== "symbol" ? key + "" : key, value);
   var __async$8 = (__this, __arguments, generator) => {
     return new Promise((resolve, reject) => {
       var fulfilled = (value) => {
@@ -22573,9 +23128,9 @@ var NgwLeaflet = (function () {
   class NgwKit {
     constructor(options) {
       this.options = options;
-      __publicField$a(this, "url");
-      __publicField$a(this, "connector");
-      __publicField$a(this, "webMap");
+      __publicField$b(this, "url");
+      __publicField$b(this, "connector");
+      __publicField$b(this, "webMap");
       if (this.options.connector) {
         this.url = this.options.connector.options.baseUrl || "";
         this.connector = this.options.connector;
@@ -22585,7 +23140,7 @@ var NgwLeaflet = (function () {
         } else {
           throw new Error("url is not defined");
         }
-        this.connector = new NgwConnector({
+        this.connector = new NgwConnectorExtended({
           baseUrl: this.url,
           auth: this.options.auth
         });
@@ -22636,37 +23191,37 @@ var NgwLeaflet = (function () {
     }
   }
 
-  var __defProp$d = Object.defineProperty;
+  var __defProp$e = Object.defineProperty;
   var __getOwnPropSymbols$7 = Object.getOwnPropertySymbols;
   var __hasOwnProp$7 = Object.prototype.hasOwnProperty;
   var __propIsEnum$7 = 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 __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$7.call(b, prop))
-        __defNormalProp$d(a, prop, 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$d(a, prop, b[prop]);
+          __defNormalProp$e(a, prop, b[prop]);
       }
     return a;
   };
-  var __publicField$9 = (obj, key, value) => __defNormalProp$d(obj, typeof key !== "symbol" ? key + "" : key, value);
+  var __publicField$a = (obj, key, value) => __defNormalProp$e(obj, typeof key !== "symbol" ? key + "" : key, value);
   class IdentifyItem {
     constructor(options) {
-      __publicField$9(this, "id");
-      __publicField$9(this, "label");
-      __publicField$9(this, "layerId");
-      __publicField$9(this, "parent");
-      __publicField$9(this, "fields");
-      __publicField$9(this, "geom");
-      __publicField$9(this, "extensions");
-      __publicField$9(this, "connector");
-      __publicField$9(this, "_item");
-      __publicField$9(this, "_geojson");
-      __publicField$9(this, "_resource");
-      __publicField$9(this, "_extent");
+      __publicField$a(this, "id");
+      __publicField$a(this, "label");
+      __publicField$a(this, "layerId");
+      __publicField$a(this, "parent");
+      __publicField$a(this, "fields");
+      __publicField$a(this, "geom");
+      __publicField$a(this, "extensions");
+      __publicField$a(this, "connector");
+      __publicField$a(this, "_item");
+      __publicField$a(this, "_geojson");
+      __publicField$a(this, "_resource");
+      __publicField$a(this, "_extent");
       const f = options.feature;
       this.id = f.id;
       this.geom = f.geom;
@@ -22752,21 +23307,21 @@ var NgwLeaflet = (function () {
     });
   }
 
-  var __defProp$c = Object.defineProperty;
+  var __defProp$d = Object.defineProperty;
   var __defProps$5 = Object.defineProperties;
   var __getOwnPropDescs$5 = Object.getOwnPropertyDescriptors;
   var __getOwnPropSymbols$6 = Object.getOwnPropertySymbols;
   var __hasOwnProp$6 = Object.prototype.hasOwnProperty;
   var __propIsEnum$6 = 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 __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$6.call(b, prop))
-        __defNormalProp$c(a, prop, 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$c(a, prop, b[prop]);
+          __defNormalProp$d(a, prop, b[prop]);
       }
     return a;
   };
@@ -22970,95 +23525,95 @@ var NgwLeaflet = (function () {
     });
   }
 
-  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);
+  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$8(this, "backspace", 8);
-      __publicField$8(this, "tab", 9);
-      __publicField$8(this, "enter", 13);
-      __publicField$8(this, "shift", 16);
-      __publicField$8(this, "ctrl", 17);
-      __publicField$8(this, "alt", 18);
-      __publicField$8(this, "pause/break", 19);
-      __publicField$8(this, "caps_lock", 20);
-      __publicField$8(this, "escape", 27);
-      __publicField$8(this, "page_up", 33);
-      __publicField$8(this, "page_down", 34);
-      __publicField$8(this, "end", 35);
-      __publicField$8(this, "home", 36);
-      __publicField$8(this, "left_arrow", 37);
-      __publicField$8(this, "up_arrow", 38);
-      __publicField$8(this, "right_arrow", 39);
-      __publicField$8(this, "down_arrow", 40);
-      __publicField$8(this, "insert", 45);
-      __publicField$8(this, "delete", 46);
-      __publicField$8(this, "left_window_key", 91);
-      __publicField$8(this, "right_window_key", 92);
-      __publicField$8(this, "select_key", 93);
-      __publicField$8(this, "numpad_0", 96);
-      __publicField$8(this, "numpad_1", 97);
-      __publicField$8(this, "numpad_2", 98);
-      __publicField$8(this, "numpad_3", 99);
-      __publicField$8(this, "numpad_4", 100);
-      __publicField$8(this, "numpad_5", 101);
-      __publicField$8(this, "numpad_6", 102);
-      __publicField$8(this, "numpad_7", 103);
-      __publicField$8(this, "numpad_8", 104);
-      __publicField$8(this, "numpad_9", 105);
-      __publicField$8(this, "multiply", 106);
-      __publicField$8(this, "add", 107);
-      __publicField$8(this, "subtract", 109);
-      __publicField$8(this, "decimal_point", 110);
-      __publicField$8(this, "divide", 111);
-      __publicField$8(this, "f1", 112);
-      __publicField$8(this, "f2", 113);
-      __publicField$8(this, "f3", 114);
-      __publicField$8(this, "f4", 115);
-      __publicField$8(this, "f5", 116);
-      __publicField$8(this, "f6", 117);
-      __publicField$8(this, "f7", 118);
-      __publicField$8(this, "f8", 119);
-      __publicField$8(this, "f9", 120);
-      __publicField$8(this, "f10", 121);
-      __publicField$8(this, "f11", 122);
-      __publicField$8(this, "f12", 123);
-      __publicField$8(this, "num_lock", 144);
-      __publicField$8(this, "scroll_lock", 145);
-      __publicField$8(this, "semi-colon", 186);
-      __publicField$8(this, "equal_sign", 187);
-      __publicField$8(this, ",", 188);
+      __publicField$9(this, "backspace", 8);
+      __publicField$9(this, "tab", 9);
+      __publicField$9(this, "enter", 13);
+      __publicField$9(this, "shift", 16);
+      __publicField$9(this, "ctrl", 17);
+      __publicField$9(this, "alt", 18);
+      __publicField$9(this, "pause/break", 19);
+      __publicField$9(this, "caps_lock", 20);
+      __publicField$9(this, "escape", 27);
+      __publicField$9(this, "page_up", 33);
+      __publicField$9(this, "page_down", 34);
+      __publicField$9(this, "end", 35);
+      __publicField$9(this, "home", 36);
+      __publicField$9(this, "left_arrow", 37);
+      __publicField$9(this, "up_arrow", 38);
+      __publicField$9(this, "right_arrow", 39);
+      __publicField$9(this, "down_arrow", 40);
+      __publicField$9(this, "insert", 45);
+      __publicField$9(this, "delete", 46);
+      __publicField$9(this, "left_window_key", 91);
+      __publicField$9(this, "right_window_key", 92);
+      __publicField$9(this, "select_key", 93);
+      __publicField$9(this, "numpad_0", 96);
+      __publicField$9(this, "numpad_1", 97);
+      __publicField$9(this, "numpad_2", 98);
+      __publicField$9(this, "numpad_3", 99);
+      __publicField$9(this, "numpad_4", 100);
+      __publicField$9(this, "numpad_5", 101);
+      __publicField$9(this, "numpad_6", 102);
+      __publicField$9(this, "numpad_7", 103);
+      __publicField$9(this, "numpad_8", 104);
+      __publicField$9(this, "numpad_9", 105);
+      __publicField$9(this, "multiply", 106);
+      __publicField$9(this, "add", 107);
+      __publicField$9(this, "subtract", 109);
+      __publicField$9(this, "decimal_point", 110);
+      __publicField$9(this, "divide", 111);
+      __publicField$9(this, "f1", 112);
+      __publicField$9(this, "f2", 113);
+      __publicField$9(this, "f3", 114);
+      __publicField$9(this, "f4", 115);
+      __publicField$9(this, "f5", 116);
+      __publicField$9(this, "f6", 117);
+      __publicField$9(this, "f7", 118);
+      __publicField$9(this, "f8", 119);
+      __publicField$9(this, "f9", 120);
+      __publicField$9(this, "f10", 121);
+      __publicField$9(this, "f11", 122);
+      __publicField$9(this, "f12", 123);
+      __publicField$9(this, "num_lock", 144);
+      __publicField$9(this, "scroll_lock", 145);
+      __publicField$9(this, "semi-colon", 186);
+      __publicField$9(this, "equal_sign", 187);
+      __publicField$9(this, ",", 188);
       // "comma";
-      __publicField$8(this, "-", 189);
+      __publicField$9(this, "-", 189);
       // "dash";
-      __publicField$8(this, ".", 190);
+      __publicField$9(this, ".", 190);
       // "period";
-      __publicField$8(this, "/", 191);
+      __publicField$9(this, "/", 191);
       // "forward slash";
-      __publicField$8(this, "`", 192);
+      __publicField$9(this, "`", 192);
       // "grave accent";
-      __publicField$8(this, "[", 219);
+      __publicField$9(this, "[", 219);
       // "open bracket";
-      __publicField$8(this, "\\", 220);
+      __publicField$9(this, "\\", 220);
       // "back slash";
-      __publicField$8(this, "]", 221);
+      __publicField$9(this, "]", 221);
       // "close braket";
-      __publicField$8(this, "'", 222);
+      __publicField$9(this, "'", 222);
     }
     // "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$7 = (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$7(this, "keyCodeAlias", new KeyCodes());
-      __publicField$7(this, "keys", {});
-      __publicField$7(this, "_windowOnFocus");
-      __publicField$7(this, "_keysPressed");
-      __publicField$7(this, "_keysReleased");
+      __publicField$8(this, "keyCodeAlias", new KeyCodes());
+      __publicField$8(this, "keys", {});
+      __publicField$8(this, "_windowOnFocus");
+      __publicField$8(this, "_keysPressed");
+      __publicField$8(this, "_keysReleased");
       this._windowOnFocus = this.windowOnFocus.bind(this);
       this._keysPressed = this.keysPressed.bind(this);
       this._keysReleased = this.keysReleased.bind(this);
@@ -23097,15 +23652,15 @@ var NgwLeaflet = (function () {
     }
   }
 
-  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);
+  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;
-      __publicField$6(this, "name");
-      __publicField$6(this, "event");
-      __publicField$6(this, "value");
+      __publicField$7(this, "name");
+      __publicField$7(this, "event");
+      __publicField$7(this, "value");
       if (opt) {
         if (opt.value) {
           this.setValue(opt.value);
@@ -23114,7 +23669,11 @@ var NgwLeaflet = (function () {
           this.name = opt.name;
         }
         if (opt.event) {
-          this.event = opt.event;
+          if (typeof opt.event === "string") {
+            this.event = [opt.event];
+          } else {
+            this.event = opt.event;
+          }
         }
       }
     }
@@ -23126,6 +23685,34 @@ var NgwLeaflet = (function () {
     }
   }
 
+  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);
+      __publicField$6(this, "name", "bounds");
+      __publicField$6(this, "event", ["moveend"]);
+    }
+    getValue() {
+      return this.webMap.getBounds();
+    }
+    setValue(bounds) {
+      this.webMap.setView({ bounds });
+    }
+    toString() {
+      const data = this.getValue();
+      if (data) {
+        return data.slice(0, 4).map((x) => x.toFixed(5)).join("_");
+      }
+      return void 0;
+    }
+    parse(str) {
+      const lngLat = str.split("_").map(Number);
+      return lngLat;
+    }
+  }
+
   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);
@@ -23133,7 +23720,7 @@ var NgwLeaflet = (function () {
     constructor() {
       super(...arguments);
       __publicField$5(this, "name", "center");
-      __publicField$5(this, "event", "moveend");
+      __publicField$5(this, "event", ["moveend"]);
     }
     getValue() {
       return this.webMap.getCenter();
@@ -23141,9 +23728,13 @@ var NgwLeaflet = (function () {
     setValue(val) {
       this.webMap.setCenter(val);
     }
-    toString(data) {
-      const d = data.map((x) => x.toFixed(5));
-      return d[0] + "_" + d[1];
+    toString() {
+      const data = this.getValue();
+      if (data) {
+        const d = data.map((x) => x.toFixed(5));
+        return d[0] + "_" + d[1];
+      }
+      return "";
     }
     parse(str) {
       const lngLat = str.split("_").map(Number);
@@ -23158,7 +23749,7 @@ var NgwLeaflet = (function () {
     constructor() {
       super(...arguments);
       __publicField$4(this, "name", "zoom");
-      __publicField$4(this, "event", "zoomend");
+      __publicField$4(this, "event", ["zoomend"]);
     }
     getValue() {
       const zoom = this.webMap.getZoom();
@@ -23167,8 +23758,8 @@ var NgwLeaflet = (function () {
     setValue(val) {
       this.webMap.setZoom(val);
     }
-    toString(val) {
-      return String(val);
+    toString() {
+      return String(this.getValue());
     }
     parse(str) {
       return Number(str);
@@ -23237,14 +23828,14 @@ var NgwLeaflet = (function () {
       __publicField$3(this, "mapAdapter");
       __publicField$3(this, "runtimeParams", []);
       __publicField$3(this, "getPaintFunctions", _WebMapMain.getPaintFunctions);
-      __publicField$3(this, "mapState", [CenterState, ZoomState]);
+      __publicField$3(this, "mapStateItems", [CenterState, ZoomState, BoundState]);
       __publicField$3(this, "id", ID++);
       /**
        * From runtime params
        */
+      __publicField$3(this, "mapState", []);
       __publicField$3(this, "_initMapState", {});
       __publicField$3(this, "_starterKits");
-      __publicField$3(this, "_mapState", []);
       __publicField$3(this, "_extent");
       __publicField$3(this, "_eventsStatus", {});
       __publicField$3(this, "_coordFromMapClickAbort");
@@ -23279,7 +23870,7 @@ var NgwLeaflet = (function () {
     create() {
       return __async$5(this, null, function* () {
         if (!this.getEventStatus("create")) {
-          yield this._setInitMapState(this.mapState);
+          yield this._setInitMapState(this.mapStateItems);
           yield this._setupMap();
           this._emitStatusEvent("create", this);
         }
@@ -23299,16 +23890,22 @@ var NgwLeaflet = (function () {
         this.mapAdapter.destroy();
       }
     }
-    getState() {
+    mapStateWithFunc(func) {
       const state = {};
-      this._mapState.forEach((x) => {
-        state[x.name] = x.getValue();
+      this.mapState.forEach((x) => {
+        state[x.name] = func(x);
       });
       return state;
     }
+    getStateAsString() {
+      return this.mapStateWithFunc((x) => x.toString());
+    }
+    getState() {
+      return this.mapStateWithFunc((x) => x.getValue());
+    }
     getRuntimeParams() {
       const state = {};
-      this._mapState.forEach((x) => {
+      this.mapState.forEach((x) => {
         for (const r of this.runtimeParams) {
           const val = r.get(x.name);
           if (val !== void 0) {
@@ -23650,7 +24247,7 @@ var NgwLeaflet = (function () {
     _setInitMapState(states) {
       for (const X of states) {
         const state = new X(this);
-        this._mapState.push(state);
+        this.mapState.push(state);
         for (const r of this.runtimeParams) {
           const str = r.get(state.name);
           if (str !== void 0) {
@@ -23686,13 +24283,15 @@ var NgwLeaflet = (function () {
       events.forEach((x) => {
         this._mapEvents[x] = (data) => {
           if (this.runtimeParams.length) {
-            const mapStatusEvent = this._mapState.find((y) => y.event === x);
-            if (mapStatusEvent) {
-              const value = mapStatusEvent.toString(mapStatusEvent.getValue());
+            const mapStatusEvents = this.mapState.filter(
+              (y) => y.event.includes(x)
+            );
+            mapStatusEvents.forEach((mapStatusEvent) => {
+              const value = mapStatusEvent.toString();
               this.runtimeParams.forEach((r) => {
                 r.set(mapStatusEvent.name, value);
               });
-            }
+            });
           }
           if (this._eventsStatus) {
             this.emitter.emit(x, data);
@@ -24268,11 +24867,11 @@ var NgwLeaflet = (function () {
       }
       return Promise.resolve();
     }
-    updateLayer(layerDef) {
+    updateLayer(layerDef, options) {
       const layer = this.getLayer(layerDef);
       if (layer) {
         if (layer.updateLayer) {
-          return Promise.resolve(layer.updateLayer());
+          return Promise.resolve(layer.updateLayer(options));
         } else if (this.isLayerVisible(layer)) {
           return this.hideLayer(layer, { silent: true }).then(() => {
             return this.showLayer(layer, { silent: true });
@@ -25162,7 +25761,7 @@ var NgwLeaflet = (function () {
       });
     }
     if (!options.connector) {
-      options.connector = new NgwConnector({
+      options.connector = new NgwConnectorExtended({
         baseUrl: options.baseUrl || "",
         auth: options.auth,
         withCredentials: options.withCredentials
@@ -25436,7 +26035,7 @@ var NgwLeaflet = (function () {
           if (mem.layer.getDependLayers) {
             const dependLayers = mem.layer.getDependLayers();
             const dependFit = dependLayers.find((x) => {
-              return x.item && x.item.parentId === id;
+              return x.item && x.item.style_parent_id === id;
             });
             if (dependFit) {
               return dependFit.layer;