@nextgis/ngw-leaflet 2.4.1 → 2.5.1

package/lib/ngw-leaflet.global.js

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/ngw-leaflet; version: 2.4.1; author: NextGIS */
+/** Bundle of @nextgis/ngw-leaflet; version: 2.5.1; author: NextGIS */
 var NgwLeaflet = (function () {
   'use strict';
 
@@ -14933,7 +14933,7 @@ var NgwLeaflet = (function () {
   }
 
   function round(val, toFixed) {
-    const n = toFixed ? Number("1e+" + toFixed) : 1;
+    const n = 1;
     return Math.round((val + Number.EPSILON) * n) / n;
   }
 
@@ -16158,8 +16158,8 @@ var NgwLeaflet = (function () {
   }
 
   var __defProp$U = Object.defineProperty;
-  var __defProps$j = Object.defineProperties;
-  var __getOwnPropDescs$j = Object.getOwnPropertyDescriptors;
+  var __defProps$l = Object.defineProperties;
+  var __getOwnPropDescs$l = Object.getOwnPropertyDescriptors;
   var __getOwnPropSymbols$y = Object.getOwnPropertySymbols;
   var __hasOwnProp$y = Object.prototype.hasOwnProperty;
   var __propIsEnum$y = Object.prototype.propertyIsEnumerable;
@@ -16175,7 +16175,7 @@ var NgwLeaflet = (function () {
       }
     return a;
   };
-  var __spreadProps$j = (a, b) => __defProps$j(a, __getOwnPropDescs$j(b));
+  var __spreadProps$l = (a, b) => __defProps$l(a, __getOwnPropDescs$l(b));
   var __objRest$4 = (source, exclude) => {
     var target = {};
     for (var prop in source)
@@ -16188,7 +16188,7 @@ var NgwLeaflet = (function () {
       }
     return target;
   };
-  var __publicField$G = (obj, key, value) => __defNormalProp$U(obj, typeof key !== "symbol" ? key + "" : key, value);
+  var __publicField$G = (obj, key, value) => __defNormalProp$U(obj, key + "" , value);
   class GeoJsonPaint {
     constructor(layer) {
       __publicField$G(this, "layer");
@@ -16270,7 +16270,7 @@ var NgwLeaflet = (function () {
       if (html) {
         element.innerHTML = html;
       }
-      const divIcon = new leafletSrcExports.DivIcon(__spreadProps$j(__spreadValues$x({
+      const divIcon = new leafletSrcExports.DivIcon(__spreadProps$l(__spreadValues$x({
         className: ""
       }, toLIconOpt), {
         html: element
@@ -16319,8 +16319,8 @@ var NgwLeaflet = (function () {
   }
 
   var __defProp$T = Object.defineProperty;
-  var __defProps$i = Object.defineProperties;
-  var __getOwnPropDescs$i = Object.getOwnPropertyDescriptors;
+  var __defProps$k = Object.defineProperties;
+  var __getOwnPropDescs$k = Object.getOwnPropertyDescriptors;
   var __getOwnPropSymbols$x = Object.getOwnPropertySymbols;
   var __hasOwnProp$x = Object.prototype.hasOwnProperty;
   var __propIsEnum$x = Object.prototype.propertyIsEnumerable;
@@ -16336,7 +16336,7 @@ var NgwLeaflet = (function () {
       }
     return a;
   };
-  var __spreadProps$i = (a, b) => __defProps$i(a, __getOwnPropDescs$i(b));
+  var __spreadProps$k = (a, b) => __defProps$k(a, __getOwnPropDescs$k(b));
   var __publicField$F = (obj, key, value) => __defNormalProp$T(obj, typeof key !== "symbol" ? key + "" : key, value);
   var __async$l = (__this, __arguments, generator) => {
     return new Promise((resolve, reject) => {
@@ -16385,7 +16385,7 @@ var NgwLeaflet = (function () {
     addLayer(options) {
       Object.assign(this.options, options);
       this.paint = options.paint;
-      this.layer = new leafletSrcExports.FeatureGroup([], __spreadProps$i(__spreadValues$w({}, options.nativeOptions), {
+      this.layer = new leafletSrcExports.FeatureGroup([], __spreadProps$k(__spreadValues$w({}, options.nativeOptions), {
         pane: this.pane
       }));
       this.selectedPaint = options.selectedPaint;
@@ -16735,7 +16735,7 @@ var NgwLeaflet = (function () {
               if (feature) {
                 return this._paint.preparePaint(__spreadValues$w(__spreadValues$w({}, PAINT), paint(feature)));
               } else {
-                return this._paint.preparePaint(__spreadProps$i(__spreadValues$w({}, PAINT), { type: "path" }));
+                return this._paint.preparePaint(__spreadProps$k(__spreadValues$w({}, PAINT), { type: "path" }));
               }
             }
           };
@@ -16895,7 +16895,11 @@ var NgwLeaflet = (function () {
     }
   }
 
-  function callAjax(src, headers) {
+  function callAjax({
+    src,
+    headers,
+    withCredentials
+  }) {
     let abortFunc = () => {
     };
     const promise = new Promise((resolve, reject) => {
@@ -16905,6 +16909,9 @@ var NgwLeaflet = (function () {
       for (const h in headers) {
         xhr.setRequestHeader(h, headers[h]);
       }
+      if (withCredentials) {
+        xhr.withCredentials = withCredentials;
+      }
       xhr.onload = function() {
         const arrayBufferView = new Uint8Array(this.response);
         const blob = new Blob([arrayBufferView], { type: "image/png" });
@@ -17013,7 +17020,7 @@ var NgwLeaflet = (function () {
 
   var __defProp$R = Object.defineProperty;
   var __defNormalProp$R = (obj, key, value) => key in obj ? __defProp$R(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __publicField$D = (obj, key, value) => __defNormalProp$R(obj, typeof key !== "symbol" ? key + "" : key, value);
+  var __publicField$D = (obj, key, value) => __defNormalProp$R(obj, key + "" , value);
   class ImageOverlay extends leafletSrcExports.ImageOverlay {
     constructor(imageUrl, bounds, options) {
       super(imageUrl, bounds, options);
@@ -17027,12 +17034,16 @@ var NgwLeaflet = (function () {
     }
     _initImage() {
       super._initImage();
-      const headers = this.options.headers;
+      const { headers, withCredentials } = this.options;
       const img = this._image;
       const src = img.src;
       img.src = "";
       imageQueue.add(() => {
-        const [promise, abortFunc] = callAjax(src, headers);
+        const [promise, abortFunc] = callAjax({
+          src,
+          headers,
+          withCredentials
+        });
         promise.then((imgUrl) => {
           img.src = imgUrl;
         });
@@ -17066,6 +17077,7 @@ var NgwLeaflet = (function () {
         minZoom: 0,
         pane: "tilePane",
         headers: null,
+        withCredentials: false,
         viewPortBuffer: 0,
         setViewDelay: 100
       });
@@ -17135,7 +17147,8 @@ var NgwLeaflet = (function () {
       const overlay = new ImageOverlay(url, bounds, {
         opacity: 0,
         pane: this.options.pane,
-        headers: this.options.headers
+        headers: this.options.headers,
+        withCredentials: this.options.withCredentials
       });
       overlay.addTo(this._map);
       this._loadedOverlay = overlay;
@@ -17288,13 +17301,13 @@ var NgwLeaflet = (function () {
         }
       }
       createTile(coords, done) {
-        const url = this.getTileUrl(coords);
+        const src = this.getTileUrl(coords);
         const tile = document.createElement("img");
-        const [promise, abortFunc] = callAjax(
-          url,
-          // @ts-ignore
-          this.options.headers
-        );
+        const [promise, abortFunc] = callAjax({
+          src,
+          withCredentials: this.options.withCredentials,
+          headers: this.options.headers
+        });
         promise.then((response) => {
           tile.src = response;
           done(null, tile);
@@ -17338,8 +17351,8 @@ var NgwLeaflet = (function () {
   const TileLayer = makeRemote(TileLayerBase);
 
   var __defProp$O = Object.defineProperty;
-  var __defProps$h = Object.defineProperties;
-  var __getOwnPropDescs$h = Object.getOwnPropertyDescriptors;
+  var __defProps$j = Object.defineProperties;
+  var __getOwnPropDescs$j = Object.getOwnPropertyDescriptors;
   var __getOwnPropSymbols$v = Object.getOwnPropertySymbols;
   var __hasOwnProp$v = Object.prototype.hasOwnProperty;
   var __propIsEnum$v = Object.prototype.propertyIsEnumerable;
@@ -17355,7 +17368,7 @@ var NgwLeaflet = (function () {
       }
     return a;
   };
-  var __spreadProps$h = (a, b) => __defProps$h(a, __getOwnPropDescs$h(b));
+  var __spreadProps$j = (a, b) => __defProps$j(a, __getOwnPropDescs$j(b));
   var __objRest$3 = (source, exclude) => {
     var target = {};
     for (var prop in source)
@@ -17384,9 +17397,10 @@ var NgwLeaflet = (function () {
             tileLayerOptions.subdomains = opt.subdomains;
           }
           let layer;
-          if (opt.headers) {
-            layer = new TileLayer(url, __spreadProps$h(__spreadValues$u({}, tileLayerOptions), {
+          if (opt.headers || opt.withCredentials) {
+            layer = new TileLayer(url, __spreadProps$j(__spreadValues$u({}, tileLayerOptions), {
               headers: opt.headers,
+              withCredentials: opt.withCredentials,
               setViewDelay: opt.setViewDelay
             }));
           } else {
@@ -17409,8 +17423,8 @@ var NgwLeaflet = (function () {
   }
 
   var __defProp$N = Object.defineProperty;
-  var __defProps$g = Object.defineProperties;
-  var __getOwnPropDescs$g = Object.getOwnPropertyDescriptors;
+  var __defProps$i = Object.defineProperties;
+  var __getOwnPropDescs$i = Object.getOwnPropertyDescriptors;
   var __getOwnPropSymbols$u = Object.getOwnPropertySymbols;
   var __hasOwnProp$u = Object.prototype.hasOwnProperty;
   var __propIsEnum$u = Object.prototype.propertyIsEnumerable;
@@ -17426,11 +17440,11 @@ var NgwLeaflet = (function () {
       }
     return a;
   };
-  var __spreadProps$g = (a, b) => __defProps$g(a, __getOwnPropDescs$g(b));
+  var __spreadProps$i = (a, b) => __defProps$i(a, __getOwnPropDescs$i(b));
   class OsmAdapter extends TileAdapter {
     addLayer(options) {
       const url = "https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png";
-      return super.addLayer(__spreadProps$g(__spreadValues$t({
+      return super.addLayer(__spreadProps$i(__spreadValues$t({
         name: "OpenStreetMap",
         attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
       }, options), {
@@ -17447,8 +17461,8 @@ var NgwLeaflet = (function () {
   const WmsLayer = makeRemote(WmsLayerBase);
 
   var __defProp$M = Object.defineProperty;
-  var __defProps$f = Object.defineProperties;
-  var __getOwnPropDescs$f = Object.getOwnPropertyDescriptors;
+  var __defProps$h = Object.defineProperties;
+  var __getOwnPropDescs$h = Object.getOwnPropertyDescriptors;
   var __getOwnPropSymbols$t = Object.getOwnPropertySymbols;
   var __hasOwnProp$t = Object.prototype.hasOwnProperty;
   var __propIsEnum$t = Object.prototype.propertyIsEnumerable;
@@ -17464,7 +17478,7 @@ var NgwLeaflet = (function () {
       }
     return a;
   };
-  var __spreadProps$f = (a, b) => __defProps$f(a, __getOwnPropDescs$f(b));
+  var __spreadProps$h = (a, b) => __defProps$h(a, __getOwnPropDescs$h(b));
   var __objRest$2 = (source, exclude) => {
     var target = {};
     for (var prop in source)
@@ -17492,8 +17506,11 @@ var NgwLeaflet = (function () {
           transparent: true
         }, options.nativeOptions);
         let layer;
-        if (opt.headers) {
-          layer = new WmsLayer(url, __spreadProps$f(__spreadValues$s({}, layerOptions), { headers: opt.headers }));
+        if (opt.headers || opt.withCredentials) {
+          layer = new WmsLayer(url, __spreadProps$h(__spreadValues$s({}, layerOptions), {
+            headers: opt.headers,
+            withCredentials: opt.withCredentials
+          }));
         } else {
           layer = new leafletSrcExports.TileLayer.WMS(url, layerOptions);
         }
@@ -17861,7 +17878,7 @@ var NgwLeaflet = (function () {
 
   var __defProp$K = Object.defineProperty;
   var __defNormalProp$K = (obj, key, value) => key in obj ? __defProp$K(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __publicField$z = (obj, key, value) => __defNormalProp$K(obj, typeof key !== "symbol" ? key + "" : key, value);
+  var __publicField$z = (obj, key, value) => __defNormalProp$K(obj, key + "" , value);
   class CancelError extends Error {
     constructor() {
       super();
@@ -17872,7 +17889,7 @@ var NgwLeaflet = (function () {
 
   var __defProp$J = Object.defineProperty;
   var __defNormalProp$J = (obj, key, value) => key in obj ? __defProp$J(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __publicField$y = (obj, key, value) => __defNormalProp$J(obj, typeof key !== "symbol" ? key + "" : key, value);
+  var __publicField$y = (obj, key, value) => __defNormalProp$J(obj, key + "" , value);
   class PromiseControl {
     constructor(options = {}) {
       this.options = options;
@@ -17954,7 +17971,7 @@ var NgwLeaflet = (function () {
 
   var __defProp$I = Object.defineProperty;
   var __defNormalProp$I = (obj, key, value) => key in obj ? __defProp$I(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __publicField$x = (obj, key, value) => __defNormalProp$I(obj, typeof key !== "symbol" ? key + "" : key, value);
+  var __publicField$x = (obj, key, value) => __defNormalProp$I(obj, key + "" , value);
   class TimeoutError extends Error {
     constructor() {
       super();
@@ -18360,6 +18377,62 @@ var NgwLeaflet = (function () {
   __publicField$v(_Cache, "instance", {});
   let Cache = _Cache;
 
+  var pkg = {
+  	name: "@nextgis/ngw-connector",
+  	version: "2.5.1",
+  	_priority: 12,
+  	description: "A lightweight HTTP client optimized for use with NextGIS Web API",
+  	main: "index.js",
+  	module: "lib/ngw-connector.esm-bundler.js",
+  	unpkg: "lib/ngw-connector.global.prod.js",
+  	jsdelivr: "lib/ngw-connector.global.prod.js",
+  	types: "lib/index.d.ts",
+  	dependencies: {
+  		"@nextgis/cache": "^2.5.0",
+  		"@nextgis/cancelable-promise": "^2.5.0",
+  		"@nextgis/utils": "^2.5.0",
+  		"@types/events": "^3.0.0",
+  		events: "*",
+  		"form-data": "^4.0.0"
+  	},
+  	devDependencies: {
+  		"@nextgis/build-tools": "^2.5.0"
+  	},
+  	scripts: {
+  		clean: "rimraf ./lib",
+  		dev: "node ../build-tools/lib/build.js",
+  		prod: "npm run dev -- --release",
+  		lint: "eslint ./src/**/*.ts --fix --c ../../.eslintrc",
+  		watch: "npm run dev -- --watch",
+  		"gen:types": "node ./scripts/generator"
+  	},
+  	buildOptions: {
+  		name: "NgwConnector",
+  		formats: [
+  			"esm-bundler",
+  			"esm-browser",
+  			"cjs",
+  			"global"
+  		]
+  	},
+  	keywords: [
+  		"NextGIS",
+  		"MAP"
+  	],
+  	author: "NextGIS",
+  	files: [
+  		"index.js",
+  		"lib"
+  	],
+  	license: "MIT",
+  	homepage: "https://github.com/nextgis/nextgis_frontend/tree/master/packages/ngw-connector#readme",
+  	repository: {
+  		type: "git",
+  		url: "git://github.com/nextgis/nextgis_frontend.git"
+  	},
+  	gitHead: "edc68033f914f6c95c4125b9738bba6d36e990b4"
+  };
+
   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$u = (obj, key, value) => __defNormalProp$F(obj, typeof key !== "symbol" ? key + "" : key, value);
@@ -18421,8 +18494,8 @@ var NgwLeaflet = (function () {
   }
 
   var __defProp$D = Object.defineProperty;
-  var __defProps$e = Object.defineProperties;
-  var __getOwnPropDescs$e = Object.getOwnPropertyDescriptors;
+  var __defProps$g = Object.defineProperties;
+  var __getOwnPropDescs$g = Object.getOwnPropertyDescriptors;
   var __getOwnPropSymbols$r = Object.getOwnPropertySymbols;
   var __hasOwnProp$r = Object.prototype.hasOwnProperty;
   var __propIsEnum$r = Object.prototype.propertyIsEnumerable;
@@ -18438,7 +18511,7 @@ var NgwLeaflet = (function () {
       }
     return a;
   };
-  var __spreadProps$e = (a, b) => __defProps$e(a, __getOwnPropDescs$e(b));
+  var __spreadProps$g = (a, b) => __defProps$g(a, __getOwnPropDescs$g(b));
   var __publicField$s = (obj, key, value) => __defNormalProp$D(obj, typeof key !== "symbol" ? key + "" : key, value);
   var __async$k = (__this, __arguments, generator) => {
     return new Promise((resolve, reject) => {
@@ -18483,7 +18556,7 @@ var NgwLeaflet = (function () {
     getOne(resource, requestOptions) {
       const cache = this.cache;
       const forCache = {};
-      const opt = __spreadProps$e(__spreadValues$q({}, requestOptions), { cache: false });
+      const opt = __spreadProps$g(__spreadValues$q({}, requestOptions), { cache: false });
       if (typeof resource === "string") {
         forCache.keyname = resource;
       } else if (typeof resource === "number") {
@@ -18818,7 +18891,7 @@ var NgwLeaflet = (function () {
 
   var __defProp$B = Object.defineProperty;
   var __defNormalProp$B = (obj, key, value) => key in obj ? __defProp$B(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __publicField$q = (obj, key, value) => __defNormalProp$B(obj, typeof key !== "symbol" ? key + "" : key, value);
+  var __publicField$q = (obj, key, value) => __defNormalProp$B(obj, key + "" , value);
   class NetworkError extends Error {
     constructor(url) {
       super();
@@ -18937,6 +19010,8 @@ var NgwLeaflet = (function () {
       __publicField$p(this, "user");
       __publicField$p(this, "resources");
       __publicField$p(this, "cache");
+      __publicField$p(this, "withCredentials");
+      __publicField$p(this, "client", `NextGIS-NGW-Connector/${pkg.version}`);
       __publicField$p(this, "routeStr", "/api/component/pyramid/route");
       __publicField$p(this, "activeRequests", []);
       __publicField$p(this, "requestTransform");
@@ -18945,11 +19020,15 @@ var NgwLeaflet = (function () {
       if (exist) {
         return exist;
       } else {
-        if (this.options.route) {
-          this.routeStr = this.options.route;
+        const { route, requestTransform, withCredentials } = this.options;
+        if (route) {
+          this.routeStr = route;
+        }
+        if (requestTransform) {
+          this.requestTransform = requestTransform;
         }
-        if (this.options.requestTransform) {
-          this.requestTransform = this.options.requestTransform;
+        if (withCredentials !== void 0) {
+          this.withCredentials = withCredentials;
         }
         this.resources = new ResourcesControl({
           connector: this,
@@ -18998,7 +19077,8 @@ var NgwLeaflet = (function () {
       const auth = this.options.auth;
       const makeConnect = () => new CancelablePromise((resolve, reject) => {
         const makeQuery = () => {
-          return this.makeQuery(this.routeStr, {}, {}).then((route) => {
+          const routeUrl = `${this.routeStr}?client=${this.client}`;
+          return this.makeQuery(routeUrl.toString(), {}, {}).then((route) => {
             resolve(route);
           }).catch((er) => {
             reject(er);
@@ -19118,6 +19198,9 @@ var NgwLeaflet = (function () {
      */
     apiRequest(name, params_ = {}, requestOptions = {}) {
       var _a, _b;
+      requestOptions = __spreadValues$p({
+        withCredentials: this.withCredentials
+      }, requestOptions);
       const { method, headers, withCredentials, responseType } = requestOptions;
       params_ = (_a = requestOptions.params) != null ? _a : params_;
       const params = objectRemoveEmpty(params_);
@@ -19388,8 +19471,8 @@ var NgwLeaflet = (function () {
   });
 
   var __defProp$z = Object.defineProperty;
-  var __defProps$d = Object.defineProperties;
-  var __getOwnPropDescs$d = Object.getOwnPropertyDescriptors;
+  var __defProps$f = Object.defineProperties;
+  var __getOwnPropDescs$f = Object.getOwnPropertyDescriptors;
   var __getOwnPropSymbols$p = Object.getOwnPropertySymbols;
   var __hasOwnProp$p = Object.prototype.hasOwnProperty;
   var __propIsEnum$p = Object.prototype.propertyIsEnumerable;
@@ -19405,7 +19488,7 @@ var NgwLeaflet = (function () {
       }
     return a;
   };
-  var __spreadProps$d = (a, b) => __defProps$d(a, __getOwnPropDescs$d(b));
+  var __spreadProps$f = (a, b) => __defProps$f(a, __getOwnPropDescs$f(b));
   const FEATURE_REQUEST_PARAMS = {
     srs: 4326,
     geom_format: "geojson"
@@ -19426,7 +19509,7 @@ var NgwLeaflet = (function () {
     if (extensionsStr !== "*") {
       params.extensions = extensionsStr;
     }
-    if (fields !== void 0) {
+    if (fields !== void 0 && fields !== null) {
       params.fields = Array.isArray(fields) ? fields.join(",") : "";
     }
     if (geom !== void 0) {
@@ -19491,13 +19574,13 @@ var NgwLeaflet = (function () {
       for (const f of filters_) {
         if (isPropertyFilter(f)) {
           _queries.push(
-            fetchNgwLayerItemsRequest(__spreadProps$d(__spreadValues$o({}, opt), {
+            fetchNgwLayerItemsRequest(__spreadProps$f(__spreadValues$o({}, opt), {
               paramList: [..._parentAllParams, ...paramList, createParam(f)]
             }))
           );
         } else {
           getQueries(
-            __spreadProps$d(__spreadValues$o({}, opt), {
+            __spreadProps$f(__spreadValues$o({}, opt), {
               filters: f
             }),
             _queries,
@@ -19518,7 +19601,7 @@ var NgwLeaflet = (function () {
       if (propertiesFilterList.length) {
         for (const x of propertiesFilterList) {
           getQueries(
-            __spreadProps$d(__spreadValues$o({}, opt), {
+            __spreadProps$f(__spreadValues$o({}, opt), {
               filters: x
             }),
             _queries,
@@ -19527,7 +19610,7 @@ var NgwLeaflet = (function () {
         }
       } else {
         _queries.push(
-          fetchNgwLayerItemsRequest(__spreadProps$d(__spreadValues$o({}, opt), {
+          fetchNgwLayerItemsRequest(__spreadProps$f(__spreadValues$o({}, opt), {
             paramList: [..._parentAllParams, ...paramList, ...filters2]
           }))
         );
@@ -19593,8 +19676,8 @@ var NgwLeaflet = (function () {
   }
 
   var __defProp$y = Object.defineProperty;
-  var __defProps$c = Object.defineProperties;
-  var __getOwnPropDescs$c = Object.getOwnPropertyDescriptors;
+  var __defProps$e = Object.defineProperties;
+  var __getOwnPropDescs$e = Object.getOwnPropertyDescriptors;
   var __getOwnPropSymbols$o = Object.getOwnPropertySymbols;
   var __hasOwnProp$o = Object.prototype.hasOwnProperty;
   var __propIsEnum$o = Object.prototype.propertyIsEnumerable;
@@ -19610,7 +19693,7 @@ var NgwLeaflet = (function () {
       }
     return a;
   };
-  var __spreadProps$c = (a, b) => __defProps$c(a, __getOwnPropDescs$c(b));
+  var __spreadProps$e = (a, b) => __defProps$e(a, __getOwnPropDescs$e(b));
   function fetchNgwLayerItem(options) {
     const params = __spreadValues$n({}, FEATURE_REQUEST_PARAMS);
     updateItemRequestParam(params, options);
@@ -19620,18 +19703,18 @@ var NgwLeaflet = (function () {
     }, params);
     const cache = options.cache || true;
     return options.connector.get("feature_layer.feature.item", { cache }, queryParams).then((resp) => {
-      return __spreadProps$c(__spreadValues$n({}, resp), {
+      return __spreadProps$e(__spreadValues$n({}, resp), {
         toGeojson: () => {
           if (resp.geom) {
             return CancelablePromise.resolve(createGeoJsonFeature(resp));
           } else {
-            return fetchNgwLayerItem(__spreadProps$c(__spreadValues$n({}, options), {
+            return fetchNgwLayerItem(__spreadProps$e(__spreadValues$n({}, options), {
               geom: true,
               fields: null,
               extensions: null
             })).then((onlyGeomItem) => {
               const geom = onlyGeomItem.geom;
-              return createGeoJsonFeature(__spreadProps$c(__spreadValues$n({}, resp), { geom }));
+              return createGeoJsonFeature(__spreadProps$e(__spreadValues$n({}, resp), { geom }));
             });
           }
         }
@@ -19693,22 +19776,20 @@ var NgwLeaflet = (function () {
   }
 
   function treeEvery(item, filter, relation, itemPrepare) {
-    return !!treeWrapper(item, filter, relation, treeEvery_, itemPrepare);
+    return !!treeWrapper(item, filter, relation, treeEvery_);
   }
   function treeSome(item, filter, relation, itemPrepare) {
-    return !!treeWrapper(item, filter, relation, treeFind_, itemPrepare);
+    return !!treeWrapper(item, filter, relation, treeFind_);
   }
   function treeFind(item, filter, relation, itemPrepare) {
-    return treeWrapper(item, filter, relation, treeFind_, itemPrepare);
+    return treeWrapper(item, filter, relation, treeFind_);
   }
   function treeFilter(item, filter, relation, itemPrepare) {
     return treeWrapper(
       item,
       filter,
       relation,
-      treeFilter_,
-      itemPrepare
-    );
+      treeFilter_);
   }
   function getChildren(item, relation = "children") {
     let children = [];
@@ -19725,13 +19806,6 @@ var NgwLeaflet = (function () {
   }
   function treeWrapper(item, filter = (x) => !!x, relation = "children", treeFunction, itemPrepare) {
     const filterFunction = typeof filter === "function" ? filter : (i) => propertiesFilter(i, filter);
-    if (itemPrepare) {
-      return treeFunction(
-        item,
-        (i) => filterFunction(itemPrepare(i)),
-        relation
-      );
-    }
     return treeFunction(item, filterFunction, relation);
   }
   function treeFind_(item, filterFunc = (x) => !!x, relation, _filtered = []) {
@@ -19998,7 +20072,7 @@ var NgwLeaflet = (function () {
       }
     return a;
   };
-  var __publicField$l = (obj, key, value) => __defNormalProp$u(obj, typeof key !== "symbol" ? key + "" : key, value);
+  var __publicField$l = (obj, key, value) => __defNormalProp$u(obj, key + "" , value);
   const _CheckProperty = class _CheckProperty extends BaseProperty {
     constructor(name, item, options) {
       super(name, item, __spreadValues$m(__spreadValues$m({}, _CheckProperty.options), options));
@@ -20285,8 +20359,8 @@ var NgwLeaflet = (function () {
   }
 
   var __defProp$r = Object.defineProperty;
-  var __defProps$b = Object.defineProperties;
-  var __getOwnPropDescs$b = Object.getOwnPropertyDescriptors;
+  var __defProps$d = Object.defineProperties;
+  var __getOwnPropDescs$d = Object.getOwnPropertyDescriptors;
   var __getOwnPropSymbols$k = Object.getOwnPropertySymbols;
   var __hasOwnProp$k = Object.prototype.hasOwnProperty;
   var __propIsEnum$k = Object.prototype.propertyIsEnumerable;
@@ -20302,7 +20376,7 @@ var NgwLeaflet = (function () {
       }
     return a;
   };
-  var __spreadProps$b = (a, b) => __defProps$b(a, __getOwnPropDescs$b(b));
+  var __spreadProps$d = (a, b) => __defProps$d(a, __getOwnPropDescs$d(b));
   function getNgwWebmapExtent(webmap) {
     const bottom = webmap["extent_bottom"];
     const left = webmap["extent_left"];
@@ -20365,14 +20439,14 @@ var NgwLeaflet = (function () {
       if (resource.cls && resource.cls.indexOf("style") !== -1) {
         return connector.getResource(resource.parent.id).then((res) => {
           if (res) {
-            return fetchNgwLayerExtent(__spreadProps$b(__spreadValues$j({}, options), {
+            return fetchNgwLayerExtent(__spreadProps$d(__spreadValues$j({}, options), {
               resourceId: res.resource.id,
               connector
             }));
           }
         });
       } else {
-        return fetchNgwLayerExtent(__spreadProps$b(__spreadValues$j({}, options), {
+        return fetchNgwLayerExtent(__spreadProps$d(__spreadValues$j({}, options), {
           resourceId: resource.id,
           connector
         }));
@@ -20694,8 +20768,8 @@ var NgwLeaflet = (function () {
   });
 
   var __defProp$n = Object.defineProperty;
-  var __defProps$a = Object.defineProperties;
-  var __getOwnPropDescs$a = Object.getOwnPropertyDescriptors;
+  var __defProps$c = Object.defineProperties;
+  var __getOwnPropDescs$c = Object.getOwnPropertyDescriptors;
   var __getOwnPropSymbols$h = Object.getOwnPropertySymbols;
   var __getProtoOf$2 = Object.getPrototypeOf;
   var __hasOwnProp$h = Object.prototype.hasOwnProperty;
@@ -20713,7 +20787,7 @@ var NgwLeaflet = (function () {
       }
     return a;
   };
-  var __spreadProps$a = (a, b) => __defProps$a(a, __getOwnPropDescs$a(b));
+  var __spreadProps$c = (a, b) => __defProps$c(a, __getOwnPropDescs$c(b));
   var __superGet$2 = (cls, obj, key) => __reflectGet$2(__getProtoOf$2(cls), key, obj);
   var __async$g = (__this, __arguments, generator) => {
     return new Promise((resolve, reject) => {
@@ -20758,7 +20832,7 @@ var NgwLeaflet = (function () {
             class BasemapTileAdapter extends TileAdapter {
               addLayer(opt) {
                 return __async$g(this, null, function* () {
-                  return __superGet$2(BasemapTileAdapter.prototype, this, "addLayer").call(this, __spreadProps$a(__spreadValues$g({}, opt), { url }));
+                  return __superGet$2(BasemapTileAdapter.prototype, this, "addLayer").call(this, __spreadProps$c(__spreadValues$g({}, opt), { url }));
                 });
               }
             }
@@ -20837,8 +20911,8 @@ var NgwLeaflet = (function () {
   }
 
   var __defProp$m = Object.defineProperty;
-  var __defProps$9 = Object.defineProperties;
-  var __getOwnPropDescs$9 = Object.getOwnPropertyDescriptors;
+  var __defProps$b = Object.defineProperties;
+  var __getOwnPropDescs$b = Object.getOwnPropertyDescriptors;
   var __getOwnPropSymbols$g = Object.getOwnPropertySymbols;
   var __hasOwnProp$g = Object.prototype.hasOwnProperty;
   var __propIsEnum$g = Object.prototype.propertyIsEnumerable;
@@ -20854,18 +20928,18 @@ var NgwLeaflet = (function () {
       }
     return a;
   };
-  var __spreadProps$9 = (a, b) => __defProps$9(a, __getOwnPropDescs$9(b));
+  var __spreadProps$b = (a, b) => __defProps$b(a, __getOwnPropDescs$b(b));
   function fetchNgwLayerItems(options) {
     const filters = options.filters;
     if (filters) {
-      return createFeatureFieldFilterQueries(__spreadProps$9(__spreadValues$f({}, options), {
+      return createFeatureFieldFilterQueries(__spreadProps$b(__spreadValues$f({}, options), {
         filters
       })).then((data) => {
         var _a;
         const clientFilterValidate = (_a = options.clientFilterValidate) != null ? _a : isFilterWithAnyCase(filters);
         if (clientFilterValidate) {
           data = data.filter((y) => {
-            const fields = prepareNgwFieldsToPropertiesFilter(__spreadProps$9(__spreadValues$f({}, y.fields), {
+            const fields = prepareNgwFieldsToPropertiesFilter(__spreadProps$b(__spreadValues$f({}, y.fields), {
               id: y.id
             }));
             const result = propertiesFilter(fields, filters);
@@ -20933,8 +21007,8 @@ var NgwLeaflet = (function () {
   }
 
   var __defProp$l = Object.defineProperty;
-  var __defProps$8 = Object.defineProperties;
-  var __getOwnPropDescs$8 = Object.getOwnPropertyDescriptors;
+  var __defProps$a = Object.defineProperties;
+  var __getOwnPropDescs$a = Object.getOwnPropertyDescriptors;
   var __getOwnPropSymbols$f = Object.getOwnPropertySymbols;
   var __getProtoOf$1 = Object.getPrototypeOf;
   var __hasOwnProp$f = Object.prototype.hasOwnProperty;
@@ -20952,7 +21026,7 @@ var NgwLeaflet = (function () {
       }
     return a;
   };
-  var __spreadProps$8 = (a, b) => __defProps$8(a, __getOwnPropDescs$8(b));
+  var __spreadProps$a = (a, b) => __defProps$a(a, __getOwnPropDescs$a(b));
   var __publicField$f = (obj, key, value) => __defNormalProp$l(obj, typeof key !== "symbol" ? key + "" : key, value);
   var __superGet$1 = (cls, obj, key) => __reflectGet$1(__getProtoOf$1(cls), key, obj);
   var __async$f = (__this, __arguments, generator) => {
@@ -21125,7 +21199,7 @@ var NgwLeaflet = (function () {
             try {
               this.emitter.emit("preupdate", filterArgs);
               webMap._emitLayerEvent("layer:preupdate", options.id || "", filterArgs);
-              const data = yield getData(filterArgs.filters, __spreadProps$8(__spreadValues$e({}, filterArgs.options), {
+              const data = yield getData(filterArgs.filters, __spreadProps$a(__spreadValues$e({}, filterArgs.options), {
                 srs: this.options.srs
               }));
               let newData = data;
@@ -21178,7 +21252,7 @@ var NgwLeaflet = (function () {
               if (this.clearLayer) {
                 this.clearLayer();
               }
-              const data = yield getData(filters, __spreadProps$8(__spreadValues$e({}, opt), {
+              const data = yield getData(filters, __spreadProps$a(__spreadValues$e({}, opt), {
                 srs: this.options.srs
               }));
               this.setData(data);
@@ -21368,8 +21442,8 @@ var NgwLeaflet = (function () {
   }
 
   var __defProp$k = Object.defineProperty;
-  var __defProps$7 = Object.defineProperties;
-  var __getOwnPropDescs$7 = Object.getOwnPropertyDescriptors;
+  var __defProps$9 = Object.defineProperties;
+  var __getOwnPropDescs$9 = Object.getOwnPropertyDescriptors;
   var __getOwnPropSymbols$e = Object.getOwnPropertySymbols;
   var __hasOwnProp$e = Object.prototype.hasOwnProperty;
   var __propIsEnum$e = Object.prototype.propertyIsEnumerable;
@@ -21385,7 +21459,7 @@ var NgwLeaflet = (function () {
       }
     return a;
   };
-  var __spreadProps$7 = (a, b) => __defProps$7(a, __getOwnPropDescs$7(b));
+  var __spreadProps$9 = (a, b) => __defProps$9(a, __getOwnPropDescs$9(b));
   var __publicField$e = (obj, key, value) => __defNormalProp$k(obj, typeof key !== "symbol" ? key + "" : key, value);
   var __async$d = (__this, __arguments, generator) => {
     return new Promise((resolve, reject) => {
@@ -21449,7 +21523,7 @@ var NgwLeaflet = (function () {
               baseUrl: connector.options.baseUrl || ""
             });
             if (opt) {
-              const layerAdapterOptions = __spreadProps$7(__spreadValues$d(__spreadValues$d({}, opt), layerOptions.adapterOptions), {
+              const layerAdapterOptions = __spreadProps$9(__spreadValues$d(__spreadValues$d({}, opt), layerOptions.adapterOptions), {
                 params: { resource: resourceId },
                 layers: opt.layers || String(resourceId),
                 resourceId
@@ -21507,8 +21581,8 @@ var NgwLeaflet = (function () {
   }
 
   var __defProp$j = Object.defineProperty;
-  var __defProps$6 = Object.defineProperties;
-  var __getOwnPropDescs$6 = Object.getOwnPropertyDescriptors;
+  var __defProps$8 = Object.defineProperties;
+  var __getOwnPropDescs$8 = Object.getOwnPropertyDescriptors;
   var __getOwnPropSymbols$d = Object.getOwnPropertySymbols;
   var __hasOwnProp$d = Object.prototype.hasOwnProperty;
   var __propIsEnum$d = Object.prototype.propertyIsEnumerable;
@@ -21524,7 +21598,7 @@ var NgwLeaflet = (function () {
       }
     return a;
   };
-  var __spreadProps$6 = (a, b) => __defProps$6(a, __getOwnPropDescs$6(b));
+  var __spreadProps$8 = (a, b) => __defProps$8(a, __getOwnPropDescs$8(b));
   var __async$c = (__this, __arguments, generator) => {
     return new Promise((resolve, reject) => {
       var fulfilled = (value) => {
@@ -21572,7 +21646,7 @@ var NgwLeaflet = (function () {
       const firstStyle = childrenStyles && childrenStyles[0];
       if (firstStyle) {
         return createAsyncAdapter(
-          __spreadProps$6(__spreadValues$c({}, layerOptions), { resource: firstStyle.resource.id }),
+          __spreadProps$8(__spreadValues$c({}, layerOptions), { resource: firstStyle.resource.id }),
           webMap,
           connector
         );
@@ -21595,13 +21669,13 @@ var NgwLeaflet = (function () {
         }
         if (item) {
           const cls = item.resource.cls;
-          const layerOptions = __spreadProps$6(__spreadValues$c({}, options), {
+          const layerOptions = __spreadProps$8(__spreadValues$c({}, options), {
             resource: resourceId
           });
           const adapterOptions = {
             layerOptions,
-            webMap,
             connector,
+            webMap,
             item
           };
           if (supportCls.indexOf(cls) !== -1) {
@@ -21632,10 +21706,10 @@ var NgwLeaflet = (function () {
                   item.resource.parent.id
                 );
                 if (parentItem) {
-                  const parentOptions = __spreadProps$6(__spreadValues$c({}, options), {
+                  const parentOptions = __spreadProps$8(__spreadValues$c({}, options), {
                     resource: item.resource.parent.id
                   });
-                  adapter = createGeoJsonAdapter(__spreadProps$6(__spreadValues$c({}, adapterOptions), {
+                  adapter = createGeoJsonAdapter(__spreadProps$8(__spreadValues$c({}, adapterOptions), {
                     item: parentItem,
                     layerOptions: parentOptions
                   }));
@@ -21724,6 +21798,9 @@ var NgwLeaflet = (function () {
     if (headers) {
       options.headers = headers;
     }
+    if (connector.withCredentials !== void 0) {
+      options.withCredentials = connector.withCredentials;
+    }
     return createAsyncAdapter(options, webMap, connector);
   }
   function extendNgwWebmapLayerAdapter(opt) {
@@ -21761,6 +21838,8 @@ var NgwLeaflet = (function () {
   }
 
   var __defProp$h = Object.defineProperty;
+  var __defProps$7 = Object.defineProperties;
+  var __getOwnPropDescs$7 = Object.getOwnPropertyDescriptors;
   var __getOwnPropSymbols$b = Object.getOwnPropertySymbols;
   var __hasOwnProp$b = Object.prototype.hasOwnProperty;
   var __propIsEnum$b = Object.prototype.propertyIsEnumerable;
@@ -21776,6 +21855,7 @@ var NgwLeaflet = (function () {
       }
     return a;
   };
+  var __spreadProps$7 = (a, b) => __defProps$7(a, __getOwnPropDescs$7(b));
   var __publicField$d = (obj, key, value) => __defNormalProp$h(obj, typeof key !== "symbol" ? key + "" : key, value);
   var __async$b = (__this, __arguments, generator) => {
     return new Promise((resolve, reject) => {
@@ -21882,14 +21962,12 @@ var NgwLeaflet = (function () {
     getItemOptions(item) {
       const transparency = item.item_type === "layer" && item.layer_transparency;
       const opacity = typeof transparency === "number" ? (100 - transparency) / 100 : void 0;
-      const options = {
+      const options = __spreadProps$7(__spreadValues$a({
         visibility: false,
-        name: item.display_name,
-        headers: this.options.headers,
-        crossOrigin: this.options.crossOrigin,
-        setViewDelay: this.options.setViewDelay,
+        name: item.display_name
+      }, this.options), {
         params: { resource: this.item.resourceId, item: this.item }
-      };
+      });
       if (this.options.order) {
         const subOrder = this.options.drawOrderEnabled && "draw_order_position" in item ? this._rootDescendantsCount - item.draw_order_position : this.id;
         const subLevel = String(subOrder).padStart(4, "0");
@@ -21900,17 +21978,16 @@ var NgwLeaflet = (function () {
       }
       if (item.item_type === "layer") {
         const { maxZoom, minZoom } = this._getZoomRange(item);
-        Object.assign(options, {
-          updateWmsParams: item.updateWmsParams,
+        Object.assign(options, __spreadProps$7(__spreadValues$a({
+          updateWmsParams: item.updateWmsParams
+        }, this.options), {
           url: item.url,
-          headers: this.options.headers,
-          ratio: this.options.ratio,
           maxZoom,
           minZoom,
           minScale: item.layer_min_scale_denom,
           maxScale: item.layer_max_scale_denom,
           interactive: item.layer_identifiable
-        });
+        }));
       }
       if (opacity !== void 0) {
         options.opacity = opacity;
@@ -22216,6 +22293,8 @@ var NgwLeaflet = (function () {
   const WEBMAP_BASELAYER_ID_PREFIX = "webmap-baselayer";
 
   var __defProp$f = Object.defineProperty;
+  var __defProps$6 = Object.defineProperties;
+  var __getOwnPropDescs$6 = Object.getOwnPropertyDescriptors;
   var __getOwnPropSymbols$9 = Object.getOwnPropertySymbols;
   var __hasOwnProp$9 = Object.prototype.hasOwnProperty;
   var __propIsEnum$9 = Object.prototype.propertyIsEnumerable;
@@ -22231,6 +22310,7 @@ var NgwLeaflet = (function () {
       }
     return a;
   };
+  var __spreadProps$6 = (a, b) => __defProps$6(a, __getOwnPropDescs$6(b));
   var __publicField$b = (obj, key, value) => __defNormalProp$f(obj, typeof key !== "symbol" ? key + "" : key, value);
   var __async$8 = (__this, __arguments, generator) => {
     return new Promise((resolve, reject) => {
@@ -22429,35 +22509,32 @@ var NgwLeaflet = (function () {
     }
     _getWebMapLayerItem() {
       return __async$8(this, null, function* () {
-        if (this.resourceId) {
-          const webmap = yield this.getWebMapConfig(this.resourceId);
-          if (webmap && webmap.root_item) {
-            return new Promise((resolve) => {
-              const options = {};
-              if (this.options.connector && this.options.connector.options.auth) {
-                const headers = this.options.connector.getAuthorizationHeaders();
-                if (headers) {
-                  options.headers = headers;
-                }
-              }
-              options.setViewDelay = this.options.setViewDelay;
-              options.order = this.options.order;
-              options.ratio = this.options.ratio;
-              options.crossOrigin = this.options.crossOrigin;
-              options.minZoom = this.options.minZoom;
-              options.maxZoom = this.options.maxZoom;
-              options.drawOrderEnabled = webmap.draw_order_enabled;
-              options.popupOptions = this.options.popupOptions;
-              const layer = new this.NgwWebmapItem(
-                this.options.webMap,
-                webmap.root_item,
-                options,
-                this.options.connector
-              );
-              layer.emitter.on("init", () => resolve(layer));
-            });
-          }
+        if (!this.resourceId) {
+          return void 0;
         }
+        const webmap = yield this.getWebMapConfig(this.resourceId);
+        if (!webmap || !webmap.root_item) {
+          return void 0;
+        }
+        return new Promise((resolve) => {
+          const connector = this.options.connector;
+          const headers = (connector == null ? void 0 : connector.options.auth) ? connector.getAuthorizationHeaders() : void 0;
+          const withCredentials = connector.withCredentials;
+          const options = __spreadProps$6(__spreadValues$8({}, this.options), {
+            withCredentials,
+            headers,
+            drawOrderEnabled: webmap.draw_order_enabled
+          });
+          const layer = new this.NgwWebmapItem(
+            this.options.webMap,
+            webmap.root_item,
+            options,
+            connector
+          );
+          layer.emitter.on("init", () => {
+            resolve(layer);
+          });
+        });
       });
     }
     getWebMapConfig(id) {
@@ -25194,7 +25271,8 @@ var NgwLeaflet = (function () {
     if (!options.connector) {
       options.connector = new NgwConnector({
         baseUrl: options.baseUrl || "",
-        auth: options.auth
+        auth: options.auth,
+        withCredentials: options.withCredentials
       });
     } else if (options.connector) {
       options.baseUrl = options.connector.options.baseUrl;