npm - @nextgis/ngw-leaflet - Versions diffs - 4.1.0 → 4.1.1 - Mend

@nextgis/ngw-leaflet 4.1.0 → 4.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (10) hide show

package/lib/ngw-leaflet.esm-browser.js +987 -766
package/lib/ngw-leaflet.esm-browser.js.map +1 -1
package/lib/ngw-leaflet.esm-browser.prod.js +1 -1
package/lib/ngw-leaflet.esm-browser.prod.js.map +1 -1
package/lib/ngw-leaflet.esm-bundler.js +1 -1
package/lib/ngw-leaflet.global.js +987 -766
package/lib/ngw-leaflet.global.js.map +1 -1
package/lib/ngw-leaflet.global.prod.js +1 -1
package/lib/ngw-leaflet.global.prod.js.map +1 -1
package/package.json +4 -4

package/lib/ngw-leaflet.esm-browser.js CHANGED Viewed

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/ngw-leaflet; version: 4.1.0; author: NextGIS */
+/** Bundle of @nextgis/ngw-leaflet; version: 4.1.1; author: NextGIS */
 function getElement(el) {
   if (typeof el === "string") {
     let el_ = document.getElementById(el);
@@ -13,29 +13,29 @@ function getElement(el) {
   return el;
 }
-var __defProp$1b = Object.defineProperty;
-var __defProps$v = Object.defineProperties;
-var __getOwnPropDescs$v = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$O = Object.getOwnPropertySymbols;
-var __hasOwnProp$O = Object.prototype.hasOwnProperty;
-var __propIsEnum$O = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$1b = (obj, key, value) => key in obj ? __defProp$1b(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$N = (a, b) => {
+var __defProp$1c = Object.defineProperty;
+var __defProps$x = Object.defineProperties;
+var __getOwnPropDescs$x = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$S = Object.getOwnPropertySymbols;
+var __hasOwnProp$S = Object.prototype.hasOwnProperty;
+var __propIsEnum$S = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$1c = (obj, key, value) => key in obj ? __defProp$1c(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$O.call(b, prop))
-      __defNormalProp$1b(a, prop, b[prop]);
-  if (__getOwnPropSymbols$O)
-    for (var prop of __getOwnPropSymbols$O(b)) {
-      if (__propIsEnum$O.call(b, prop))
-        __defNormalProp$1b(a, prop, b[prop]);
+    if (__hasOwnProp$S.call(b, prop))
+      __defNormalProp$1c(a, prop, b[prop]);
+  if (__getOwnPropSymbols$S)
+    for (var prop of __getOwnPropSymbols$S(b)) {
+      if (__propIsEnum$S.call(b, prop))
+        __defNormalProp$1c(a, prop, b[prop]);
     }
   return a;
 };
-var __spreadProps$v = (a, b) => __defProps$v(a, __getOwnPropDescs$v(b));
+var __spreadProps$x = (a, b) => __defProps$x(a, __getOwnPropDescs$x(b));
 const controlOptions = /* @__PURE__ */ new WeakMap();
 function resolveControlOptions(options = {}) {
   var _a;
-  return __spreadProps$v(__spreadValues$N({}, options), {
+  return __spreadProps$x(__spreadValues$R({}, options), {
     margin: (_a = options.margin) != null ? _a : options.bar
   });
 }
@@ -76,25 +76,25 @@ function styleInject(css, ref) {
 var css_248z$4 = ".webmap-ctrl-bottom-left,.webmap-ctrl-bottom-right,.webmap-ctrl-left,.webmap-ctrl-right,.webmap-ctrl-top-left,.webmap-ctrl-top-right{position:absolute;pointer-events:none;z-index:9999}.webmap-ctrl-left,.webmap-ctrl-right{height:100%}.webmap-ctrl-left{padding-right:0}.webmap-ctrl-right{padding-left:0}.webmap-ctrl-top-left{top:0;left:0}.webmap-ctrl-top-right{top:0;right:0}.webmap-ctrl-bottom-left{bottom:0;left:0}.webmap-ctrl-bottom-right{right:0;bottom:0}.webmap-ctrl,.webmap-ctrl-wrapper{clear:both;pointer-events:auto;transform:translate(0)}.webmap-ctrl-top-left>.webmap-ctrl,.webmap-ctrl-top-left>.webmap-ctrl-wrapper{float:left}.webmap-ctrl-top-right>.webmap-ctrl,.webmap-ctrl-top-right>.webmap-ctrl-wrapper{float:right}.webmap-ctrl-bottom-left>.webmap-ctrl,.webmap-ctrl-bottom-left>.webmap-ctrl-wrapper{float:left}.webmap-ctrl-bottom-right>.webmap-ctrl,.webmap-ctrl-bottom-right>.webmap-ctrl-wrapper{float:right}.webmap-ctrl-top-left>.webmap-ctrl-margin{margin:10px 0 0 10px}.webmap-ctrl-top-right>.webmap-ctrl-margin{margin:10px 10px 0 0}.webmap-ctrl-bottom-left>.webmap-ctrl-margin{margin:0 0 10px 10px}.webmap-ctrl-bottom-right>.webmap-ctrl-margin{margin:0 10px 10px 0}.webmap-ctrl-group{border-radius:4px;background:#fff}.webmap-ctrl .webmap-ctrl-wrapper{clear:none;float:none;margin:0}.webmap-ctrl .webmap-ctrl-wrapper>.webmap-ctrl,.webmap-ctrl>.webmap-ctrl{clear:none;float:none;margin:0!important}.webmap-ctrl-horizontal,.webmap-ctrl-vertical{display:flex}.webmap-ctrl-vertical{flex-direction:column;align-items:var(--webmap-ctrl-align,flex-start)}.webmap-ctrl-horizontal{flex-direction:row;align-items:var(--webmap-ctrl-align,stretch)}.webmap-ctrl:not(.webmap-ctrl-group).webmap-ctrl-horizontal,.webmap-ctrl:not(.webmap-ctrl-group).webmap-ctrl-vertical{gap:var(--webmap-ctrl-gap,0)}.webmap-ctrl-gapless:not(.webmap-ctrl-group){border:2px solid rgba(0,0,0,.1);border-radius:4px;box-sizing:border-box;background:#fff;overflow:hidden}.webmap-ctrl-gapless:not(.webmap-ctrl-group):not(:empty){box-shadow:none}.webmap-ctrl-gapless>.webmap-ctrl-group,.webmap-ctrl-gapless>.webmap-ctrl-wrapper>.webmap-ctrl-group{border-radius:0;border:0!important;box-shadow:none!important}.webmap-ctrl-gapless>.leaflet-bar,.webmap-ctrl-gapless>.maplibregl-ctrl-group,.webmap-ctrl-gapless>.ol-control,.webmap-ctrl-gapless>.webmap-ctrl,.webmap-ctrl-gapless>.webmap-ctrl-wrapper>.leaflet-bar,.webmap-ctrl-gapless>.webmap-ctrl-wrapper>.maplibregl-ctrl-group,.webmap-ctrl-gapless>.webmap-ctrl-wrapper>.ol-control,.webmap-ctrl-gapless>.webmap-ctrl-wrapper>.webmap-ctrl{border:0!important;box-shadow:none!important}.webmap-ctrl-gapless.webmap-ctrl-horizontal>.webmap-ctrl-group:first-child,.webmap-ctrl-gapless.webmap-ctrl-horizontal>.webmap-ctrl-wrapper:first-child>.webmap-ctrl-group{border-radius:4px 0 0 4px}.webmap-ctrl-gapless.webmap-ctrl-horizontal>.webmap-ctrl-group:last-child,.webmap-ctrl-gapless.webmap-ctrl-horizontal>.webmap-ctrl-wrapper:last-child>.webmap-ctrl-group{border-radius:0 4px 4px 0}.webmap-ctrl-gapless.webmap-ctrl-vertical>.webmap-ctrl-group:first-child,.webmap-ctrl-gapless.webmap-ctrl-vertical>.webmap-ctrl-wrapper:first-child>.webmap-ctrl-group{border-radius:4px 4px 0 0}.webmap-ctrl-gapless.webmap-ctrl-vertical>.webmap-ctrl-group:last-child,.webmap-ctrl-gapless.webmap-ctrl-vertical>.webmap-ctrl-wrapper:last-child>.webmap-ctrl-group{border-radius:0 0 4px 4px}.webmap-ctrl-gapless>.webmap-ctrl-group:only-child,.webmap-ctrl-gapless>.webmap-ctrl-wrapper:only-child>.webmap-ctrl-group{border-radius:4px}.webmap-ctrl-horizontal>.webmap-ctrl-wrapper,.webmap-ctrl-vertical>.webmap-ctrl-wrapper{display:flex}.webmap-ctrl-group:not(:empty){box-shadow:0 0 0 2px rgba(0,0,0,.1)}@media (-ms-high-contrast:active){.webmap-ctrl-group:not(:empty){box-shadow:0 0 0 2px ButtonText}.webmap-ctrl-gapless:not(.webmap-ctrl-group){border-color:ButtonText}}.webmap-ctrl-gapless>.webmap-ctrl-group:not(:empty),.webmap-ctrl-gapless>.webmap-ctrl-wrapper>.webmap-ctrl-group:not(:empty){border:0!important;box-shadow:none!important}.webmap-ctrl-group button{width:29px;height:29px;display:block;padding:0;outline:none;border:0;box-sizing:border-box;background-color:transparent;cursor:pointer}.webmap-ctrl-button{line-height:inherit!important;font-weight:400!important}.webmap-ctrl-group button+button{border-top:1px solid #ddd}.webmap-ctrl-group.webmap-ctrl-horizontal>button+button{border-top:0;border-left:1px solid #ddd}.webmap-ctrl-gapless .webmap-ctrl-group button+button,.webmap-ctrl-group.webmap-ctrl-gapless button+button{border-top:0!important;border-left:0!important}.webmap-ctrl-gapless .webmap-ctrl-group button{border:0!important;border-radius:0!important;box-shadow:none!important}.webmap-ctrl button .webmap-ctrl-icon{display:block;width:100%;height:100%;background-repeat:no-repeat;background-position:50%}@media (-ms-high-contrast:active){.webmap-ctrl-icon{background-color:transparent}.webmap-ctrl-group button+button{border-top:1px solid ButtonText}}.webmap-ctrl button::-moz-focus-inner{border:0;padding:0}.webmap-ctrl-group button:focus{box-shadow:0 0 2px 2px #0096ff}.webmap-ctrl button:disabled{cursor:not-allowed}.webmap-ctrl button:disabled .webmap-ctrl-icon{opacity:.25}.webmap-ctrl button:not(:disabled):hover{background-color:rgba(0,0,0,.05)}.webmap-ctrl-group button:focus:focus-visible{box-shadow:0 0 2px 2px #0096ff}.webmap-ctrl-group button:focus:not(:focus-visible){box-shadow:none}.webmap-ctrl-group button:focus:first-child{border-radius:4px 4px 0 0}.webmap-ctrl-group button:focus:last-child{border-radius:0 0 4px 4px}.webmap-ctrl-group button:focus:only-child{border-radius:inherit}.webmap-ctrl button.webmap-ctrl-zoom-out .webmap-ctrl-icon{background-image:url(\"data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2229%22%20height%3D%2229%22%20viewBox%3D%220%200%2029%2029%22%3E%3Cpath%20d%3D%22M10%2013c-.75%200-1.5.75-1.5%201.5S9.25%2016%2010%2016h9c.75%200%201.5-.75%201.5-1.5S19.75%2013%2019%2013z%22%2F%3E%3C%2Fsvg%3E\")}.webmap-ctrl button.webmap-ctrl-zoom-in .webmap-ctrl-icon{background-image:url(\"data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2229%22%20height%3D%2229%22%20viewBox%3D%220%200%2029%2029%22%3E%3Cpath%20d%3D%22M14.5%208.5c-.75%200-1.5.75-1.5%201.5v3h-3c-.75%200-1.5.75-1.5%201.5S9.25%2016%2010%2016h3v3c0%20.75.75%201.5%201.5%201.5S16%2019.75%2016%2019v-3h3c.75%200%201.5-.75%201.5-1.5S19.75%2013%2019%2013h-3v-3c0-.75-.75-1.5-1.5-1.5%22%2F%3E%3C%2Fsvg%3E\")}@media (-ms-high-contrast:active){.webmap-ctrl button.webmap-ctrl-zoom-out .webmap-ctrl-icon{background-image:url(\"data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2229%22%20height%3D%2229%22%20viewBox%3D%220%200%2029%2029%22%3E%3Cpath%20d%3D%22M10%2013c-.75%200-1.5.75-1.5%201.5S9.25%2016%2010%2016h9c.75%200%201.5-.75%201.5-1.5S19.75%2013%2019%2013z%22%2F%3E%3C%2Fsvg%3E\")}.webmap-ctrl button.webmap-ctrl-zoom-in .webmap-ctrl-icon{background-image:url(\"data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2229%22%20height%3D%2229%22%20viewBox%3D%220%200%2029%2029%22%3E%3Cpath%20d%3D%22M14.5%208.5c-.75%200-1.5.75-1.5%201.5v3h-3c-.75%200-1.5.75-1.5%201.5S9.25%2016%2010%2016h3v3c0%20.75.75%201.5%201.5%201.5S16%2019.75%2016%2019v-3h3c.75%200%201.5-.75%201.5-1.5S19.75%2013%2019%2013h-3v-3c0-.75-.75-1.5-1.5-1.5%22%2F%3E%3C%2Fsvg%3E\")}}@media (-ms-high-contrast:black-on-white){.webmap-ctrl button.webmap-ctrl-zoom-out .webmap-ctrl-icon{background-image:url(\"data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2229%22%20height%3D%2229%22%20viewBox%3D%220%200%2029%2029%22%3E%3Cpath%20d%3D%22M10%2013c-.75%200-1.5.75-1.5%201.5S9.25%2016%2010%2016h9c.75%200%201.5-.75%201.5-1.5S19.75%2013%2019%2013z%22%2F%3E%3C%2Fsvg%3E\")}.webmap-ctrl button.webmap-ctrl-zoom-in .webmap-ctrl-icon{background-image:url(\"data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2229%22%20height%3D%2229%22%20viewBox%3D%220%200%2029%2029%22%3E%3Cpath%20d%3D%22M14.5%208.5c-.75%200-1.5.75-1.5%201.5v3h-3c-.75%200-1.5.75-1.5%201.5S9.25%2016%2010%2016h3v3c0%20.75.75%201.5%201.5%201.5S16%2019.75%2016%2019v-3h3c.75%200%201.5-.75%201.5-1.5S19.75%2013%2019%2013h-3v-3c0-.75-.75-1.5-1.5-1.5%22%2F%3E%3C%2Fsvg%3E\")}}";
 styleInject(css_248z$4);
-var __defProp$1a = Object.defineProperty;
-var __defNormalProp$1a = (obj, key, value) => key in obj ? __defProp$1a(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField$N = (obj, key, value) => __defNormalProp$1a(obj, typeof key !== "symbol" ? key + "" : key, value);
+var __defProp$1b = Object.defineProperty;
+var __defNormalProp$1b = (obj, key, value) => key in obj ? __defProp$1b(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField$K = (obj, key, value) => __defNormalProp$1b(obj, typeof key !== "symbol" ? key + "" : key, value);
 class ControlContainer {
   constructor(opt = {}) {
-    __publicField$N(this, "classPrefix", "webmap");
-    __publicField$N(this, "addClass");
-    __publicField$N(this, "map");
-    __publicField$N(this, "wrapperClass");
-    __publicField$N(this, "ownsContainer");
-    __publicField$N(this, "_container");
-    __publicField$N(this, "_positionsContainers");
-    __publicField$N(this, "_targets", /* @__PURE__ */ new Set());
-    __publicField$N(this, "_idContainers", /* @__PURE__ */ new Map());
-    __publicField$N(this, "_pendingChildren", /* @__PURE__ */ new Map());
-    __publicField$N(this, "_orders", /* @__PURE__ */ new WeakMap());
-    __publicField$N(this, "_targetOptions", /* @__PURE__ */ new WeakMap());
-    __publicField$N(this, "_switchGroups", /* @__PURE__ */ new WeakMap());
-    __publicField$N(this, "_switchBindings", /* @__PURE__ */ new WeakMap());
+    __publicField$K(this, "classPrefix", "webmap");
+    __publicField$K(this, "addClass");
+    __publicField$K(this, "map");
+    __publicField$K(this, "wrapperClass");
+    __publicField$K(this, "ownsContainer");
+    __publicField$K(this, "_container");
+    __publicField$K(this, "_positionsContainers");
+    __publicField$K(this, "_targets", /* @__PURE__ */ new Set());
+    __publicField$K(this, "_idContainers", /* @__PURE__ */ new Map());
+    __publicField$K(this, "_pendingChildren", /* @__PURE__ */ new Map());
+    __publicField$K(this, "_orders", /* @__PURE__ */ new WeakMap());
+    __publicField$K(this, "_targetOptions", /* @__PURE__ */ new WeakMap());
+    __publicField$K(this, "_switchGroups", /* @__PURE__ */ new WeakMap());
+    __publicField$K(this, "_switchBindings", /* @__PURE__ */ new WeakMap());
     this.classPrefix = opt.classPrefix || this.classPrefix;
     this.addClass = opt.addClass;
     this.map = opt.map;
@@ -14700,25 +14700,25 @@ function requireLeafletSrc () {
 var leafletSrcExports = requireLeafletSrc();
-var __defProp$19 = Object.defineProperty;
-var __defProps$u = Object.defineProperties;
-var __getOwnPropDescs$u = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$N = Object.getOwnPropertySymbols;
-var __hasOwnProp$N = Object.prototype.hasOwnProperty;
-var __propIsEnum$N = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$19 = (obj, key, value) => key in obj ? __defProp$19(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$M = (a, b) => {
+var __defProp$1a = Object.defineProperty;
+var __defProps$w = Object.defineProperties;
+var __getOwnPropDescs$w = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$R = Object.getOwnPropertySymbols;
+var __hasOwnProp$R = Object.prototype.hasOwnProperty;
+var __propIsEnum$R = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$1a = (obj, key, value) => key in obj ? __defProp$1a(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$N.call(b, prop))
-      __defNormalProp$19(a, prop, b[prop]);
-  if (__getOwnPropSymbols$N)
-    for (var prop of __getOwnPropSymbols$N(b)) {
-      if (__propIsEnum$N.call(b, prop))
-        __defNormalProp$19(a, prop, b[prop]);
+    if (__hasOwnProp$R.call(b, prop))
+      __defNormalProp$1a(a, prop, b[prop]);
+  if (__getOwnPropSymbols$R)
+    for (var prop of __getOwnPropSymbols$R(b)) {
+      if (__propIsEnum$R.call(b, prop))
+        __defNormalProp$1a(a, prop, b[prop]);
     }
   return a;
 };
-var __spreadProps$u = (a, b) => __defProps$u(a, __getOwnPropDescs$u(b));
+var __spreadProps$w = (a, b) => __defProps$w(a, __getOwnPropDescs$w(b));
 function createControl(control, options = {}, map) {
   const resolvedOptions = resolveControlOptions(options);
   const C = leafletSrcExports.Control.extend({
@@ -14730,7 +14730,7 @@ function createControl(control, options = {}, map) {
       ].filter(Boolean).join(" ");
       const element = createControlElement(
         control,
-        __spreadProps$u(__spreadValues$M({}, resolvedOptions), { addClass }),
+        __spreadProps$w(__spreadValues$Q({}, resolvedOptions), { addClass }),
         map != null ? map : leafletMap
       );
       if (!resolvedOptions.margin) {
@@ -14780,32 +14780,32 @@ function createToggleControl$1(options, map) {
 var css_248z$3 = ".leaflet-bar.webmap-ctrl-group:not(:empty){box-shadow:0 0 2px rgba(0,0,0,.1)}";
 styleInject(css_248z$3);
-var __defProp$18 = Object.defineProperty;
-var __defProps$t = Object.defineProperties;
-var __getOwnPropDescs$t = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$M = Object.getOwnPropertySymbols;
-var __hasOwnProp$M = Object.prototype.hasOwnProperty;
-var __propIsEnum$M = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$18 = (obj, key, value) => key in obj ? __defProp$18(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$L = (a, b) => {
+var __defProp$19 = Object.defineProperty;
+var __defProps$v = Object.defineProperties;
+var __getOwnPropDescs$v = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$Q = Object.getOwnPropertySymbols;
+var __hasOwnProp$Q = Object.prototype.hasOwnProperty;
+var __propIsEnum$Q = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$19 = (obj, key, value) => key in obj ? __defProp$19(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$M.call(b, prop))
-      __defNormalProp$18(a, prop, b[prop]);
-  if (__getOwnPropSymbols$M)
-    for (var prop of __getOwnPropSymbols$M(b)) {
-      if (__propIsEnum$M.call(b, prop))
-        __defNormalProp$18(a, prop, b[prop]);
+    if (__hasOwnProp$Q.call(b, prop))
+      __defNormalProp$19(a, prop, b[prop]);
+  if (__getOwnPropSymbols$Q)
+    for (var prop of __getOwnPropSymbols$Q(b)) {
+      if (__propIsEnum$Q.call(b, prop))
+        __defNormalProp$19(a, prop, b[prop]);
     }
   return a;
 };
-var __spreadProps$t = (a, b) => __defProps$t(a, __getOwnPropDescs$t(b));
-var __publicField$M = (obj, key, value) => __defNormalProp$18(obj, typeof key !== "symbol" ? key + "" : key, value);
+var __spreadProps$v = (a, b) => __defProps$v(a, __getOwnPropDescs$v(b));
+var __publicField$J = (obj, key, value) => __defNormalProp$19(obj, typeof key !== "symbol" ? key + "" : key, value);
 class LeafletControlContainer {
   constructor(map, options = {}) {
-    __publicField$M(this, "map");
-    __publicField$M(this, "controlContainer");
-    __publicField$M(this, "targets", /* @__PURE__ */ new WeakMap());
-    __publicField$M(this, "ids", /* @__PURE__ */ new WeakMap());
+    __publicField$J(this, "map");
+    __publicField$J(this, "controlContainer");
+    __publicField$J(this, "targets", /* @__PURE__ */ new WeakMap());
+    __publicField$J(this, "ids", /* @__PURE__ */ new WeakMap());
     this.map = map;
     this.controlContainer = this.createControlContainer(options);
     this.controlContainer.addTo(map.getContainer());
@@ -14867,7 +14867,7 @@ class LeafletControlContainer {
     const mapAny = this.map;
     const controlCorners = mapAny._controlCorners || {};
     const getCorner = (key, selector) => controlCorners[key] || this.map.getContainer().querySelector(selector) || void 0;
-    return new ControlContainer(__spreadProps$t(__spreadValues$L({}, options), {
+    return new ControlContainer(__spreadProps$v(__spreadValues$P({}, options), {
       map: this.map,
       container: mapAny._controlContainer,
       positionContainers: {
@@ -15752,6 +15752,8 @@ function filterGeometries(data, type) {
     _data.geometries = _data.geometries.filter(
       (g) => geometryFilter(g.type, type)
     );
+  } else if (!geometryFilter(data.type, type)) {
+    return false;
   }
   return data;
 }
@@ -15775,15 +15777,15 @@ function createFeaturePositionOptions(features) {
   };
 }
-var __defProp$17 = Object.defineProperty;
-var __defNormalProp$17 = (obj, key, value) => key in obj ? __defProp$17(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField$L = (obj, key, value) => __defNormalProp$17(obj, typeof key !== "symbol" ? key + "" : key, value);
+var __defProp$18 = Object.defineProperty;
+var __defNormalProp$18 = (obj, key, value) => key in obj ? __defProp$18(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField$I = (obj, key, value) => __defNormalProp$18(obj, typeof key !== "symbol" ? key + "" : key, value);
 class BaseAdapter {
   constructor(map, options) {
-    __publicField$L(this, "map", map);
-    __publicField$L(this, "options", options);
-    __publicField$L(this, "layer");
-    __publicField$L(this, "pane", "order-0");
+    __publicField$I(this, "map", map);
+    __publicField$I(this, "options", options);
+    __publicField$I(this, "layer");
+    __publicField$I(this, "pane", "order-0");
     var _a, _b;
     if (options.order !== void 0) {
       const order = options.order;
@@ -15821,19 +15823,19 @@ function convertMapClickEvent(evt) {
   };
 }
-var __defProp$16 = Object.defineProperty;
-var __getOwnPropSymbols$L = Object.getOwnPropertySymbols;
-var __hasOwnProp$L = Object.prototype.hasOwnProperty;
-var __propIsEnum$L = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$16 = (obj, key, value) => key in obj ? __defProp$16(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$K = (a, b) => {
+var __defProp$17 = Object.defineProperty;
+var __getOwnPropSymbols$P = Object.getOwnPropertySymbols;
+var __hasOwnProp$P = Object.prototype.hasOwnProperty;
+var __propIsEnum$P = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$17 = (obj, key, value) => key in obj ? __defProp$17(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$L.call(b, prop))
-      __defNormalProp$16(a, prop, b[prop]);
-  if (__getOwnPropSymbols$L)
-    for (var prop of __getOwnPropSymbols$L(b)) {
-      if (__propIsEnum$L.call(b, prop))
-        __defNormalProp$16(a, prop, b[prop]);
+    if (__hasOwnProp$P.call(b, prop))
+      __defNormalProp$17(a, prop, b[prop]);
+  if (__getOwnPropSymbols$P)
+    for (var prop of __getOwnPropSymbols$P(b)) {
+      if (__propIsEnum$P.call(b, prop))
+        __defNormalProp$17(a, prop, b[prop]);
     }
   return a;
 };
@@ -15843,7 +15845,7 @@ function createMouseEvent({
 }) {
   const layer_ = source.target;
   const feature = layer_.feature;
-  const opt = __spreadValues$K({
+  const opt = __spreadValues$O({
     layer,
     feature,
     event: convertMapClickEvent(source),
@@ -15852,30 +15854,30 @@ function createMouseEvent({
   return opt;
 }
-var __defProp$15 = Object.defineProperty;
-var __getOwnPropSymbols$K = Object.getOwnPropertySymbols;
-var __hasOwnProp$K = Object.prototype.hasOwnProperty;
-var __propIsEnum$K = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$15 = (obj, key, value) => key in obj ? __defProp$15(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$J = (a, b) => {
+var __defProp$16 = Object.defineProperty;
+var __getOwnPropSymbols$O = Object.getOwnPropertySymbols;
+var __hasOwnProp$O = Object.prototype.hasOwnProperty;
+var __propIsEnum$O = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$16 = (obj, key, value) => key in obj ? __defProp$16(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$K.call(b, prop))
-      __defNormalProp$15(a, prop, b[prop]);
-  if (__getOwnPropSymbols$K)
-    for (var prop of __getOwnPropSymbols$K(b)) {
-      if (__propIsEnum$K.call(b, prop))
-        __defNormalProp$15(a, prop, b[prop]);
+    if (__hasOwnProp$O.call(b, prop))
+      __defNormalProp$16(a, prop, b[prop]);
+  if (__getOwnPropSymbols$O)
+    for (var prop of __getOwnPropSymbols$O(b)) {
+      if (__propIsEnum$O.call(b, prop))
+        __defNormalProp$16(a, prop, b[prop]);
     }
   return a;
 };
-var __publicField$K = (obj, key, value) => __defNormalProp$15(obj, typeof key !== "symbol" ? key + "" : key, value);
+var __publicField$H = (obj, key, value) => __defNormalProp$16(obj, typeof key !== "symbol" ? key + "" : key, value);
 class GeoJsonEvents {
   constructor(layer) {
-    __publicField$K(this, "layer");
-    __publicField$K(this, "_onclick");
-    __publicField$K(this, "_ondblclick");
-    __publicField$K(this, "_mouseout");
-    __publicField$K(this, "_mouseover");
+    __publicField$H(this, "layer");
+    __publicField$H(this, "_onclick");
+    __publicField$H(this, "_ondblclick");
+    __publicField$H(this, "_mouseout");
+    __publicField$H(this, "_mouseover");
     this.layer = layer;
   }
   handleMouseEvents(layer) {
@@ -15884,7 +15886,7 @@ class GeoJsonEvents {
     if (onClick_) {
       this._onclick = (e) => {
         const selected = !!this.layer._getSelected(layer);
-        onClick_(__spreadValues$J({
+        onClick_(__spreadValues$N({
           selected
         }, this._createMouseEvent(e)));
       };
@@ -15894,7 +15896,7 @@ class GeoJsonEvents {
       this._ondblclick = (e) => {
         leafletSrcExports.DomEvent.stopPropagation(e);
         const selected = !!this.layer._getSelected(layer);
-        onDoubleClick(__spreadValues$J({
+        onDoubleClick(__spreadValues$N({
           selected
         }, this._createMouseEvent(e)));
       };
@@ -16553,19 +16555,19 @@ const typeExpressions = {
   typeof: evaluateArgs(([arg]) => typeOfValue(arg))
 };
-var __defProp$14 = Object.defineProperty;
-var __getOwnPropSymbols$J = Object.getOwnPropertySymbols;
-var __hasOwnProp$J = Object.prototype.hasOwnProperty;
-var __propIsEnum$J = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$14 = (obj, key, value) => key in obj ? __defProp$14(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$I = (a, b) => {
+var __defProp$15 = Object.defineProperty;
+var __getOwnPropSymbols$N = Object.getOwnPropertySymbols;
+var __hasOwnProp$N = Object.prototype.hasOwnProperty;
+var __propIsEnum$N = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$15 = (obj, key, value) => key in obj ? __defProp$15(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$J.call(b, prop))
-      __defNormalProp$14(a, prop, b[prop]);
-  if (__getOwnPropSymbols$J)
-    for (var prop of __getOwnPropSymbols$J(b)) {
-      if (__propIsEnum$J.call(b, prop))
-        __defNormalProp$14(a, prop, b[prop]);
+    if (__hasOwnProp$N.call(b, prop))
+      __defNormalProp$15(a, prop, b[prop]);
+  if (__getOwnPropSymbols$N)
+    for (var prop of __getOwnPropSymbols$N(b)) {
+      if (__propIsEnum$N.call(b, prop))
+        __defNormalProp$15(a, prop, b[prop]);
     }
   return a;
 };
@@ -16577,7 +16579,7 @@ function isExpression(value) {
   }
   return false;
 }
-const expressions = __spreadValues$I(__spreadValues$I(__spreadValues$I(__spreadValues$I(__spreadValues$I(__spreadValues$I({}, mathExpressions), typeExpressions), stringExpressions), lookupExpressions), decisionExpressions), interpolationExpressions);
+const expressions = __spreadValues$M(__spreadValues$M(__spreadValues$M(__spreadValues$M(__spreadValues$M(__spreadValues$M({}, mathExpressions), typeExpressions), stringExpressions), lookupExpressions), decisionExpressions), interpolationExpressions);
 function evaluate(expression, data = {}) {
   const [name, ...args] = expression;
   const expressionFun = expressions[name];
@@ -16590,19 +16592,19 @@ function evaluate(expression, data = {}) {
   throw new Error(`Expression "${name}" is not supported.`);
 }
-var __defProp$13 = Object.defineProperty;
-var __getOwnPropSymbols$I = Object.getOwnPropertySymbols;
-var __hasOwnProp$I = Object.prototype.hasOwnProperty;
-var __propIsEnum$I = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$13 = (obj, key, value) => key in obj ? __defProp$13(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$H = (a, b) => {
+var __defProp$14 = Object.defineProperty;
+var __getOwnPropSymbols$M = Object.getOwnPropertySymbols;
+var __hasOwnProp$M = Object.prototype.hasOwnProperty;
+var __propIsEnum$M = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$14 = (obj, key, value) => key in obj ? __defProp$14(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$I.call(b, prop))
-      __defNormalProp$13(a, prop, b[prop]);
-  if (__getOwnPropSymbols$I)
-    for (var prop of __getOwnPropSymbols$I(b)) {
-      if (__propIsEnum$I.call(b, prop))
-        __defNormalProp$13(a, prop, b[prop]);
+    if (__hasOwnProp$M.call(b, prop))
+      __defNormalProp$14(a, prop, b[prop]);
+  if (__getOwnPropSymbols$M)
+    for (var prop of __getOwnPropSymbols$M(b)) {
+      if (__propIsEnum$M.call(b, prop))
+        __defNormalProp$14(a, prop, b[prop]);
     }
   return a;
 };
@@ -16635,25 +16637,25 @@ function createExpressionCallback(paint) {
       for (const p in expressions) {
         fromCb[p] = expressions[p](feature);
       }
-      return __spreadValues$H(__spreadValues$H({}, paint), fromCb);
+      return __spreadValues$L(__spreadValues$L({}, paint), fromCb);
     };
   }
   return;
 }
-var __defProp$12 = Object.defineProperty;
-var __getOwnPropSymbols$H = Object.getOwnPropertySymbols;
-var __hasOwnProp$H = Object.prototype.hasOwnProperty;
-var __propIsEnum$H = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$12 = (obj, key, value) => key in obj ? __defProp$12(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$G = (a, b) => {
+var __defProp$13 = Object.defineProperty;
+var __getOwnPropSymbols$L = Object.getOwnPropertySymbols;
+var __hasOwnProp$L = Object.prototype.hasOwnProperty;
+var __propIsEnum$L = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$13 = (obj, key, value) => key in obj ? __defProp$13(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$H.call(b, prop))
-      __defNormalProp$12(a, prop, b[prop]);
-  if (__getOwnPropSymbols$H)
-    for (var prop of __getOwnPropSymbols$H(b)) {
-      if (__propIsEnum$H.call(b, prop))
-        __defNormalProp$12(a, prop, b[prop]);
+    if (__hasOwnProp$L.call(b, prop))
+      __defNormalProp$13(a, prop, b[prop]);
+  if (__getOwnPropSymbols$L)
+    for (var prop of __getOwnPropSymbols$L(b)) {
+      if (__propIsEnum$L.call(b, prop))
+        __defNormalProp$13(a, prop, b[prop]);
     }
   return a;
 };
@@ -16700,7 +16702,7 @@ function isPropertyFilter$1(filter) {
   return false;
 }
 function featureFilter(feature, filters) {
-  const properties = __spreadValues$G({}, feature.properties);
+  const properties = __spreadValues$K({}, feature.properties);
   if (properties) {
     properties.$id = feature.id;
     return propertiesFilter(properties, filters);
@@ -16754,19 +16756,19 @@ function isPaintCallback(paint) {
   return false;
 }
-var __defProp$11 = Object.defineProperty;
-var __getOwnPropSymbols$G = Object.getOwnPropertySymbols;
-var __hasOwnProp$G = Object.prototype.hasOwnProperty;
-var __propIsEnum$G = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$11 = (obj, key, value) => key in obj ? __defProp$11(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$F = (a, b) => {
+var __defProp$12 = Object.defineProperty;
+var __getOwnPropSymbols$K = Object.getOwnPropertySymbols;
+var __hasOwnProp$K = Object.prototype.hasOwnProperty;
+var __propIsEnum$K = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$12 = (obj, key, value) => key in obj ? __defProp$12(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$G.call(b, prop))
-      __defNormalProp$11(a, prop, b[prop]);
-  if (__getOwnPropSymbols$G)
-    for (var prop of __getOwnPropSymbols$G(b)) {
-      if (__propIsEnum$G.call(b, prop))
-        __defNormalProp$11(a, prop, b[prop]);
+    if (__hasOwnProp$K.call(b, prop))
+      __defNormalProp$12(a, prop, b[prop]);
+  if (__getOwnPropSymbols$K)
+    for (var prop of __getOwnPropSymbols$K(b)) {
+      if (__propIsEnum$K.call(b, prop))
+        __defNormalProp$12(a, prop, b[prop]);
     }
   return a;
 };
@@ -16795,7 +16797,7 @@ function createPropertiesPaint(propertiesPaint) {
   return (feature) => {
     const paint = paintsFilters.find((x) => featureFilter(feature, x[0]));
     if (paint) {
-      return __spreadValues$F(__spreadValues$F({}, mask), paint[1]);
+      return __spreadValues$J(__spreadValues$J({}, mask), paint[1]);
     }
     return mask;
   };
@@ -16819,8 +16821,8 @@ function expressionCallback({
 }
 function finalizePaint({ paint, defaultPaint }) {
   var _a;
-  let newPaint = __spreadValues$F({}, defaultPaint);
-  newPaint = __spreadValues$F(__spreadValues$F({}, newPaint), paint);
+  let newPaint = __spreadValues$J({}, defaultPaint);
+  newPaint = __spreadValues$J(__spreadValues$J({}, 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;
@@ -16833,7 +16835,7 @@ function preparePaint({
   if (!paint) {
     throw new Error("paint is empty");
   }
-  let newPaint = __spreadValues$F({}, defaultPaint);
+  let newPaint = __spreadValues$J({}, defaultPaint);
   if (isPaintCallback(paint)) {
     const getPaintFunction = (feature) => {
       const getPaint = preparePaint({
@@ -16890,41 +16892,41 @@ function preparePaint({
   return newPaint;
 }
-var __defProp$10 = Object.defineProperty;
-var __defProps$s = Object.defineProperties;
-var __getOwnPropDescs$s = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$F = Object.getOwnPropertySymbols;
-var __hasOwnProp$F = Object.prototype.hasOwnProperty;
-var __propIsEnum$F = 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$E = (a, b) => {
+var __defProp$11 = Object.defineProperty;
+var __defProps$u = Object.defineProperties;
+var __getOwnPropDescs$u = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$J = Object.getOwnPropertySymbols;
+var __hasOwnProp$J = Object.prototype.hasOwnProperty;
+var __propIsEnum$J = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$11 = (obj, key, value) => key in obj ? __defProp$11(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$F.call(b, prop))
-      __defNormalProp$10(a, prop, b[prop]);
-  if (__getOwnPropSymbols$F)
-    for (var prop of __getOwnPropSymbols$F(b)) {
-      if (__propIsEnum$F.call(b, prop))
-        __defNormalProp$10(a, prop, b[prop]);
+    if (__hasOwnProp$J.call(b, prop))
+      __defNormalProp$11(a, prop, b[prop]);
+  if (__getOwnPropSymbols$J)
+    for (var prop of __getOwnPropSymbols$J(b)) {
+      if (__propIsEnum$J.call(b, prop))
+        __defNormalProp$11(a, prop, b[prop]);
     }
   return a;
 };
-var __spreadProps$s = (a, b) => __defProps$s(a, __getOwnPropDescs$s(b));
+var __spreadProps$u = (a, b) => __defProps$u(a, __getOwnPropDescs$u(b));
 var __objRest$a = (source, exclude) => {
   var target = {};
   for (var prop in source)
-    if (__hasOwnProp$F.call(source, prop) && exclude.indexOf(prop) < 0)
+    if (__hasOwnProp$J.call(source, prop) && exclude.indexOf(prop) < 0)
       target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols$F)
-    for (var prop of __getOwnPropSymbols$F(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum$F.call(source, prop))
+  if (source != null && __getOwnPropSymbols$J)
+    for (var prop of __getOwnPropSymbols$J(source)) {
+      if (exclude.indexOf(prop) < 0 && __propIsEnum$J.call(source, prop))
         target[prop] = source[prop];
     }
   return target;
 };
-var __publicField$J = (obj, key, value) => __defNormalProp$10(obj, key + "" , value);
+var __publicField$G = (obj, key, value) => __defNormalProp$11(obj, key + "" , value);
 class GeoJsonPaint {
   constructor(layer) {
-    __publicField$J(this, "layer");
+    __publicField$G(this, "layer");
     this.layer = layer;
   }
   setPaintEachLayer(paint) {
@@ -17003,7 +17005,7 @@ class GeoJsonPaint {
     if (html) {
       element.innerHTML = html;
     }
-    const divIcon = new leafletSrcExports.DivIcon(__spreadProps$s(__spreadValues$E({
+    const divIcon = new leafletSrcExports.DivIcon(__spreadProps$u(__spreadValues$I({
       className: ""
     }, toLIconOpt), {
       html: element
@@ -17029,7 +17031,7 @@ class GeoJsonPaint {
     }
     return (_, latlng) => {
       const p = PAINT;
-      return new leafletSrcExports.CircleMarker(latlng, this.preparePaint(__spreadValues$E(__spreadValues$E({}, p), icon)));
+      return new leafletSrcExports.CircleMarker(latlng, this.preparePaint(__spreadValues$I(__spreadValues$I({}, p), icon)));
     };
   }
   createPaintOptions(paint) {
@@ -17051,26 +17053,26 @@ class GeoJsonPaint {
   }
 }
-var __defProp$$ = Object.defineProperty;
-var __defProps$r = Object.defineProperties;
-var __getOwnPropDescs$r = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$E = Object.getOwnPropertySymbols;
-var __hasOwnProp$E = Object.prototype.hasOwnProperty;
-var __propIsEnum$E = 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$D = (a, b) => {
+var __defProp$10 = Object.defineProperty;
+var __defProps$t = Object.defineProperties;
+var __getOwnPropDescs$t = Object.getOwnPropertyDescriptors;
+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$E.call(b, prop))
-      __defNormalProp$$(a, prop, b[prop]);
-  if (__getOwnPropSymbols$E)
-    for (var prop of __getOwnPropSymbols$E(b)) {
-      if (__propIsEnum$E.call(b, prop))
-        __defNormalProp$$(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;
 };
-var __spreadProps$r = (a, b) => __defProps$r(a, __getOwnPropDescs$r(b));
-var __publicField$I = (obj, key, value) => __defNormalProp$$(obj, typeof key !== "symbol" ? key + "" : key, value);
+var __spreadProps$t = (a, b) => __defProps$t(a, __getOwnPropDescs$t(b));
+var __publicField$F = (obj, key, value) => __defNormalProp$10(obj, typeof key !== "symbol" ? key + "" : key, value);
 var __async$x = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
@@ -17094,22 +17096,22 @@ var __async$x = (__this, __arguments, generator) => {
 class GeoJsonAdapter extends BaseAdapter {
   constructor(map, options) {
     super(map, options);
-    __publicField$I(this, "layer");
-    __publicField$I(this, "selected", false);
-    __publicField$I(this, "type");
-    __publicField$I(this, "_layers", []);
-    __publicField$I(this, "_events");
-    __publicField$I(this, "paint");
-    __publicField$I(this, "selectedPaint");
-    __publicField$I(this, "_selectedLayers", []);
-    __publicField$I(this, "_filteredLayers", []);
-    __publicField$I(this, "_filterFun");
-    __publicField$I(this, "_openedPopup", []);
-    __publicField$I(this, "_paint");
-    __publicField$I(this, "$updateTooltip", debounce(() => {
+    __publicField$F(this, "layer");
+    __publicField$F(this, "selected", false);
+    __publicField$F(this, "type");
+    __publicField$F(this, "_layers", []);
+    __publicField$F(this, "_events");
+    __publicField$F(this, "paint");
+    __publicField$F(this, "selectedPaint");
+    __publicField$F(this, "_selectedLayers", []);
+    __publicField$F(this, "_filteredLayers", []);
+    __publicField$F(this, "_filterFun");
+    __publicField$F(this, "_openedPopup", []);
+    __publicField$F(this, "_paint");
+    __publicField$F(this, "$updateTooltip", debounce(() => {
       this.updateTooltip();
     }, 300));
-    __publicField$I(this, "$unselect", () => {
+    __publicField$F(this, "$unselect", () => {
       this.unselect();
     });
     this._events = new GeoJsonEvents(this);
@@ -17118,7 +17120,7 @@ class GeoJsonAdapter extends BaseAdapter {
   addLayer(options) {
     Object.assign(this.options, options);
     this.paint = options.paint;
-    this.layer = new leafletSrcExports.FeatureGroup([], __spreadProps$r(__spreadValues$D({}, options.nativeOptions), {
+    this.layer = new leafletSrcExports.FeatureGroup([], __spreadProps$t(__spreadValues$H({}, options.nativeOptions), {
       pane: this.pane
     }));
     this.selectedPaint = options.selectedPaint;
@@ -17167,7 +17169,7 @@ class GeoJsonAdapter extends BaseAdapter {
   }
   getSelected() {
     return this._selectedLayers.map((x) => {
-      return __spreadValues$D({
+      return __spreadValues$H({
         target: this,
         feature: x.feature,
         layer: x
@@ -17186,14 +17188,14 @@ class GeoJsonAdapter extends BaseAdapter {
       const filteredLayers = [];
       this._layers.forEach(({ feature, layer }) => {
         if (layer) {
-          const ok = fun ? fun(__spreadValues$D({
+          const ok = fun ? fun(__spreadValues$H({
             target: this,
             feature,
             layer
           }, createFeaturePositionOptions(feature))) : true;
           if (ok) {
             layer_.addLayer(layer);
-            filteredLayers.push(__spreadValues$D({
+            filteredLayers.push(__spreadValues$H({
               target: this,
               feature,
               layer
@@ -17214,7 +17216,7 @@ class GeoJsonAdapter extends BaseAdapter {
   getLayers() {
     return this._layers.map(({ layer, feature }) => {
       const visible = layer && !!layer._map;
-      return __spreadValues$D({
+      return __spreadValues$H({
         feature,
         layer,
         visible,
@@ -17248,6 +17250,9 @@ class GeoJsonAdapter extends BaseAdapter {
   }
   setData(data) {
     this.clearLayer();
+    if (!this.options.type) {
+      this.type = void 0;
+    }
     this.addData(data);
   }
   addData(data) {
@@ -17262,15 +17267,20 @@ class GeoJsonAdapter extends BaseAdapter {
         } else {
           type = options.type;
         }
+        if (!type) {
+          return;
+        }
         if (this.type && this.type !== type) {
           console.warn("no other data type than layer can be added");
           return;
         }
         this.type = type;
         data = filterGeometries(data, type);
-        if (data) {
-          geoJsonOptions = this._getGeoJsonOptions(options, type);
+        if (!data) {
+          console.warn("no other data type than layer can be added");
+          return;
         }
+        geoJsonOptions = this._getGeoJsonOptions(options, type);
       }
       new leafletSrcExports.GeoJSON(data || void 0, geoJsonOptions);
     }
@@ -17332,13 +17342,13 @@ class GeoJsonAdapter extends BaseAdapter {
     }
   }
   updatePaint(paint) {
-    this.paint = __spreadValues$D(__spreadValues$D({}, this.paint), paint);
+    this.paint = __spreadValues$H(__spreadValues$H({}, this.paint), paint);
     for (const l of this._layers) {
       this._paint.setPaint(l, this.paint);
     }
   }
   updateSelectedPaint(paint) {
-    this.selectedPaint = __spreadValues$D(__spreadValues$D({}, this.selectedPaint), paint);
+    this.selectedPaint = __spreadValues$H(__spreadValues$H({}, this.selectedPaint), paint);
     for (const l of this._selectedLayers) {
       this._paint.setPaint(l, this.selectedPaint);
     }
@@ -17355,7 +17365,7 @@ class GeoJsonAdapter extends BaseAdapter {
       if (feature.properties && labelField) {
         message = feature.properties[labelField];
       } else if (label) {
-        message = label(__spreadValues$D(__spreadValues$D({
+        message = label(__spreadValues$H(__spreadValues$H({
           target: this
         }, layerDef), createFeaturePositionOptions(feature)));
       }
@@ -17374,7 +17384,7 @@ class GeoJsonAdapter extends BaseAdapter {
         autoPan,
         maxWidth,
         closeButton: closeButton_
-      } = __spreadValues$D({
+      } = __spreadValues$H({
         minWidth: 300
       }, options);
       const closeButton = closeButton_ != null ? closeButton_ : !this.options.selectOnHover;
@@ -17390,7 +17400,7 @@ class GeoJsonAdapter extends BaseAdapter {
       };
       let content;
       if (options.createPopupContent) {
-        content = yield options.createPopupContent(__spreadValues$D({
+        content = yield options.createPopupContent(__spreadValues$H({
           layer,
           feature,
           target: this,
@@ -17468,9 +17478,9 @@ class GeoJsonAdapter extends BaseAdapter {
         lopt = {
           style: (feature) => {
             if (feature) {
-              return this._paint.preparePaint(__spreadValues$D(__spreadValues$D({}, PAINT), paint(feature)));
+              return this._paint.preparePaint(__spreadValues$H(__spreadValues$H({}, PAINT), paint(feature)));
             } else {
-              return this._paint.preparePaint(__spreadProps$r(__spreadValues$D({}, PAINT), { type: "path" }));
+              return this._paint.preparePaint(__spreadProps$t(__spreadValues$H({}, PAINT), { type: "path" }));
             }
           }
         };
@@ -17486,7 +17496,7 @@ class GeoJsonAdapter extends BaseAdapter {
   _onEachFeature(feature, layer) {
     const layer_ = this.layer;
     if (layer_) {
-      const def = __spreadValues$D({
+      const def = __spreadValues$H({
         target: this,
         feature,
         layer
@@ -17521,7 +17531,7 @@ class GeoJsonAdapter extends BaseAdapter {
         setTimeout(() => {
           if (popup) {
             this._openPopup(
-              __spreadValues$D({
+              __spreadValues$H({
                 target: this,
                 layer,
                 feature
@@ -17539,7 +17549,7 @@ class GeoJsonAdapter extends BaseAdapter {
     leafletSrcExports.DomEvent.stopPropagation(e);
     const layer = e.target;
     const feature = layer.feature;
-    const def = __spreadValues$D({
+    const def = __spreadValues$H({
       target: this,
       layer,
       feature
@@ -17572,7 +17582,7 @@ class GeoJsonAdapter extends BaseAdapter {
     }
     if (this.options.onSelect) {
       const features = def.feature ? [def.feature] : [];
-      this.options.onSelect(__spreadValues$D({
+      this.options.onSelect(__spreadValues$H({
         type,
         layer: this,
         features
@@ -17761,19 +17771,19 @@ function createToggleControl(createButtonControl, options) {
   return buttonControl;
 }
-var __defProp$_ = Object.defineProperty;
-var __getOwnPropSymbols$D = Object.getOwnPropertySymbols;
-var __hasOwnProp$D = Object.prototype.hasOwnProperty;
-var __propIsEnum$D = 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$C = (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$D.call(b, prop))
-      __defNormalProp$_(a, prop, b[prop]);
-  if (__getOwnPropSymbols$D)
-    for (var prop of __getOwnPropSymbols$D(b)) {
-      if (__propIsEnum$D.call(b, prop))
-        __defNormalProp$_(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;
 };
@@ -17784,12 +17794,12 @@ function normalizeLayerRequestOptions(request) {
   if (!request) {
     return void 0;
   }
-  const normalized = __spreadValues$C({}, request);
+  const normalized = __spreadValues$G({}, request);
   return hasLayerRequestOptions(normalized) ? normalized : void 0;
 }
 function getLayerRequestOptions(options) {
   const request = options == null ? void 0 : options.request;
-  const headers = __spreadValues$C(__spreadValues$C({}, (options == null ? void 0 : options.headers) || {}), (request == null ? void 0 : request.headers) || {});
+  const headers = __spreadValues$G(__spreadValues$G({}, (options == null ? void 0 : options.headers) || {}), (request == null ? void 0 : request.headers) || {});
   const result = {};
   if (hasHeaders(headers)) {
     result.headers = headers;
@@ -17868,95 +17878,95 @@ function updateGeoJsonAdapterOptions(opt) {
   return opt;
 }
-var __defProp$Z = Object.defineProperty;
-var __defNormalProp$Z = (obj, key, value) => key in obj ? __defProp$Z(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField$H = (obj, key, value) => __defNormalProp$Z(obj, typeof key !== "symbol" ? key + "" : key, value);
+var __defProp$_ = Object.defineProperty;
+var __defNormalProp$_ = (obj, key, value) => key in obj ? __defProp$_(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField$E = (obj, key, value) => __defNormalProp$_(obj, typeof key !== "symbol" ? key + "" : key, value);
 class KeyCodes {
   constructor() {
-    __publicField$H(this, "backspace", 8);
-    __publicField$H(this, "tab", 9);
-    __publicField$H(this, "enter", 13);
-    __publicField$H(this, "shift", 16);
-    __publicField$H(this, "ctrl", 17);
-    __publicField$H(this, "alt", 18);
-    __publicField$H(this, "pause/break", 19);
-    __publicField$H(this, "caps_lock", 20);
-    __publicField$H(this, "escape", 27);
-    __publicField$H(this, "page_up", 33);
-    __publicField$H(this, "page_down", 34);
-    __publicField$H(this, "end", 35);
-    __publicField$H(this, "home", 36);
-    __publicField$H(this, "left_arrow", 37);
-    __publicField$H(this, "up_arrow", 38);
-    __publicField$H(this, "right_arrow", 39);
-    __publicField$H(this, "down_arrow", 40);
-    __publicField$H(this, "insert", 45);
-    __publicField$H(this, "delete", 46);
-    __publicField$H(this, "left_window_key", 91);
-    __publicField$H(this, "right_window_key", 92);
-    __publicField$H(this, "select_key", 93);
-    __publicField$H(this, "numpad_0", 96);
-    __publicField$H(this, "numpad_1", 97);
-    __publicField$H(this, "numpad_2", 98);
-    __publicField$H(this, "numpad_3", 99);
-    __publicField$H(this, "numpad_4", 100);
-    __publicField$H(this, "numpad_5", 101);
-    __publicField$H(this, "numpad_6", 102);
-    __publicField$H(this, "numpad_7", 103);
-    __publicField$H(this, "numpad_8", 104);
-    __publicField$H(this, "numpad_9", 105);
-    __publicField$H(this, "multiply", 106);
-    __publicField$H(this, "add", 107);
-    __publicField$H(this, "subtract", 109);
-    __publicField$H(this, "decimal_point", 110);
-    __publicField$H(this, "divide", 111);
-    __publicField$H(this, "f1", 112);
-    __publicField$H(this, "f2", 113);
-    __publicField$H(this, "f3", 114);
-    __publicField$H(this, "f4", 115);
-    __publicField$H(this, "f5", 116);
-    __publicField$H(this, "f6", 117);
-    __publicField$H(this, "f7", 118);
-    __publicField$H(this, "f8", 119);
-    __publicField$H(this, "f9", 120);
-    __publicField$H(this, "f10", 121);
-    __publicField$H(this, "f11", 122);
-    __publicField$H(this, "f12", 123);
-    __publicField$H(this, "num_lock", 144);
-    __publicField$H(this, "scroll_lock", 145);
-    __publicField$H(this, "semi-colon", 186);
-    __publicField$H(this, "equal_sign", 187);
-    __publicField$H(this, ",", 188);
+    __publicField$E(this, "backspace", 8);
+    __publicField$E(this, "tab", 9);
+    __publicField$E(this, "enter", 13);
+    __publicField$E(this, "shift", 16);
+    __publicField$E(this, "ctrl", 17);
+    __publicField$E(this, "alt", 18);
+    __publicField$E(this, "pause/break", 19);
+    __publicField$E(this, "caps_lock", 20);
+    __publicField$E(this, "escape", 27);
+    __publicField$E(this, "page_up", 33);
+    __publicField$E(this, "page_down", 34);
+    __publicField$E(this, "end", 35);
+    __publicField$E(this, "home", 36);
+    __publicField$E(this, "left_arrow", 37);
+    __publicField$E(this, "up_arrow", 38);
+    __publicField$E(this, "right_arrow", 39);
+    __publicField$E(this, "down_arrow", 40);
+    __publicField$E(this, "insert", 45);
+    __publicField$E(this, "delete", 46);
+    __publicField$E(this, "left_window_key", 91);
+    __publicField$E(this, "right_window_key", 92);
+    __publicField$E(this, "select_key", 93);
+    __publicField$E(this, "numpad_0", 96);
+    __publicField$E(this, "numpad_1", 97);
+    __publicField$E(this, "numpad_2", 98);
+    __publicField$E(this, "numpad_3", 99);
+    __publicField$E(this, "numpad_4", 100);
+    __publicField$E(this, "numpad_5", 101);
+    __publicField$E(this, "numpad_6", 102);
+    __publicField$E(this, "numpad_7", 103);
+    __publicField$E(this, "numpad_8", 104);
+    __publicField$E(this, "numpad_9", 105);
+    __publicField$E(this, "multiply", 106);
+    __publicField$E(this, "add", 107);
+    __publicField$E(this, "subtract", 109);
+    __publicField$E(this, "decimal_point", 110);
+    __publicField$E(this, "divide", 111);
+    __publicField$E(this, "f1", 112);
+    __publicField$E(this, "f2", 113);
+    __publicField$E(this, "f3", 114);
+    __publicField$E(this, "f4", 115);
+    __publicField$E(this, "f5", 116);
+    __publicField$E(this, "f6", 117);
+    __publicField$E(this, "f7", 118);
+    __publicField$E(this, "f8", 119);
+    __publicField$E(this, "f9", 120);
+    __publicField$E(this, "f10", 121);
+    __publicField$E(this, "f11", 122);
+    __publicField$E(this, "f12", 123);
+    __publicField$E(this, "num_lock", 144);
+    __publicField$E(this, "scroll_lock", 145);
+    __publicField$E(this, "semi-colon", 186);
+    __publicField$E(this, "equal_sign", 187);
+    __publicField$E(this, ",", 188);
     // "comma";
-    __publicField$H(this, "-", 189);
+    __publicField$E(this, "-", 189);
     // "dash";
-    __publicField$H(this, ".", 190);
+    __publicField$E(this, ".", 190);
     // "period";
-    __publicField$H(this, "/", 191);
+    __publicField$E(this, "/", 191);
     // "forward slash";
-    __publicField$H(this, "`", 192);
+    __publicField$E(this, "`", 192);
     // "grave accent";
-    __publicField$H(this, "[", 219);
+    __publicField$E(this, "[", 219);
     // "open bracket";
-    __publicField$H(this, "\\", 220);
+    __publicField$E(this, "\\", 220);
     // "back slash";
-    __publicField$H(this, "]", 221);
+    __publicField$E(this, "]", 221);
     // "close braket";
-    __publicField$H(this, "'", 222);
+    __publicField$E(this, "'", 222);
   }
   // "single quote"
 }
-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$G = (obj, key, value) => __defNormalProp$Y(obj, typeof key !== "symbol" ? key + "" : key, value);
+var __defProp$Z = Object.defineProperty;
+var __defNormalProp$Z = (obj, key, value) => key in obj ? __defProp$Z(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField$D = (obj, key, value) => __defNormalProp$Z(obj, typeof key !== "symbol" ? key + "" : key, value);
 class Keys {
   constructor() {
-    __publicField$G(this, "keyCodeAlias", new KeyCodes());
-    __publicField$G(this, "keys", {});
-    __publicField$G(this, "_windowOnFocus");
-    __publicField$G(this, "_keysPressed");
-    __publicField$G(this, "_keysReleased");
+    __publicField$D(this, "keyCodeAlias", new KeyCodes());
+    __publicField$D(this, "keys", {});
+    __publicField$D(this, "_windowOnFocus");
+    __publicField$D(this, "_keysPressed");
+    __publicField$D(this, "_keysReleased");
     this._windowOnFocus = this.windowOnFocus.bind(this);
     this._keysPressed = this.keysPressed.bind(this);
     this._keysReleased = this.keysReleased.bind(this);
@@ -17995,28 +18005,24 @@ class Keys {
   }
 }
-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$F = (obj, key, value) => __defNormalProp$X(obj, typeof key !== "symbol" ? key + "" : key, value);
+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$C = (obj, key, value) => __defNormalProp$Y(obj, typeof key !== "symbol" ? key + "" : key, value);
 class StateItem {
   constructor(webMap, opt) {
-    __publicField$F(this, "webMap", webMap);
-    __publicField$F(this, "name");
-    __publicField$F(this, "event");
-    __publicField$F(this, "value");
+    __publicField$C(this, "webMap", webMap);
+    __publicField$C(this, "name");
+    __publicField$C(this, "event");
+    __publicField$C(this, "value");
     if (opt) {
-      if (opt.value) {
+      if (opt.value !== void 0) {
         this.setValue(opt.value);
       }
       if (opt.name) {
         this.name = opt.name;
       }
       if (opt.event) {
-        if (typeof opt.event === "string") {
-          this.event = [opt.event];
-        } else {
-          this.event = opt.event;
-        }
+        this.event = Array.isArray(opt.event) ? opt.event : [opt.event];
       }
     }
   }
@@ -18028,14 +18034,28 @@ class StateItem {
   }
 }
-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$E = (obj, key, value) => __defNormalProp$W(obj, typeof key !== "symbol" ? key + "" : key, value);
+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) => {
+  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]);
+    }
+  return a;
+};
 class BoundState extends StateItem {
-  constructor() {
-    super(...arguments);
-    __publicField$E(this, "name", "bounds");
-    __publicField$E(this, "event", ["moveend"]);
+  constructor(webMap, opt) {
+    super(webMap, __spreadValues$F({
+      name: "bounds",
+      event: "moveend"
+    }, opt));
   }
   getValue() {
     return this.webMap.getBounds();
@@ -18056,14 +18076,28 @@ class BoundState extends StateItem {
   }
 }
-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$D = (obj, key, value) => __defNormalProp$V(obj, typeof key !== "symbol" ? key + "" : key, value);
+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) => {
+  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]);
+    }
+  return a;
+};
 class CenterState extends StateItem {
-  constructor() {
-    super(...arguments);
-    __publicField$D(this, "name", "center");
-    __publicField$D(this, "event", ["moveend"]);
+  constructor(webMap, opt) {
+    super(webMap, __spreadValues$E({
+      name: "center",
+      event: "moveend"
+    }, opt));
   }
   getValue() {
     return this.webMap.getCenter();
@@ -18085,14 +18119,28 @@ class CenterState extends StateItem {
   }
 }
-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$C = (obj, key, value) => __defNormalProp$U(obj, typeof key !== "symbol" ? key + "" : key, value);
+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) => {
+  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]);
+    }
+  return a;
+};
 class ZoomState extends StateItem {
-  constructor() {
-    super(...arguments);
-    __publicField$C(this, "name", "zoom");
-    __publicField$C(this, "event", ["zoomend"]);
+  constructor(webMap, opt) {
+    super(webMap, __spreadValues$D({
+      name: "zoom",
+      event: "zoomend"
+    }, opt));
   }
   getValue() {
     const zoom = this.webMap.getZoom();
@@ -18115,9 +18163,9 @@ function clearObject(obj) {
   }
 }
-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$B = (obj, key, value) => __defNormalProp$T(obj, typeof key !== "symbol" ? key + "" : key, value);
+var __defProp$U = Object.defineProperty;
+var __defNormalProp$U = (obj, key, value) => key in obj ? __defProp$U(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField$B = (obj, key, value) => __defNormalProp$U(obj, typeof key !== "symbol" ? key + "" : key, value);
 var __async$w = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
@@ -18264,9 +18312,12 @@ const _WebMapMain = class _WebMapMain {
    * @returns The map's container
    */
   getContainer() {
-    if (this.mapAdapter.getContainer) {
-      return this.mapAdapter.getContainer();
-    } else if (this.options.target) {
+    var _a, _b;
+    const nativeContainer = (_b = (_a = this.mapAdapter).getContainer) == null ? void 0 : _b.call(_a);
+    if (nativeContainer) {
+      return nativeContainer;
+    }
+    if (this.options.target) {
       if (this.options.target instanceof HTMLElement) {
         return this.options.target;
       } else if (typeof this.options.target === "string") {
@@ -18664,26 +18715,26 @@ __publicField$B(_WebMapMain, "keys", new Keys());
 __publicField$B(_WebMapMain, "getPaintFunctions");
 let WebMapMain = _WebMapMain;
-var __defProp$S = Object.defineProperty;
-var __defProps$q = Object.defineProperties;
-var __getOwnPropDescs$q = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$C = Object.getOwnPropertySymbols;
-var __hasOwnProp$C = Object.prototype.hasOwnProperty;
-var __propIsEnum$C = 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$B = (a, b) => {
+var __defProp$T = Object.defineProperty;
+var __defProps$s = Object.defineProperties;
+var __getOwnPropDescs$s = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$D = Object.getOwnPropertySymbols;
+var __hasOwnProp$D = Object.prototype.hasOwnProperty;
+var __propIsEnum$D = 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$C = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$C.call(b, prop))
-      __defNormalProp$S(a, prop, b[prop]);
-  if (__getOwnPropSymbols$C)
-    for (var prop of __getOwnPropSymbols$C(b)) {
-      if (__propIsEnum$C.call(b, prop))
-        __defNormalProp$S(a, prop, b[prop]);
+    if (__hasOwnProp$D.call(b, prop))
+      __defNormalProp$T(a, prop, b[prop]);
+  if (__getOwnPropSymbols$D)
+    for (var prop of __getOwnPropSymbols$D(b)) {
+      if (__propIsEnum$D.call(b, prop))
+        __defNormalProp$T(a, prop, b[prop]);
     }
   return a;
 };
-var __spreadProps$q = (a, b) => __defProps$q(a, __getOwnPropDescs$q(b));
-var __publicField$A = (obj, key, value) => __defNormalProp$S(obj, typeof key !== "symbol" ? key + "" : key, value);
+var __spreadProps$s = (a, b) => __defProps$s(a, __getOwnPropDescs$s(b));
+var __publicField$A = (obj, key, value) => __defNormalProp$T(obj, typeof key !== "symbol" ? key + "" : key, value);
 var __async$v = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
@@ -18713,6 +18764,8 @@ class WebMapLayers extends WebMapMain {
     __publicField$A(this, "_baselayers", []);
     __publicField$A(this, "_layers", {});
     __publicField$A(this, "_selectedLayers", []);
+    // true means a layer was removed before its addLayer() completed.
+    __publicField$A(this, "_pendingLayerAdds", /* @__PURE__ */ new WeakMap());
     const tileJson = this.options.tileJson;
     if (tileJson) {
       this.emitter.once("build-map", () => this.addTileJsonLayer(tileJson));
@@ -18819,7 +18872,7 @@ class WebMapLayers extends WebMapMain {
     return __async$v(this, null, function* () {
       const layer = yield this.addLayer(
         adapter,
-        __spreadProps$q(__spreadValues$B({}, options), {
+        __spreadProps$s(__spreadValues$C({}, options), {
           baselayer: true
         }),
         void 0
@@ -18856,7 +18909,7 @@ class WebMapLayers extends WebMapMain {
       }
       const geoJsonOptions = options;
       this._updateGeoJsonOptions(geoJsonOptions);
-      options = __spreadValues$B({
+      options = __spreadValues$C({
         id: String(id),
         order: _order
       }, options);
@@ -18884,12 +18937,12 @@ class WebMapLayers extends WebMapMain {
           }
         }
       }
-      options = __spreadProps$q(__spreadValues$B({}, options), {
+      options = __spreadProps$s(__spreadValues$C({}, options), {
         request: this._getLayerRequestOptions(options)
       });
       if (adapterEngine !== void 0) {
         const _adapter = new adapterEngine(this.mapAdapter.map, options);
-        _adapter.options = __spreadValues$B(__spreadValues$B({}, options), _adapter.options);
+        _adapter.options = __spreadValues$C(__spreadValues$C({}, options), _adapter.options);
         if (_adapter.options.baselayer && _adapter.options.toplayer) {
           throw new Error("Layer cannot be both baselayer and toplayer");
         }
@@ -18905,54 +18958,93 @@ class WebMapLayers extends WebMapMain {
         let layerId;
         if (_adapter.options.id) {
           layerId = String(_adapter.options.id);
+          if (layerId && this._layers[layerId]) {
+            throw new Error(`layer with id '${layerId}' already exist`);
+          }
           this._layers[layerId] = _adapter;
         }
-        this._emitLayerEvent("layer:preadd", layerId || "", _adapter);
-        yield this.onMapLoad();
-        _adapter.map = this.mapAdapter.map;
-        const layer = yield _adapter.addLayer(_adapter.options);
-        _adapter.layer = layer;
-        _adapter.id = _adapter.options.id || String(id);
-        _adapter.options.id = _adapter.id;
-        if (options.baselayer) {
-          _adapter.options.order = 0;
-        }
-        _adapter.order = (_b = _adapter.options.order) != null ? _b : _order;
-        if (layerId) {
-          delete this._layers[layerId];
-        }
-        layerId = String(_adapter.id);
-        if (this._layers[layerId]) {
-          throw Error(`layer with id '${layerId}' already exist`);
-        }
-        if (layerId) {
-          this._layers[layerId] = _adapter;
-          if (geoJsonOptions.filter) {
-            this.filterLayer(_adapter, geoJsonOptions.filter);
+        this._pendingLayerAdds.set(_adapter, false);
+        let nativeStarted = false;
+        const cancelled = () => this._pendingLayerAdds.get(_adapter) === true;
+        try {
+          this._emitLayerEvent("layer:preadd", layerId || "", _adapter);
+          yield this.onMapLoad();
+          if (cancelled()) {
+            return _adapter;
+          }
+          _adapter.map = this.mapAdapter.map;
+          nativeStarted = true;
+          const layer = yield _adapter.addLayer(_adapter.options);
+          _adapter.layer = layer;
+          if (cancelled()) {
+            return _adapter;
           }
+          _adapter.id = _adapter.options.id || String(id);
+          _adapter.options.id = _adapter.id;
           if (options.baselayer) {
-            this._baselayers.push(layerId);
+            _adapter.options.order = 0;
           }
-          if (visibility) {
-            yield this.showLayer(layerId);
+          _adapter.order = (_b = _adapter.options.order) != null ? _b : _order;
+          if (layerId && this._layers[layerId] === _adapter) {
+            delete this._layers[layerId];
           }
-        }
-        const opacity = options.opacity;
-        if (opacity !== void 0 && opacity !== null && opacity <= 1) {
-          this.setLayerOpacity(_adapter, opacity);
-        }
-        const getBounds = layer && (_adapter.getBounds || _adapter.getExtent);
-        if (options.fit && getBounds) {
-          const extent = yield getBounds.call(_adapter);
-          if (extent) {
-            yield this.fitBounds(extent);
+          layerId = String(_adapter.id);
+          if (this._layers[layerId]) {
+            throw Error(`layer with id '${layerId}' already exist`);
+          }
+          if (layerId) {
+            this._layers[layerId] = _adapter;
+            if (geoJsonOptions.filter) {
+              this.filterLayer(_adapter, geoJsonOptions.filter);
+            }
+            if (options.baselayer) {
+              this._baselayers.push(layerId);
+            }
+            if (visibility) {
+              yield this.showLayer(layerId);
+              if (cancelled()) return _adapter;
+            }
+          }
+          const opacity = options.opacity;
+          if (opacity !== void 0 && opacity !== null && opacity <= 1) {
+            this.setLayerOpacity(_adapter, opacity);
+          }
+          const getBounds = layer && (_adapter.getBounds || _adapter.getExtent);
+          if (options.fit && getBounds) {
+            const extent = yield getBounds.call(_adapter);
+            if (cancelled()) {
+              return _adapter;
+            }
+            if (extent) {
+              yield this.fitBounds(extent);
+            }
+          }
+          if (cancelled()) {
+            return _adapter;
+          }
+          if (options.onAdded) {
+            options.onAdded(_adapter);
+          }
+          if (!cancelled()) {
+            this._emitLayerEvent("layer:add", layerId, _adapter);
+          }
+          return _adapter;
+        } catch (error) {
+          if (cancelled()) {
+            return _adapter;
+          }
+          this.removeLayer(_adapter);
+          throw error;
+        } finally {
+          const removed = cancelled();
+          this._pendingLayerAdds.delete(_adapter);
+          if (removed && nativeStarted) {
+            if (_adapter.removeLayer) {
+              _adapter.removeLayer();
+            } else if (_adapter.layer !== void 0)
+              this.mapAdapter.removeLayer(_adapter.layer);
           }
         }
-        if (options.onAdded) {
-          options.onAdded(_adapter);
-        }
-        this._emitLayerEvent("layer:add", layerId, _adapter);
-        return _adapter;
       }
       return Promise.reject("No adapter");
     });
@@ -19013,21 +19105,23 @@ class WebMapLayers extends WebMapMain {
    * Remove specific layer from map and memory by its definition.
    */
   removeLayer(layerDef) {
+    var _a;
     const layer = this.getLayer(layerDef);
     const layerId = layer && this.getLayerId(layer);
-    if (layer && layerId) {
+    if (layer && layerId && this._layers[layerId] === layer) {
       this.emitter.emit("layer:preremove", layer);
-      if (layer.beforeRemove) {
-        layer.beforeRemove();
-      }
-      if (layer.removeLayer) {
-        layer.removeLayer();
+      (_a = layer.beforeRemove) == null ? void 0 : _a.call(layer);
+      if (this._pendingLayerAdds.has(layer)) {
+        this._pendingLayerAdds.set(layer, true);
       } else {
-        this.mapAdapter.removeLayer(layer.layer);
+        if (layer.removeLayer) {
+          layer.removeLayer();
+        } else if (layer.layer !== void 0)
+          this.mapAdapter.removeLayer(layer.layer);
       }
       if (layer.options && layer.options.baselayer) {
         const index = this._baselayers.indexOf(layerId);
-        if (index) {
+        if (index !== -1) {
           this._baselayers.splice(index, 1);
         }
       }
@@ -19083,7 +19177,7 @@ class WebMapLayers extends WebMapMain {
   }
   /** Shortcut for {@link WebMapLayers.addLayer} to create TileLayer adapter */
   addTileLayer(url, options = {}) {
-    return this.addLayer("TILE", __spreadProps$q(__spreadValues$B({}, options), { url }));
+    return this.addLayer("TILE", __spreadProps$s(__spreadValues$C({}, options), { url }));
   }
   addImageLayer(urlOrOptions, options) {
     let url;
@@ -19093,7 +19187,7 @@ class WebMapLayers extends WebMapMain {
       url = urlOrOptions.url;
       options = urlOrOptions;
     }
-    return this.addLayer("IMAGE", __spreadProps$q(__spreadValues$B({}, options), { url }));
+    return this.addLayer("IMAGE", __spreadProps$s(__spreadValues$C({}, options), { url }));
   }
   /**
    * Show added layer on the map by it definition.
@@ -19165,7 +19259,10 @@ class WebMapLayers extends WebMapMain {
       }
     });
     if (layer) {
-      return this.onMapLoad().then(() => action(layer));
+      return this.onMapLoad().then(() => {
+        if (this._layers[String(layer.id)] !== layer) return;
+        return action(layer);
+      });
     }
     return Promise.resolve();
   }
@@ -19479,10 +19576,10 @@ class WebMapLayers extends WebMapMain {
       this.options.layerRequest
     );
     const layerRequest = getLayerRequestOptions(options);
-    const headers = __spreadValues$B(__spreadValues$B({}, (defaultRequest == null ? void 0 : defaultRequest.headers) || {}), (layerRequest == null ? void 0 : layerRequest.headers) || {});
+    const headers = __spreadValues$C(__spreadValues$C({}, (defaultRequest == null ? void 0 : defaultRequest.headers) || {}), (layerRequest == null ? void 0 : layerRequest.headers) || {});
     const credentials = options.withCredentials === false && ((_a = options.request) == null ? void 0 : _a.credentials) === void 0 && (defaultRequest == null ? void 0 : defaultRequest.credentials) !== void 0 ? "same-origin" : (_b = layerRequest == null ? void 0 : layerRequest.credentials) != null ? _b : defaultRequest == null ? void 0 : defaultRequest.credentials;
     const cache = ((_c = options.request) == null ? void 0 : _c.cache) !== void 0 ? options.request.cache : (_d = layerRequest == null ? void 0 : layerRequest.cache) != null ? _d : defaultRequest == null ? void 0 : defaultRequest.cache;
-    return normalizeLayerRequestOptions(__spreadValues$B(__spreadValues$B(__spreadValues$B(__spreadValues$B(__spreadValues$B({}, defaultRequest), layerRequest), Object.keys(headers).length ? { headers } : {}), credentials !== void 0 ? { credentials } : {}), cache !== void 0 ? { cache } : {}));
+    return normalizeLayerRequestOptions(__spreadValues$C(__spreadValues$C(__spreadValues$C(__spreadValues$C(__spreadValues$C({}, defaultRequest), layerRequest), Object.keys(headers).length ? { headers } : {}), credentials !== void 0 ? { credentials } : {}), cache !== void 0 ? { cache } : {}));
   }
   /** @internal */
   _emitLayerEvent(name, id, options) {
@@ -19577,24 +19674,24 @@ class WebMapLayers extends WebMapMain {
   }
 }
-var __defProp$R = Object.defineProperty;
-var __getOwnPropSymbols$B = Object.getOwnPropertySymbols;
-var __hasOwnProp$B = Object.prototype.hasOwnProperty;
-var __propIsEnum$B = 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 __defProp$S = Object.defineProperty;
+var __getOwnPropSymbols$C = Object.getOwnPropertySymbols;
+var __hasOwnProp$C = Object.prototype.hasOwnProperty;
+var __propIsEnum$C = 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 __objRest$9 = (source, exclude) => {
   var target = {};
   for (var prop in source)
-    if (__hasOwnProp$B.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$B)
-    for (var prop of __getOwnPropSymbols$B(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum$B.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$z = (obj, key, value) => __defNormalProp$R(obj, typeof key !== "symbol" ? key + "" : key, value);
+var __publicField$z = (obj, key, value) => __defNormalProp$S(obj, typeof key !== "symbol" ? key + "" : key, value);
 var __async$u = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
@@ -19802,34 +19899,34 @@ __publicField$z(_WebMapControls, "controls", {
 });
 let WebMapControls = _WebMapControls;
-var __defProp$Q = Object.defineProperty;
-var __defProps$p = Object.defineProperties;
-var __getOwnPropDescs$p = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$A = Object.getOwnPropertySymbols;
-var __hasOwnProp$A = Object.prototype.hasOwnProperty;
-var __propIsEnum$A = Object.prototype.propertyIsEnumerable;
+var __defProp$R = Object.defineProperty;
+var __defProps$r = Object.defineProperties;
+var __getOwnPropDescs$r = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$B = Object.getOwnPropertySymbols;
+var __hasOwnProp$B = Object.prototype.hasOwnProperty;
+var __propIsEnum$B = Object.prototype.propertyIsEnumerable;
 var __knownSymbol = (name, symbol) => (symbol = Symbol[name]) ? symbol : /* @__PURE__ */ Symbol.for("Symbol." + name);
-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$A = (a, b) => {
+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$B = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$A.call(b, prop))
-      __defNormalProp$Q(a, prop, b[prop]);
-  if (__getOwnPropSymbols$A)
-    for (var prop of __getOwnPropSymbols$A(b)) {
-      if (__propIsEnum$A.call(b, prop))
-        __defNormalProp$Q(a, prop, b[prop]);
+    if (__hasOwnProp$B.call(b, prop))
+      __defNormalProp$R(a, prop, b[prop]);
+  if (__getOwnPropSymbols$B)
+    for (var prop of __getOwnPropSymbols$B(b)) {
+      if (__propIsEnum$B.call(b, prop))
+        __defNormalProp$R(a, prop, b[prop]);
     }
   return a;
 };
-var __spreadProps$p = (a, b) => __defProps$p(a, __getOwnPropDescs$p(b));
+var __spreadProps$r = (a, b) => __defProps$r(a, __getOwnPropDescs$r(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$B.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$B)
+    for (var prop of __getOwnPropSymbols$B(source)) {
+      if (exclude.indexOf(prop) < 0 && __propIsEnum$B.call(source, prop))
         target[prop] = source[prop];
     }
   return target;
@@ -19950,7 +20047,7 @@ class WebMap extends WebMapControls {
           }
         }
         const _a = controlOptions, { id, order, position } = _a, options = __objRest$8(_a, ["id", "order", "position"]);
-        this.addControl(controlAdapterName, position || "top-left", __spreadProps$p(__spreadValues$A({}, options), {
+        this.addControl(controlAdapterName, position || "top-left", __spreadProps$r(__spreadValues$B({}, options), {
           id,
           order
         }));
@@ -20002,9 +20099,9 @@ function callAjax({
   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$y = (obj, key, value) => __defNormalProp$P(obj, typeof key !== "symbol" ? key + "" : key, value);
+var __defProp$Q = Object.defineProperty;
+var __defNormalProp$Q = (obj, key, value) => key in obj ? __defProp$Q(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField$y = (obj, key, value) => __defNormalProp$Q(obj, typeof key !== "symbol" ? key + "" : key, value);
 class Queue {
   /**
    * @param {PromiseQueueOptions} options - Configuration options for the queue.
@@ -20223,9 +20320,9 @@ class Queue {
 const imageQueue = new Queue({ limit: 6, debounce: 150 });
-var __defProp$O = Object.defineProperty;
-var __defNormalProp$O = (obj, key, value) => key in obj ? __defProp$O(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField$x = (obj, key, value) => __defNormalProp$O(obj, key + "" , value);
+var __defProp$P = Object.defineProperty;
+var __defNormalProp$P = (obj, key, value) => key in obj ? __defProp$P(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField$x = (obj, key, value) => __defNormalProp$P(obj, key + "" , value);
 const transparentImage = "data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEAAAAALAAAAAABAAEAAAIBAAA=";
 class ImageOverlay extends leafletSrcExports.ImageOverlay {
   constructor(imageUrl, bounds, options) {
@@ -20269,9 +20366,9 @@ class ImageOverlay extends leafletSrcExports.ImageOverlay {
   }
 }
-var __defProp$N = Object.defineProperty;
-var __defNormalProp$N = (obj, key, value) => key in obj ? __defProp$N(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField$w = (obj, key, value) => __defNormalProp$N(obj, typeof key !== "symbol" ? key + "" : key, value);
+var __defProp$O = Object.defineProperty;
+var __defNormalProp$O = (obj, key, value) => key in obj ? __defProp$O(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField$w = (obj, key, value) => __defNormalProp$O(obj, typeof key !== "symbol" ? key + "" : key, value);
 class ImageLayer extends leafletSrcExports.Layer {
   constructor(url, options) {
     super(options);
@@ -20469,26 +20566,26 @@ class ImageLayer extends leafletSrcExports.Layer {
   }
 }
-var __defProp$M = Object.defineProperty;
-var __defProps$o = Object.defineProperties;
-var __getOwnPropDescs$o = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$z = Object.getOwnPropertySymbols;
-var __hasOwnProp$z = Object.prototype.hasOwnProperty;
-var __propIsEnum$z = 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$z = (a, b) => {
+var __defProp$N = Object.defineProperty;
+var __defProps$q = Object.defineProperties;
+var __getOwnPropDescs$q = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$A = Object.getOwnPropertySymbols;
+var __hasOwnProp$A = Object.prototype.hasOwnProperty;
+var __propIsEnum$A = 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$A = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$z.call(b, prop))
-      __defNormalProp$M(a, prop, b[prop]);
-  if (__getOwnPropSymbols$z)
-    for (var prop of __getOwnPropSymbols$z(b)) {
-      if (__propIsEnum$z.call(b, prop))
-        __defNormalProp$M(a, prop, b[prop]);
+    if (__hasOwnProp$A.call(b, prop))
+      __defNormalProp$N(a, prop, b[prop]);
+  if (__getOwnPropSymbols$A)
+    for (var prop of __getOwnPropSymbols$A(b)) {
+      if (__propIsEnum$A.call(b, prop))
+        __defNormalProp$N(a, prop, b[prop]);
     }
   return a;
 };
-var __spreadProps$o = (a, b) => __defProps$o(a, __getOwnPropDescs$o(b));
-var __publicField$v = (obj, key, value) => __defNormalProp$M(obj, typeof key !== "symbol" ? key + "" : key, value);
+var __spreadProps$q = (a, b) => __defProps$q(a, __getOwnPropDescs$q(b));
+var __publicField$v = (obj, key, value) => __defNormalProp$N(obj, typeof key !== "symbol" ? key + "" : key, value);
 class ImageAdapter extends BaseAdapter {
   constructor() {
     super(...arguments);
@@ -20500,10 +20597,10 @@ class ImageAdapter extends BaseAdapter {
     if (url) {
       const updateWmsParamsFromOpt = options.updateWmsParams;
       const request = getLayerRequestOptions(options);
-      this.layer = new ImageLayer(url, __spreadProps$o(__spreadValues$z(__spreadValues$z(__spreadValues$z({
+      this.layer = new ImageLayer(url, __spreadProps$q(__spreadValues$A(__spreadValues$A(__spreadValues$A({
         pane: this.pane,
         setViewDelay: options.setViewDelay
-      }, __spreadProps$o(__spreadValues$z({
+      }, __spreadProps$q(__spreadValues$A({
         transparent: true
       }, options), {
         opacity: (_a = options.opacity) != null ? _a : void 0
@@ -20591,33 +20688,33 @@ class TileLayerBase extends leafletSrcExports.TileLayer {
 }
 const TileLayer = makeRemote(TileLayerBase);
-var __defProp$L = Object.defineProperty;
-var __defProps$n = Object.defineProperties;
-var __getOwnPropDescs$n = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$y = Object.getOwnPropertySymbols;
-var __hasOwnProp$y = Object.prototype.hasOwnProperty;
-var __propIsEnum$y = 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$y = (a, b) => {
+var __defProp$M = Object.defineProperty;
+var __defProps$p = Object.defineProperties;
+var __getOwnPropDescs$p = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$z = Object.getOwnPropertySymbols;
+var __hasOwnProp$z = Object.prototype.hasOwnProperty;
+var __propIsEnum$z = 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$z = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$y.call(b, prop))
-      __defNormalProp$L(a, prop, b[prop]);
-  if (__getOwnPropSymbols$y)
-    for (var prop of __getOwnPropSymbols$y(b)) {
-      if (__propIsEnum$y.call(b, prop))
-        __defNormalProp$L(a, prop, b[prop]);
+    if (__hasOwnProp$z.call(b, prop))
+      __defNormalProp$M(a, prop, b[prop]);
+  if (__getOwnPropSymbols$z)
+    for (var prop of __getOwnPropSymbols$z(b)) {
+      if (__propIsEnum$z.call(b, prop))
+        __defNormalProp$M(a, prop, b[prop]);
     }
   return a;
 };
-var __spreadProps$n = (a, b) => __defProps$n(a, __getOwnPropDescs$n(b));
+var __spreadProps$p = (a, b) => __defProps$p(a, __getOwnPropDescs$p(b));
 var __objRest$7 = (source, exclude) => {
   var target = {};
   for (var prop in source)
-    if (__hasOwnProp$y.call(source, prop) && exclude.indexOf(prop) < 0)
+    if (__hasOwnProp$z.call(source, prop) && exclude.indexOf(prop) < 0)
       target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols$y)
-    for (var prop of __getOwnPropSymbols$y(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum$y.call(source, prop))
+  if (source != null && __getOwnPropSymbols$z)
+    for (var prop of __getOwnPropSymbols$z(source)) {
+      if (exclude.indexOf(prop) < 0 && __propIsEnum$z.call(source, prop))
         target[prop] = source[prop];
     }
   return target;
@@ -20628,7 +20725,7 @@ class TileAdapter extends BaseAdapter {
     if (options) {
       const _a = options, { url } = _a, opt = __objRest$7(_a, ["url"]);
       if (url) {
-        const tileLayerOptions = __spreadValues$y({
+        const tileLayerOptions = __spreadValues$z({
           pane: this.pane,
           attribution: opt.attribution,
           minZoom: opt.minZoom,
@@ -20640,7 +20737,7 @@ class TileAdapter extends BaseAdapter {
         let layer;
         const request = getLayerRequestOptions(opt);
         if (request) {
-          layer = new TileLayer(url, __spreadProps$n(__spreadValues$y({}, tileLayerOptions), {
+          layer = new TileLayer(url, __spreadProps$p(__spreadValues$z({}, tileLayerOptions), {
             request,
             setViewDelay: opt.setViewDelay
           }));
@@ -20662,29 +20759,29 @@ class TileAdapter extends BaseAdapter {
   }
 }
-var __defProp$K = Object.defineProperty;
-var __defProps$m = Object.defineProperties;
-var __getOwnPropDescs$m = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$x = Object.getOwnPropertySymbols;
-var __hasOwnProp$x = Object.prototype.hasOwnProperty;
-var __propIsEnum$x = 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$x = (a, b) => {
+var __defProp$L = Object.defineProperty;
+var __defProps$o = Object.defineProperties;
+var __getOwnPropDescs$o = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$y = Object.getOwnPropertySymbols;
+var __hasOwnProp$y = Object.prototype.hasOwnProperty;
+var __propIsEnum$y = 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$y = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$x.call(b, prop))
-      __defNormalProp$K(a, prop, b[prop]);
-  if (__getOwnPropSymbols$x)
-    for (var prop of __getOwnPropSymbols$x(b)) {
-      if (__propIsEnum$x.call(b, prop))
-        __defNormalProp$K(a, prop, b[prop]);
+    if (__hasOwnProp$y.call(b, prop))
+      __defNormalProp$L(a, prop, b[prop]);
+  if (__getOwnPropSymbols$y)
+    for (var prop of __getOwnPropSymbols$y(b)) {
+      if (__propIsEnum$y.call(b, prop))
+        __defNormalProp$L(a, prop, b[prop]);
     }
   return a;
 };
-var __spreadProps$m = (a, b) => __defProps$m(a, __getOwnPropDescs$m(b));
+var __spreadProps$o = (a, b) => __defProps$o(a, __getOwnPropDescs$o(b));
 class OsmAdapter extends TileAdapter {
   addLayer(options) {
     const url = "https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png";
-    return super.addLayer(__spreadProps$m(__spreadValues$x({
+    return super.addLayer(__spreadProps$o(__spreadValues$y({
       name: "OpenStreetMap",
       attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
     }, options), {
@@ -20700,33 +20797,33 @@ class WmsLayerBase extends leafletSrcExports.TileLayer.WMS {
 }
 const WmsLayer = makeRemote(WmsLayerBase);
-var __defProp$J = Object.defineProperty;
-var __defProps$l = Object.defineProperties;
-var __getOwnPropDescs$l = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$w = Object.getOwnPropertySymbols;
-var __hasOwnProp$w = Object.prototype.hasOwnProperty;
-var __propIsEnum$w = 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$w = (a, b) => {
+var __defProp$K = Object.defineProperty;
+var __defProps$n = Object.defineProperties;
+var __getOwnPropDescs$n = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$x = Object.getOwnPropertySymbols;
+var __hasOwnProp$x = Object.prototype.hasOwnProperty;
+var __propIsEnum$x = 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$x = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$w.call(b, prop))
-      __defNormalProp$J(a, prop, b[prop]);
-  if (__getOwnPropSymbols$w)
-    for (var prop of __getOwnPropSymbols$w(b)) {
-      if (__propIsEnum$w.call(b, prop))
-        __defNormalProp$J(a, prop, b[prop]);
+    if (__hasOwnProp$x.call(b, prop))
+      __defNormalProp$K(a, prop, b[prop]);
+  if (__getOwnPropSymbols$x)
+    for (var prop of __getOwnPropSymbols$x(b)) {
+      if (__propIsEnum$x.call(b, prop))
+        __defNormalProp$K(a, prop, b[prop]);
     }
   return a;
 };
-var __spreadProps$l = (a, b) => __defProps$l(a, __getOwnPropDescs$l(b));
+var __spreadProps$n = (a, b) => __defProps$n(a, __getOwnPropDescs$n(b));
 var __objRest$6 = (source, exclude) => {
   var target = {};
   for (var prop in source)
-    if (__hasOwnProp$w.call(source, prop) && exclude.indexOf(prop) < 0)
+    if (__hasOwnProp$x.call(source, prop) && exclude.indexOf(prop) < 0)
       target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols$w)
-    for (var prop of __getOwnPropSymbols$w(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum$w.call(source, prop))
+  if (source != null && __getOwnPropSymbols$x)
+    for (var prop of __getOwnPropSymbols$x(source)) {
+      if (exclude.indexOf(prop) < 0 && __propIsEnum$x.call(source, prop))
         target[prop] = source[prop];
     }
   return target;
@@ -20737,7 +20834,7 @@ class WmsAdapter extends BaseAdapter {
     Object.assign(this.options, options);
     const _a = options, { url } = _a, opt = __objRest$6(_a, ["url"]);
     if (url) {
-      const layerOptions = __spreadValues$w(__spreadValues$w({
+      const layerOptions = __spreadValues$x(__spreadValues$x({
         pane: this.pane,
         attribution: opt.attribution,
         minZoom: opt.minZoom,
@@ -20750,7 +20847,7 @@ class WmsAdapter extends BaseAdapter {
       let layer;
       const request = getLayerRequestOptions(opt);
       if (request) {
-        layer = new WmsLayer(url, __spreadProps$l(__spreadValues$w({}, layerOptions), {
+        layer = new WmsLayer(url, __spreadProps$n(__spreadValues$x({}, layerOptions), {
           request
         }));
       } else {
@@ -20769,23 +20866,23 @@ function arrayToBoundsExpression(bounds) {
   ];
 }
-var __defProp$I = Object.defineProperty;
-var __getOwnPropSymbols$v = Object.getOwnPropertySymbols;
-var __hasOwnProp$v = Object.prototype.hasOwnProperty;
-var __propIsEnum$v = 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$v = (a, b) => {
+var __defProp$J = Object.defineProperty;
+var __getOwnPropSymbols$w = Object.getOwnPropertySymbols;
+var __hasOwnProp$w = Object.prototype.hasOwnProperty;
+var __propIsEnum$w = 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$w = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$v.call(b, prop))
-      __defNormalProp$I(a, prop, b[prop]);
-  if (__getOwnPropSymbols$v)
-    for (var prop of __getOwnPropSymbols$v(b)) {
-      if (__propIsEnum$v.call(b, prop))
-        __defNormalProp$I(a, prop, b[prop]);
+    if (__hasOwnProp$w.call(b, prop))
+      __defNormalProp$J(a, prop, b[prop]);
+  if (__getOwnPropSymbols$w)
+    for (var prop of __getOwnPropSymbols$w(b)) {
+      if (__propIsEnum$w.call(b, prop))
+        __defNormalProp$J(a, prop, b[prop]);
     }
   return a;
 };
-var __publicField$u = (obj, key, value) => __defNormalProp$I(obj, typeof key !== "symbol" ? key + "" : key, value);
+var __publicField$u = (obj, key, value) => __defNormalProp$J(obj, typeof key !== "symbol" ? key + "" : key, value);
 const _LeafletMapAdapter = class _LeafletMapAdapter {
   constructor() {
     __publicField$u(this, "options", { target: "map" });
@@ -20811,7 +20908,7 @@ const _LeafletMapAdapter = class _LeafletMapAdapter {
     ]);
   }
   create(options) {
-    this.options = __spreadValues$v({}, options);
+    this.options = __spreadValues$w({}, options);
     if (this.options.target) {
       const {
         zoom,
@@ -20821,7 +20918,7 @@ const _LeafletMapAdapter = class _LeafletMapAdapter {
         maxBounds: mb,
         mapAdapterOptions
       } = this.options;
-      this.map = this.options.map || new leafletSrcExports.Map(this.options.target, __spreadValues$v({
+      this.map = this.options.map || new leafletSrcExports.Map(this.options.target, __spreadValues$w({
         attributionControl: false,
         zoomControl: false,
         maxBounds: mb ? arrayToBoundsExpression(mb) : void 0,
@@ -21028,10 +21125,10 @@ const _LeafletMapAdapter = class _LeafletMapAdapter {
         }
         const stop2 = () => {
           if (locationfound !== void 0) {
-            map.off("locationfound", locationFound);
+            map.off("locationfound", locationFound, this);
           }
           if (locationerror) {
-            map.off("locationerror", locationerror);
+            map.off("locationerror", locationerror, this);
           }
         };
         return { stop: stop2 };
@@ -21214,19 +21311,19 @@ function template(str, data) {
   });
 }
-var __defProp$H = Object.defineProperty;
-var __getOwnPropSymbols$u = Object.getOwnPropertySymbols;
-var __hasOwnProp$u = Object.prototype.hasOwnProperty;
-var __propIsEnum$u = 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) => {
+var __defProp$I = Object.defineProperty;
+var __getOwnPropSymbols$v = Object.getOwnPropertySymbols;
+var __hasOwnProp$v = Object.prototype.hasOwnProperty;
+var __propIsEnum$v = 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$v = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$u.call(b, prop))
-      __defNormalProp$H(a, prop, b[prop]);
-  if (__getOwnPropSymbols$u)
-    for (var prop of __getOwnPropSymbols$u(b)) {
-      if (__propIsEnum$u.call(b, prop))
-        __defNormalProp$H(a, prop, b[prop]);
+    if (__hasOwnProp$v.call(b, prop))
+      __defNormalProp$I(a, prop, b[prop]);
+  if (__getOwnPropSymbols$v)
+    for (var prop of __getOwnPropSymbols$v(b)) {
+      if (__propIsEnum$v.call(b, prop))
+        __defNormalProp$I(a, prop, b[prop]);
     }
   return a;
 };
@@ -21289,7 +21386,7 @@ function apiRequest(opt) {
         }
       }
       if (url) {
-        return connector.makeQuery(url, params, __spreadValues$u({
+        return connector.makeQuery(url, params, __spreadValues$v({
           cacheName: name
         }, requestOptions));
       } else {
@@ -21301,9 +21398,9 @@ function apiRequest(opt) {
   });
 }
-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$t = (obj, key, value) => __defNormalProp$G(obj, typeof key !== "symbol" ? key + "" : key, value);
+var __defProp$H = Object.defineProperty;
+var __defNormalProp$H = (obj, key, value) => key in obj ? __defProp$H(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField$t = (obj, key, value) => __defNormalProp$H(obj, typeof key !== "symbol" ? key + "" : key, value);
 const _Cache = class _Cache {
   constructor(options = {}) {
     __publicField$t(this, "cache", []);
@@ -21441,7 +21538,7 @@ __publicField$t(_Cache, "instance", {});
 let Cache = _Cache;
 var pkg = {
-	version: "4.0.2"};
+	version: "4.1.1"};
 class AbortError extends Error {
   constructor(message = "AbortError") {
@@ -21450,9 +21547,9 @@ class AbortError extends Error {
   }
 }
-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$s = (obj, key, value) => __defNormalProp$F(obj, typeof key !== "symbol" ? key + "" : key, value);
+var __defProp$G = Object.defineProperty;
+var __defNormalProp$G = (obj, key, value) => key in obj ? __defProp$G(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField$s = (obj, key, value) => __defNormalProp$G(obj, typeof key !== "symbol" ? key + "" : key, value);
 class NgwError extends Error {
   constructor(er) {
     super();
@@ -21469,9 +21566,9 @@ class NgwError extends Error {
   }
 }
-var __defProp$E = Object.defineProperty;
-var __defNormalProp$E = (obj, key, value) => key in obj ? __defProp$E(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField$r = (obj, key, value) => __defNormalProp$E(obj, typeof key !== "symbol" ? key + "" : key, value);
+var __defProp$F = Object.defineProperty;
+var __defNormalProp$F = (obj, key, value) => key in obj ? __defProp$F(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField$r = (obj, key, value) => __defNormalProp$F(obj, typeof key !== "symbol" ? key + "" : key, value);
 class InsufficientPermissionsError extends NgwError {
   constructor(obj) {
     super(obj);
@@ -21481,9 +21578,9 @@ class InsufficientPermissionsError extends NgwError {
   }
 }
-var __defProp$D = Object.defineProperty;
-var __defNormalProp$D = (obj, key, value) => key in obj ? __defProp$D(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField$q = (obj, key, value) => __defNormalProp$D(obj, typeof key !== "symbol" ? key + "" : key, value);
+var __defProp$E = Object.defineProperty;
+var __defNormalProp$E = (obj, key, value) => key in obj ? __defProp$E(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField$q = (obj, key, value) => __defNormalProp$E(obj, typeof key !== "symbol" ? key + "" : key, value);
 let NetworksResponseError$1 = class NetworksResponseError extends NgwError {
   constructor(obj) {
     super(obj);
@@ -21521,14 +21618,14 @@ function extractError(error) {
 function isError(error) {
   if (isObject$1(error)) {
-    return error.status_code && error.exception && error.title;
+    return Boolean(error.status_code && error.exception && error.title);
   }
   return false;
 }
-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$p = (obj, key, value) => __defNormalProp$C(obj, key + "" , value);
+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$p = (obj, key, value) => __defNormalProp$D(obj, key + "" , value);
 class NetworkError extends Error {
   constructor(url) {
     super();
@@ -21539,9 +21636,9 @@ class NetworkError extends Error {
   }
 }
-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$o = (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$o = (obj, key, value) => __defNormalProp$C(obj, typeof key !== "symbol" ? key + "" : key, value);
 class ResourceNotFoundError extends NgwError {
   constructor(obj) {
     super(obj);
@@ -21563,9 +21660,9 @@ var errors = /*#__PURE__*/Object.freeze({
   isError: isError
 });
-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$n = (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$n = (obj, key, value) => __defNormalProp$B(obj, typeof key !== "symbol" ? key + "" : key, value);
 class BaseAPIError extends Error {
   constructor(message) {
     super(message || "Something went wrong.");
@@ -21627,30 +21724,33 @@ class LunkwillRequestFailed extends LunkwillError {
   }
 }
-var __defProp$z = Object.defineProperty;
-var __getOwnPropSymbols$t = Object.getOwnPropertySymbols;
-var __hasOwnProp$t = Object.prototype.hasOwnProperty;
-var __propIsEnum$t = 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$t = (a, b) => {
+var __defProp$A = Object.defineProperty;
+var __defProps$m = Object.defineProperties;
+var __getOwnPropDescs$m = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$u = Object.getOwnPropertySymbols;
+var __hasOwnProp$u = Object.prototype.hasOwnProperty;
+var __propIsEnum$u = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$A = (obj, key, value) => key in obj ? __defProp$A(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$u = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$t.call(b, prop))
-      __defNormalProp$z(a, prop, b[prop]);
-  if (__getOwnPropSymbols$t)
-    for (var prop of __getOwnPropSymbols$t(b)) {
-      if (__propIsEnum$t.call(b, prop))
-        __defNormalProp$z(a, prop, b[prop]);
+    if (__hasOwnProp$u.call(b, prop))
+      __defNormalProp$A(a, prop, b[prop]);
+  if (__getOwnPropSymbols$u)
+    for (var prop of __getOwnPropSymbols$u(b)) {
+      if (__propIsEnum$u.call(b, prop))
+        __defNormalProp$A(a, prop, b[prop]);
     }
   return a;
 };
+var __spreadProps$m = (a, b) => __defProps$m(a, __getOwnPropDescs$m(b));
 var __objRest$5 = (source, exclude) => {
   var target = {};
   for (var prop in source)
-    if (__hasOwnProp$t.call(source, prop) && exclude.indexOf(prop) < 0)
+    if (__hasOwnProp$u.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))
+  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;
@@ -21682,40 +21782,60 @@ function lunkwillCheckResponse(lwResp) {
 function responseJson(response) {
   return __async$r(this, null, function* () {
     try {
-      return response.json();
+      return yield response.json();
     } catch (e) {
-      throw new Error();
+      throw new InvalidResponseError();
     }
   });
 }
-function lunkwillResponseUrl(lwResp) {
+function lunkwillResponseUrl(lwResp, opt) {
   return __async$r(this, null, function* () {
+    var _a, _b, _c, _d;
     const lwData = yield responseJson(lwResp);
-    let delay = lwData.delay_ms;
-    const retry = lwData.retry_ms !== void 0 ? lwData.retry_ms : 2e3;
+    if (lwData.id == null) {
+      throw new LunkwillError(void 0, lwData);
+    }
+    let delay = (_a = lwData.delay_ms) != null ? _a : 0;
+    const retry = (_b = lwData.retry_ms) != null ? _b : 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;
+    const sleep = (msec) => new Promise((resolve, reject) => {
+      const signal = opt.signal;
+      const aborted = () => (signal == null ? void 0 : signal.reason) instanceof Error ? signal.reason : new DOMException("Aborted", "AbortError");
+      if (signal == null ? void 0 : signal.aborted) return reject(aborted());
+      const onAbort = () => {
+        clearTimeout(timer);
+        reject(aborted());
+      };
+      const timer = setTimeout(() => {
+        signal == null ? void 0 : signal.removeEventListener("abort", onAbort);
+        resolve();
+      }, msec);
+      signal == null ? void 0 : signal.addEventListener("abort", onAbort, { once: true });
+    });
+    let failures = 0;
+    while (true) {
+      yield sleep(failures ? retry : delay);
       let lwData2;
       try {
-        lwResp2 = yield fetch(sum, { credentials: "same-origin" });
-        lwData2 = yield lwResp2.json();
-      } catch (e) {
-        failed = true;
+        const response = yield fetch(sum, {
+          credentials: opt.credentials,
+          headers: opt.headers,
+          signal: opt.signal
+        });
+        if (!response.ok) {
+          throw new Error(`Lunkwill HTTP ${response.status}`);
+        }
+        lwData2 = yield responseJson(response);
+        failures = 0;
+      } catch (error) {
+        if ((_c = opt.signal) == null ? void 0 : _c.aborted) throw error;
+        if (++failures >= 5) throw new NetworksResponseError();
         continue;
       }
       switch (lwData2.status) {
-        case void 0:
-          throw new LunkwillError(void 0, lwData2);
         case "ready":
-          ready = true;
-          break;
+          return res;
         case "cancelled":
           throw new LunkwillRequestCancelled(lwData2);
         case "failed":
@@ -21723,20 +21843,25 @@ function lunkwillResponseUrl(lwResp) {
         case "spooled":
         case "processing":
         case "buffering":
-          delay = lwData2.delay_ms;
+          delay = (_d = lwData2.delay_ms) != null ? _d : 2e3;
           break;
         default:
           throw new LunkwillError(void 0, lwData2);
       }
     }
-    return res;
   });
 }
-function lunkwillFetch(lwRespUrl) {
+function lunkwillFetch(url, opt) {
   return __async$r(this, null, function* () {
+    var _a;
     try {
-      return yield window.fetch(lwRespUrl, { credentials: "same-origin" });
-    } catch (e) {
+      return yield fetch(url, {
+        credentials: opt.credentials,
+        headers: opt.headers,
+        signal: opt.signal
+      });
+    } catch (error) {
+      if ((_a = opt.signal) == null ? void 0 : _a.aborted) throw error;
       throw new NetworksResponseError();
     }
   });
@@ -21788,7 +21913,7 @@ function request(path, options, cacheEngine) {
       credentials: "same-origin",
       headers: {}
     };
-    const _a = __spreadValues$t(__spreadValues$t({}, defaults), options), {
+    const _a = __spreadValues$u(__spreadValues$u({}, defaults), options), {
       withCredentials,
       responseType,
       cacheProps,
@@ -21808,7 +21933,7 @@ function request(path, options, cacheEngine) {
       "json"
     ]);
     opt.method = (_b = opt.method) == null ? void 0 : _b.toUpperCase();
-    if (withCredentials) {
+    if (withCredentials && (options == null ? void 0 : options.credentials) === void 0) {
       opt.credentials = "include";
     }
     let useLunkwill = false;
@@ -21836,11 +21961,37 @@ function request(path, options, cacheEngine) {
         throw new NetworksResponseError();
       }
       if (useLunkwill && lunkwillCheckResponse(response)) {
-        const lwRespUrl = yield lunkwillResponseUrl(response);
+        const lwRespUrl = yield lunkwillResponseUrl(response, opt);
         if (lunkwillReturnUrl) {
           return lwRespUrl;
         }
-        response = yield lunkwillFetch(lwRespUrl);
+        response = yield lunkwillFetch(lwRespUrl, opt);
+      }
+      if (!response.ok) {
+        let responseText;
+        try {
+          responseText = yield response.text();
+        } catch (e) {
+          if (e.name === "AbortError") throw e;
+          throw new InvalidResponseError();
+        }
+        let errorBody = responseText;
+        if (responseText) {
+          try {
+            errorBody = JSON.parse(responseText);
+          } catch (e) {
+          }
+        }
+        const fallback = response.statusText || `HTTP ${response.status}`;
+        const data = errorBody && typeof errorBody === "object" && !Array.isArray(errorBody) ? __spreadProps$m(__spreadValues$u({}, errorBody), {
+          message: typeof errorBody.message === "string" && errorBody.message ? errorBody.message : fallback
+        }) : {
+          message: typeof errorBody === "string" && errorBody.trim() ? errorBody : fallback
+        };
+        throw new ServerResponseError(data);
+      }
+      if (response.status === 204 || response.status === 205) {
+        return void 0;
       }
       const respCType = response.headers.get("content-type");
       const respJSON = respCType && (respCType.includes("application/json") || respCType.includes("application/vnd.lunkwill.request-summary+json"));
@@ -21860,15 +22011,12 @@ function request(path, options, cacheEngine) {
         }
         throw new InvalidResponseError();
       }
-      if (400 <= response.status && response.status <= 599) {
-        throw new ServerResponseError(body);
-      }
       return body;
     });
     if (cacheEngine) {
       if (((_c = opt.method) == null ? void 0 : _c.toUpperCase()) === "GET") {
         if (cache !== false) {
-          const props = cacheProps ? cacheProps : __spreadValues$t({}, objectRemoveEmpty({
+          const props = cacheProps ? cacheProps : __spreadValues$u({}, objectRemoveEmpty({
             withCredentials,
             responseType
           }));
@@ -21888,33 +22036,33 @@ function request(path, options, cacheEngine) {
   });
 }
-var __defProp$y = Object.defineProperty;
-var __defProps$k = Object.defineProperties;
-var __getOwnPropDescs$k = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$s = Object.getOwnPropertySymbols;
-var __hasOwnProp$s = Object.prototype.hasOwnProperty;
-var __propIsEnum$s = 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$s = (a, b) => {
+var __defProp$z = Object.defineProperty;
+var __defProps$l = Object.defineProperties;
+var __getOwnPropDescs$l = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$t = Object.getOwnPropertySymbols;
+var __hasOwnProp$t = Object.prototype.hasOwnProperty;
+var __propIsEnum$t = 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$t = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$s.call(b, prop))
-      __defNormalProp$y(a, prop, b[prop]);
-  if (__getOwnPropSymbols$s)
-    for (var prop of __getOwnPropSymbols$s(b)) {
-      if (__propIsEnum$s.call(b, prop))
-        __defNormalProp$y(a, prop, b[prop]);
+    if (__hasOwnProp$t.call(b, prop))
+      __defNormalProp$z(a, prop, b[prop]);
+  if (__getOwnPropSymbols$t)
+    for (var prop of __getOwnPropSymbols$t(b)) {
+      if (__propIsEnum$t.call(b, prop))
+        __defNormalProp$z(a, prop, b[prop]);
     }
   return a;
 };
-var __spreadProps$k = (a, b) => __defProps$k(a, __getOwnPropDescs$k(b));
+var __spreadProps$l = (a, b) => __defProps$l(a, __getOwnPropDescs$l(b));
 var __objRest$4 = (source, exclude) => {
   var target = {};
   for (var prop in source)
-    if (__hasOwnProp$s.call(source, prop) && exclude.indexOf(prop) < 0)
+    if (__hasOwnProp$t.call(source, prop) && exclude.indexOf(prop) < 0)
       target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols$s)
-    for (var prop of __getOwnPropSymbols$s(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum$s.call(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;
@@ -21998,10 +22146,10 @@ function route(name, connector, ...rest) {
           routeData,
           ...rest
         );
-        const headers = objectRemoveEmpty(__spreadValues$s(__spreadValues$s({}, connector.getAuthorizationHeaders()), optHeaders != null ? optHeaders : {}));
+        const headers = objectRemoveEmpty(__spreadValues$t(__spreadValues$t({}, connector.getAuthorizationHeaders()), optHeaders != null ? optHeaders : {}));
         return request(
           template,
-          __spreadProps$k(__spreadValues$s({
+          __spreadProps$l(__spreadValues$t({
             headers
           }, restOpt), {
             method
@@ -22019,6 +22167,34 @@ function isObject(val) {
   return Object.prototype.toString.call(val) === "[object Object]";
 }
+var __defProp$y = Object.defineProperty;
+var __defProps$k = Object.defineProperties;
+var __getOwnPropDescs$k = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$s = Object.getOwnPropertySymbols;
+var __hasOwnProp$s = Object.prototype.hasOwnProperty;
+var __propIsEnum$s = 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$s = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp$s.call(b, prop))
+      __defNormalProp$y(a, prop, b[prop]);
+  if (__getOwnPropSymbols$s)
+    for (var prop of __getOwnPropSymbols$s(b)) {
+      if (__propIsEnum$s.call(b, prop))
+        __defNormalProp$y(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps$k = (a, b) => __defProps$k(a, __getOwnPropDescs$k(b));
+function createHttpError(status, statusText, response) {
+  const details = isObject(response) ? response : {};
+  const message = typeof details.message === "string" && details.message ? details.message : typeof response === "string" && response.trim() ? response : statusText || `HTTP ${status}`;
+  return new NgwError(__spreadProps$k(__spreadValues$s({}, details), {
+    status_code: status,
+    title: typeof details.title === "string" && details.title ? details.title : `HTTP ${status}`,
+    message
+  }));
+}
 let loadData;
 {
   loadData = (url, callback, options = {}, error, onCancel) => {
@@ -22035,23 +22211,21 @@ let loadData;
         return xhr.responseText;
       }
     };
-    const processingResponse = (forError = false) => {
-      const cb = forError ? error : callback;
+    xhr.onload = () => {
+      if (xhr.status < 200 || xhr.status >= 300) {
+        const response = options.responseType === "blob" || !xhr.responseText ? void 0 : getResponseText();
+        error(createHttpError(xhr.status, xhr.statusText, response));
+        return;
+      }
+      if (xhr.status === 204 || xhr.status === 205) {
+        callback(void 0);
+        return;
+      }
       if (options.responseType === "blob") {
-        cb(xhr.response);
+        callback(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()));
+        callback(xhr.responseText ? getResponseText() : void 0);
       }
-      processingResponse();
     };
     xhr.onerror = (er) => {
       if (xhr.status === 0) {
@@ -22086,7 +22260,7 @@ let loadData;
       data.append("file", options.file);
       if (options.data) {
         for (const d in options.data) {
-          data.append(d, data[d]);
+          data.append(d, options.data[d]);
         }
       }
     } else {
@@ -22106,16 +22280,15 @@ function addConnector(connector) {
   CONNECTORS.push(connector);
 }
 function findConnector(options) {
-  return CONNECTORS.find((x) => {
-    if (x.options.baseUrl === options.baseUrl) {
-      if (options.auth) {
-        if (x.options.auth) {
-          return objectDeepEqual(x.options.auth, options.auth);
-        }
-      } else {
-        return true;
-      }
+  return CONNECTORS.find((connector) => {
+    const existing = connector.options;
+    if (existing.baseUrl !== options.baseUrl || existing.route !== options.route || existing.cacheId !== options.cacheId || connector.withCredentials !== options.withCredentials || existing.requestTransform !== options.requestTransform) {
+      return false;
+    }
+    if (!existing.auth || !options.auth) {
+      return !existing.auth && !options.auth;
     }
+    return objectDeepEqual(existing.auth, options.auth);
   });
 }
 function removeConnector(connector) {
@@ -22221,6 +22394,7 @@ class NgwConnector {
   }
   setRequestTransform(requestTransform) {
     this.requestTransform = requestTransform;
+    this.options.requestTransform = requestTransform != null ? requestTransform : void 0;
   }
   /**
    * Fast way to specify the connection address to NextGIS Web.
@@ -22367,23 +22541,31 @@ class NgwConnector {
         responseType,
         withCredentials
       } = options;
-      const internalAbortController = new AbortController();
-      const internalSignal = internalAbortController.signal;
-      if (externalSignal) {
-        if (externalSignal.aborted) {
-          throw new AbortError();
-        }
-        externalSignal.addEventListener("abort", () => {
-          internalAbortController.abort();
-        });
+      if (externalSignal == null ? void 0 : externalSignal.aborted) {
+        throw new AbortError();
       }
-      options.signal = internalSignal;
       const createPromise = () => __async$p(this, null, function* () {
+        const internalAbortController = new AbortController();
+        const onExternalAbort = () => internalAbortController.abort();
+        if (externalSignal) {
+          externalSignal.addEventListener("abort", onExternalAbort, {
+            once: true
+          });
+          if (externalSignal.aborted) {
+            internalAbortController.abort();
+          }
+        }
         const id = REQUEST_ID++;
         this.activeRequests[id] = internalAbortController;
         try {
-          return this._loadData(url, options);
+          if (internalAbortController.signal.aborted) {
+            throw new AbortError();
+          }
+          return yield this._loadData(url, __spreadProps$j(__spreadValues$r({}, options), {
+            signal: internalAbortController.signal
+          }));
         } finally {
+          externalSignal == null ? void 0 : externalSignal.removeEventListener("abort", onExternalAbort);
           this._cleanActiveRequest(id);
         }
       });
@@ -22803,7 +22985,9 @@ class NgwConnectorExtended extends NgwConnector {
    */
   clearCache() {
     super.clearCache();
-    this.resources.cache.clean();
+    if (this.resources.cache !== this.cache) {
+      this.resources.cache.clean();
+    }
   }
   /**
    * Send request to NGW api router.
@@ -23041,11 +23225,12 @@ function fetchNgwLayerExtent({
   signal
 }) {
   return connector.route("layer.extent", { id: Number(resourceId) }).get({ cache, signal }).then((resp) => {
-    if (resp) {
-      const { maxLat, maxLon, minLat, minLon } = resp.extent;
-      const extentArray = [minLon, minLat, maxLon, maxLat];
-      return extentArray;
+    if (!(resp == null ? void 0 : resp.extent)) {
+      return void 0;
     }
+    const { maxLat, maxLon, minLat, minLon } = resp.extent;
+    const extentArray = [minLon, minLat, maxLon, maxLat];
+    return extentArray;
   });
 }
 function fetchNgwLayerItemExtent({
@@ -24104,8 +24289,8 @@ const _CheckProperty = class _CheckProperty extends BaseProperty {
   }
   getHierarchyValue() {
     return this.get() && this.getParents().every((x) => {
-      const property = x.properties && x.properties.get(this.name);
-      return property && property.get();
+      var _a;
+      return Boolean((_a = x.properties) == null ? void 0 : _a.get(this.name));
     });
   }
   block(options) {
@@ -27315,7 +27500,11 @@ class NgwImageLayerGrouping {
     __publicField$1(this, "timer");
     __publicField$1(this, "pending", Promise.resolve());
     __publicField$1(this, "disposed", false);
+    __publicField$1(this, "revision", 0);
     __publicField$1(this, "onLayerChange", (layer) => {
+      if (!this.isVisible(layer)) {
+        this.invalidateGroupsContaining(layer, true);
+      }
       if (this.webMap.allLayers()[String(layer.id)] === layer) {
         this.observe(layer);
       } else {
@@ -27332,12 +27521,14 @@ class NgwImageLayerGrouping {
       this.schedule();
     });
     __publicField$1(this, "onBeforeLayerRemove", (layer) => {
+      this.invalidateGroupsContaining(layer, true);
       const container = layer;
       if (typeof container.getDependLayers !== "function") return;
       for (const item of container.getDependLayers()) {
         const child = item.layer;
         if (!child) continue;
         this.detached.add(child);
+        this.invalidateGroupsContaining(child, true);
         const update = this.originalUpdates.get(child);
         if (update) child.updateLayer = update;
         this.originalUpdates.delete(child);
@@ -27349,6 +27540,7 @@ class NgwImageLayerGrouping {
       for (const layer of this.webMap.orderedLayers()) {
         if (layer.id === (event == null ? void 0 : event.layerId)) {
           this.excluded.add(layer);
+          this.invalidateGroupsContaining(layer);
           this.schedule();
           break;
         }
@@ -27405,6 +27597,7 @@ class NgwImageLayerGrouping {
   /** Re-evaluate grouping after any observed layer state change. */
   schedule() {
     if (this.disposed) return;
+    this.revision++;
     if (this.timer) clearTimeout(this.timer);
     this.timer = setTimeout(() => {
       this.timer = void 0;
@@ -27422,7 +27615,12 @@ class NgwImageLayerGrouping {
     if (this.opacityListeners.has(layer)) return;
     const native = layer.layer;
     if (!(native == null ? void 0 : native.on) || !native.off && !native.un) return;
-    const listener = () => this.schedule();
+    const listener = () => {
+      if (this.getOpacity(layer) !== 1) {
+        this.invalidateGroupsContaining(layer);
+      }
+      this.schedule();
+    };
     native.on("change:opacity", listener);
     native.on("opacitychange", listener);
     this.opacityListeners.set(layer, () => {
@@ -27462,6 +27660,7 @@ class NgwImageLayerGrouping {
     this.originalUpdates.set(layer, original);
     layer.updateLayer = (options) => {
       this.excluded.add(layer);
+      this.invalidateGroupsContaining(layer);
       this.schedule();
       return original.call(layer, options);
     };
@@ -27528,7 +27727,6 @@ class NgwImageLayerGrouping {
   /** Render-only IMAGE: exists on the native map, not in WebMap._layers. */
   createNativeGroup(options) {
     return __async$2(this, null, function* () {
-      var _a;
       const ImageAdapter = this.webMap.getLayerAdapter("IMAGE");
       if (!ImageAdapter) throw new Error("IMAGE adapter is unavailable");
       const adapter = new ImageAdapter(this.webMap.mapAdapter.map, options);
@@ -27537,13 +27735,6 @@ class NgwImageLayerGrouping {
       if (native === void 0)
         throw new Error("IMAGE adapter returned no layer");
       adapter.layer = native;
-      try {
-        this.webMap.mapAdapter.showLayer(native);
-        this.webMap.mapAdapter.setLayerOrder(native, (_a = options.order) != null ? _a : 0);
-      } catch (error) {
-        this.webMap.mapAdapter.removeLayer(native);
-        throw error;
-      }
       return adapter;
     });
   }
@@ -27558,10 +27749,27 @@ class NgwImageLayerGrouping {
       this.webMap.mapAdapter.removeLayer(adapter.layer);
     }
   }
+  /** Remove obsolete composites and restore remaining native members immediately. */
+  invalidateGroupsContaining(layer, skipRestore = false) {
+    for (const [key, group] of this.groups) {
+      if (!group.members.includes(layer)) continue;
+      this.removeGroup(group);
+      this.groups.delete(key);
+      for (const member of group.members) {
+        if (!this.suppressed.delete(member)) continue;
+        if (member === layer && skipRestore) continue;
+        if (this.isVisible(member) && member.layer !== void 0) {
+          this.webMap.mapAdapter.showLayer(member.layer);
+          this.webMap.mapAdapter.setLayerOrder(member.layer, member.order);
+        }
+      }
+    }
+  }
   reconcile() {
     return __async$2(this, null, function* () {
-      var _a, _b;
+      var _a, _b, _c;
       if (this.disposed) return;
+      const revision = this.revision;
       const chunks = this.plan();
       const desired = new Map(
         chunks.map((chunk) => [
@@ -27619,10 +27827,21 @@ class NgwImageLayerGrouping {
           visibility: true,
           updateWmsParams: (params) => updateImageParams(params, resources)
         });
-        let layer;
+        let layer = void 0;
         try {
           layer = yield this.createNativeGroup(options);
+          if (this.disposed || this.revision !== revision) {
+            this.removeGroup({ layer, members: [] });
+            return;
+          }
+          if (layer.layer !== void 0) {
+            this.webMap.mapAdapter.showLayer(layer.layer);
+            this.webMap.mapAdapter.setLayerOrder(layer.layer, (_c = options.order) != null ? _c : 0);
+          }
         } catch (error) {
+          if (layer) {
+            this.removeGroup({ layer, members: [] });
+          }
           for (const { layer: member } of chunk) {
             this.excluded.add(member);
             if (this.suppressed.has(member)) {
@@ -27794,7 +28013,7 @@ const _NgwMap = class _NgwMap extends WebMap {
             adapterOpts
           );
           const id = layer && this.getLayerId(layer);
-          if (layer && id) {
+          if (layer && id && this.getLayer(id) === layer) {
             this._ngwLayers[id] = { layer, resourceId: layer.resourceId };
             layer.options.name = layer.options.name || layer.item && layer.item.resource.display_name;
             if (layer.options.baselayer) {
@@ -27847,43 +28066,44 @@ const _NgwMap = class _NgwMap extends WebMap {
     }, options));
   }
   fetchIdentifyItem(identify, requestOptions) {
-    const abortController = new AbortController();
-    const abortSignal = abortController.signal;
-    if (requestOptions == null ? void 0 : requestOptions.signal) {
-      requestOptions.signal.addEventListener("abort", abortController.abort);
-    }
-    requestOptions = requestOptions || {};
-    requestOptions.signal = abortSignal;
-    const promise = fetchIdentifyItem({
-      identify,
-      connector: this.connector,
-      requestOptions
-      // multiple,
+    return __async$1(this, null, function* () {
+      const abortSignal = requestOptions == null ? void 0 : requestOptions.signal;
+      if (abortSignal == null ? void 0 : abortSignal.aborted) throw new NgwConnectorExtended.errors.AbortError();
+      const abortController = new AbortController();
+      const onAbort = () => abortController.abort();
+      abortSignal == null ? void 0 : abortSignal.addEventListener("abort", onAbort, { once: true });
+      try {
+        const promise = fetchIdentifyItem({
+          identify,
+          connector: this.connector,
+          requestOptions: __spreadProps$1(__spreadValues$1({}, requestOptions), { signal: abortController.signal })
+        });
+        this._addPromise("identify", promise, abortController);
+        return yield promise;
+      } finally {
+        abortSignal == null ? void 0 : abortSignal.removeEventListener("abort", onAbort);
+      }
     });
-    this._addPromise("identify", promise, abortController);
-    return promise;
   }
-  fetchIdentifyGeoJson(identify, { multiple, signal } = {}) {
-    const abortController = new AbortController();
-    if (signal) {
-      if (signal.aborted) {
-        return Promise.reject(new NgwConnectorExtended.errors.AbortError());
+  fetchIdentifyGeoJson(_0) {
+    return __async$1(this, arguments, function* (identify, { multiple, signal } = {}) {
+      if (signal == null ? void 0 : signal.aborted) throw new NgwConnectorExtended.errors.AbortError();
+      const abortController = new AbortController();
+      const onAbort = () => abortController.abort();
+      signal == null ? void 0 : signal.addEventListener("abort", onAbort, { once: true });
+      try {
+        const promise = fetchIdentifyGeoJson({
+          identify,
+          connector: this.connector,
+          multiple,
+          requestOptions: { signal: abortController.signal }
+        });
+        this._addPromise("identify", promise, abortController);
+        return yield promise;
+      } finally {
+        signal == null ? void 0 : signal.removeEventListener("abort", onAbort);
       }
-      signal.addEventListener("abort", () => {
-        abortController.abort("AbortError");
-      });
-    }
-    const promise = fetchIdentifyGeoJson({
-      identify,
-      connector: this.connector,
-      requestOptions: { signal: abortController.signal }
     });
-    if (promise && "then" in promise) {
-      this._addPromise("identify", promise, abortController);
-      return promise;
-    } else {
-      return Promise.resolve(promise);
-    }
   }
   /**
    * @deprecated use {@link fetchIdentifyGeoJson} instead
@@ -27935,7 +28155,7 @@ const _NgwMap = class _NgwMap extends WebMap {
     return __async$1(this, null, function* () {
       let id;
       if (typeof layerDef === "string" || typeof layerDef === "number") {
-        id = String(id);
+        id = String(layerDef);
       } else {
         id = layerDef.id;
       }
@@ -27955,11 +28175,11 @@ const _NgwMap = class _NgwMap extends WebMap {
             item = yield this.connector.getResource(resourceId);
           }
           if (item) {
-            this.fitResource(item.resource.id);
+            yield this.fitResource(item.resource.id);
           }
         }
       } else {
-        __superGet(_NgwMap.prototype, this, "fitLayer").call(
+        yield __superGet(_NgwMap.prototype, this, "fitLayer").call(
           this,
           typeof layerDef === "number" ? String(layerDef) : layerDef,
           options
@@ -27989,10 +28209,11 @@ const _NgwMap = class _NgwMap extends WebMap {
     return super.onLoad(event);
   }
   removeLayer(layerDef) {
+    var _a;
     const layer = this.getLayer(layerDef);
     if (layer) {
       const layerId = this.getLayerId(layer);
-      if (layerId) {
+      if (layerId && ((_a = this._ngwLayers[layerId]) == null ? void 0 : _a.layer) === layer) {
         delete this._ngwLayers[layerId];
       }
       super.removeLayer(layer);