@nextgis/ngw-map 2.4.1 → 2.5.1

package/lib/ngw-map.global.js

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/ngw-map; version: 2.4.1; author: NextGIS */
+/** Bundle of @nextgis/ngw-map; version: 2.5.1; author: NextGIS */
 var NgwMap = (function (exports) {
   'use strict';
 
@@ -476,7 +476,7 @@ var NgwMap = (function (exports) {
 
   var __defProp$N = Object.defineProperty;
   var __defNormalProp$N = (obj, key, value) => key in obj ? __defProp$N(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __publicField$z = (obj, key, value) => __defNormalProp$N(obj, typeof key !== "symbol" ? key + "" : key, value);
+  var __publicField$z = (obj, key, value) => __defNormalProp$N(obj, key + "" , value);
   class CancelError extends Error {
     constructor() {
       super();
@@ -487,7 +487,7 @@ var NgwMap = (function (exports) {
 
   var __defProp$M = Object.defineProperty;
   var __defNormalProp$M = (obj, key, value) => key in obj ? __defProp$M(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __publicField$y = (obj, key, value) => __defNormalProp$M(obj, typeof key !== "symbol" ? key + "" : key, value);
+  var __publicField$y = (obj, key, value) => __defNormalProp$M(obj, key + "" , value);
   class PromiseControl {
     constructor(options = {}) {
       this.options = options;
@@ -569,7 +569,7 @@ var NgwMap = (function (exports) {
 
   var __defProp$L = Object.defineProperty;
   var __defNormalProp$L = (obj, key, value) => key in obj ? __defProp$L(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __publicField$x = (obj, key, value) => __defNormalProp$L(obj, typeof key !== "symbol" ? key + "" : key, value);
+  var __publicField$x = (obj, key, value) => __defNormalProp$L(obj, key + "" , value);
   class TimeoutError extends Error {
     constructor() {
       super();
@@ -1114,7 +1114,7 @@ var NgwMap = (function (exports) {
   }
 
   function round(val, toFixed) {
-    const n = toFixed ? Number("1e+" + toFixed) : 1;
+    const n = 1;
     return Math.round((val + Number.EPSILON) * n) / n;
   }
 
@@ -1256,6 +1256,62 @@ var NgwMap = (function (exports) {
   __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$I = Object.defineProperty;
   var __defNormalProp$I = (obj, key, value) => key in obj ? __defProp$I(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
   var __publicField$u = (obj, key, value) => __defNormalProp$I(obj, typeof key !== "symbol" ? key + "" : key, value);
@@ -1317,8 +1373,8 @@ var NgwMap = (function (exports) {
   }
 
   var __defProp$G = Object.defineProperty;
-  var __defProps$d = Object.defineProperties;
-  var __getOwnPropDescs$d = Object.getOwnPropertyDescriptors;
+  var __defProps$f = Object.defineProperties;
+  var __getOwnPropDescs$f = Object.getOwnPropertyDescriptors;
   var __getOwnPropSymbols$u = Object.getOwnPropertySymbols;
   var __hasOwnProp$u = Object.prototype.hasOwnProperty;
   var __propIsEnum$u = Object.prototype.propertyIsEnumerable;
@@ -1334,7 +1390,7 @@ var NgwMap = (function (exports) {
       }
     return a;
   };
-  var __spreadProps$d = (a, b) => __defProps$d(a, __getOwnPropDescs$d(b));
+  var __spreadProps$f = (a, b) => __defProps$f(a, __getOwnPropDescs$f(b));
   var __publicField$s = (obj, key, value) => __defNormalProp$G(obj, typeof key !== "symbol" ? key + "" : key, value);
   var __async$l = (__this, __arguments, generator) => {
     return new Promise((resolve, reject) => {
@@ -1379,7 +1435,7 @@ var NgwMap = (function (exports) {
     getOne(resource, requestOptions) {
       const cache = this.cache;
       const forCache = {};
-      const opt = __spreadProps$d(__spreadValues$t({}, requestOptions), { cache: false });
+      const opt = __spreadProps$f(__spreadValues$t({}, requestOptions), { cache: false });
       if (typeof resource === "string") {
         forCache.keyname = resource;
       } else if (typeof resource === "number") {
@@ -1714,7 +1770,7 @@ var NgwMap = (function (exports) {
 
   var __defProp$E = Object.defineProperty;
   var __defNormalProp$E = (obj, key, value) => key in obj ? __defProp$E(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __publicField$q = (obj, key, value) => __defNormalProp$E(obj, typeof key !== "symbol" ? key + "" : key, value);
+  var __publicField$q = (obj, key, value) => __defNormalProp$E(obj, key + "" , value);
   class NetworkError extends Error {
     constructor(url) {
       super();
@@ -1833,6 +1889,8 @@ var NgwMap = (function (exports) {
       __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");
@@ -1841,11 +1899,15 @@ var NgwMap = (function (exports) {
       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,
@@ -1894,7 +1956,8 @@ var NgwMap = (function (exports) {
       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);
@@ -2014,6 +2077,9 @@ var NgwMap = (function (exports) {
      */
     apiRequest(name, params_ = {}, requestOptions = {}) {
       var _a, _b;
+      requestOptions = __spreadValues$s({
+        withCredentials: this.withCredentials
+      }, requestOptions);
       const { method, headers, withCredentials, responseType } = requestOptions;
       params_ = (_a = requestOptions.params) != null ? _a : params_;
       const params = objectRemoveEmpty(params_);
@@ -2378,8 +2444,8 @@ var NgwMap = (function (exports) {
   }
 
   var __defProp$B = Object.defineProperty;
-  var __defProps$c = Object.defineProperties;
-  var __getOwnPropDescs$c = Object.getOwnPropertyDescriptors;
+  var __defProps$e = Object.defineProperties;
+  var __getOwnPropDescs$e = Object.getOwnPropertyDescriptors;
   var __getOwnPropSymbols$r = Object.getOwnPropertySymbols;
   var __hasOwnProp$r = Object.prototype.hasOwnProperty;
   var __propIsEnum$r = Object.prototype.propertyIsEnumerable;
@@ -2395,7 +2461,7 @@ var NgwMap = (function (exports) {
       }
     return a;
   };
-  var __spreadProps$c = (a, b) => __defProps$c(a, __getOwnPropDescs$c(b));
+  var __spreadProps$e = (a, b) => __defProps$e(a, __getOwnPropDescs$e(b));
   const FEATURE_REQUEST_PARAMS = {
     srs: 4326,
     geom_format: "geojson"
@@ -2416,7 +2482,7 @@ var NgwMap = (function (exports) {
     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) {
@@ -2481,13 +2547,13 @@ var NgwMap = (function (exports) {
       for (const f of filters_) {
         if (isPropertyFilter(f)) {
           _queries.push(
-            fetchNgwLayerItemsRequest(__spreadProps$c(__spreadValues$q({}, opt), {
+            fetchNgwLayerItemsRequest(__spreadProps$e(__spreadValues$q({}, opt), {
               paramList: [..._parentAllParams, ...paramList, createParam(f)]
             }))
           );
         } else {
           getQueries(
-            __spreadProps$c(__spreadValues$q({}, opt), {
+            __spreadProps$e(__spreadValues$q({}, opt), {
               filters: f
             }),
             _queries,
@@ -2508,7 +2574,7 @@ var NgwMap = (function (exports) {
       if (propertiesFilterList.length) {
         for (const x of propertiesFilterList) {
           getQueries(
-            __spreadProps$c(__spreadValues$q({}, opt), {
+            __spreadProps$e(__spreadValues$q({}, opt), {
               filters: x
             }),
             _queries,
@@ -2517,7 +2583,7 @@ var NgwMap = (function (exports) {
         }
       } else {
         _queries.push(
-          fetchNgwLayerItemsRequest(__spreadProps$c(__spreadValues$q({}, opt), {
+          fetchNgwLayerItemsRequest(__spreadProps$e(__spreadValues$q({}, opt), {
             paramList: [..._parentAllParams, ...paramList, ...filters2]
           }))
         );
@@ -2583,8 +2649,8 @@ var NgwMap = (function (exports) {
   }
 
   var __defProp$A = Object.defineProperty;
-  var __defProps$b = Object.defineProperties;
-  var __getOwnPropDescs$b = Object.getOwnPropertyDescriptors;
+  var __defProps$d = Object.defineProperties;
+  var __getOwnPropDescs$d = Object.getOwnPropertyDescriptors;
   var __getOwnPropSymbols$q = Object.getOwnPropertySymbols;
   var __hasOwnProp$q = Object.prototype.hasOwnProperty;
   var __propIsEnum$q = Object.prototype.propertyIsEnumerable;
@@ -2600,7 +2666,7 @@ var NgwMap = (function (exports) {
       }
     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 fetchNgwLayerItem(options) {
     const params = __spreadValues$p({}, FEATURE_REQUEST_PARAMS);
     updateItemRequestParam(params, options);
@@ -2610,18 +2676,18 @@ var NgwMap = (function (exports) {
     }, params);
     const cache = options.cache || true;
     return options.connector.get("feature_layer.feature.item", { cache }, queryParams).then((resp) => {
-      return __spreadProps$b(__spreadValues$p({}, resp), {
+      return __spreadProps$d(__spreadValues$p({}, resp), {
         toGeojson: () => {
           if (resp.geom) {
             return CancelablePromise.resolve(createGeoJsonFeature(resp));
           } else {
-            return fetchNgwLayerItem(__spreadProps$b(__spreadValues$p({}, options), {
+            return fetchNgwLayerItem(__spreadProps$d(__spreadValues$p({}, options), {
               geom: true,
               fields: null,
               extensions: null
             })).then((onlyGeomItem) => {
               const geom = onlyGeomItem.geom;
-              return createGeoJsonFeature(__spreadProps$b(__spreadValues$p({}, resp), { geom }));
+              return createGeoJsonFeature(__spreadProps$d(__spreadValues$p({}, resp), { geom }));
             });
           }
         }
@@ -2683,22 +2749,20 @@ var NgwMap = (function (exports) {
   }
 
   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 = [];
@@ -2715,13 +2779,6 @@ var NgwMap = (function (exports) {
   }
   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 = []) {
@@ -2988,7 +3045,7 @@ var NgwMap = (function (exports) {
       }
     return a;
   };
-  var __publicField$l = (obj, key, value) => __defNormalProp$w(obj, typeof key !== "symbol" ? key + "" : key, value);
+  var __publicField$l = (obj, key, value) => __defNormalProp$w(obj, key + "" , value);
   const _CheckProperty = class _CheckProperty extends BaseProperty {
     constructor(name, item, options) {
       super(name, item, __spreadValues$o(__spreadValues$o({}, _CheckProperty.options), options));
@@ -3275,8 +3332,8 @@ var NgwMap = (function (exports) {
   }
 
   var __defProp$t = Object.defineProperty;
-  var __defProps$a = Object.defineProperties;
-  var __getOwnPropDescs$a = Object.getOwnPropertyDescriptors;
+  var __defProps$c = Object.defineProperties;
+  var __getOwnPropDescs$c = Object.getOwnPropertyDescriptors;
   var __getOwnPropSymbols$m = Object.getOwnPropertySymbols;
   var __hasOwnProp$m = Object.prototype.hasOwnProperty;
   var __propIsEnum$m = Object.prototype.propertyIsEnumerable;
@@ -3292,7 +3349,7 @@ var NgwMap = (function (exports) {
       }
     return a;
   };
-  var __spreadProps$a = (a, b) => __defProps$a(a, __getOwnPropDescs$a(b));
+  var __spreadProps$c = (a, b) => __defProps$c(a, __getOwnPropDescs$c(b));
   function getNgwWebmapExtent(webmap) {
     const bottom = webmap["extent_bottom"];
     const left = webmap["extent_left"];
@@ -3355,14 +3412,14 @@ var NgwMap = (function (exports) {
       if (resource.cls && resource.cls.indexOf("style") !== -1) {
         return connector.getResource(resource.parent.id).then((res) => {
           if (res) {
-            return fetchNgwLayerExtent(__spreadProps$a(__spreadValues$l({}, options), {
+            return fetchNgwLayerExtent(__spreadProps$c(__spreadValues$l({}, options), {
               resourceId: res.resource.id,
               connector
             }));
           }
         });
       } else {
-        return fetchNgwLayerExtent(__spreadProps$a(__spreadValues$l({}, options), {
+        return fetchNgwLayerExtent(__spreadProps$c(__spreadValues$l({}, options), {
           resourceId: resource.id,
           connector
         }));
@@ -3684,8 +3741,8 @@ var NgwMap = (function (exports) {
   });
 
   var __defProp$p = Object.defineProperty;
-  var __defProps$9 = Object.defineProperties;
-  var __getOwnPropDescs$9 = Object.getOwnPropertyDescriptors;
+  var __defProps$b = Object.defineProperties;
+  var __getOwnPropDescs$b = Object.getOwnPropertyDescriptors;
   var __getOwnPropSymbols$j = Object.getOwnPropertySymbols;
   var __getProtoOf$2 = Object.getPrototypeOf;
   var __hasOwnProp$j = Object.prototype.hasOwnProperty;
@@ -3703,7 +3760,7 @@ var NgwMap = (function (exports) {
       }
     return a;
   };
-  var __spreadProps$9 = (a, b) => __defProps$9(a, __getOwnPropDescs$9(b));
+  var __spreadProps$b = (a, b) => __defProps$b(a, __getOwnPropDescs$b(b));
   var __superGet$2 = (cls, obj, key) => __reflectGet$2(__getProtoOf$2(cls), key, obj);
   var __async$h = (__this, __arguments, generator) => {
     return new Promise((resolve, reject) => {
@@ -3748,7 +3805,7 @@ var NgwMap = (function (exports) {
             class BasemapTileAdapter extends TileAdapter {
               addLayer(opt) {
                 return __async$h(this, null, function* () {
-                  return __superGet$2(BasemapTileAdapter.prototype, this, "addLayer").call(this, __spreadProps$9(__spreadValues$i({}, opt), { url }));
+                  return __superGet$2(BasemapTileAdapter.prototype, this, "addLayer").call(this, __spreadProps$b(__spreadValues$i({}, opt), { url }));
                 });
               }
             }
@@ -3827,8 +3884,8 @@ var NgwMap = (function (exports) {
   }
 
   var __defProp$o = Object.defineProperty;
-  var __defProps$8 = Object.defineProperties;
-  var __getOwnPropDescs$8 = Object.getOwnPropertyDescriptors;
+  var __defProps$a = Object.defineProperties;
+  var __getOwnPropDescs$a = Object.getOwnPropertyDescriptors;
   var __getOwnPropSymbols$i = Object.getOwnPropertySymbols;
   var __hasOwnProp$i = Object.prototype.hasOwnProperty;
   var __propIsEnum$i = Object.prototype.propertyIsEnumerable;
@@ -3844,18 +3901,18 @@ var NgwMap = (function (exports) {
       }
     return a;
   };
-  var __spreadProps$8 = (a, b) => __defProps$8(a, __getOwnPropDescs$8(b));
+  var __spreadProps$a = (a, b) => __defProps$a(a, __getOwnPropDescs$a(b));
   function fetchNgwLayerItems(options) {
     const filters = options.filters;
     if (filters) {
-      return createFeatureFieldFilterQueries(__spreadProps$8(__spreadValues$h({}, options), {
+      return createFeatureFieldFilterQueries(__spreadProps$a(__spreadValues$h({}, 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$8(__spreadValues$h({}, y.fields), {
+            const fields = prepareNgwFieldsToPropertiesFilter(__spreadProps$a(__spreadValues$h({}, y.fields), {
               id: y.id
             }));
             const result = propertiesFilter(fields, filters);
@@ -3923,8 +3980,8 @@ var NgwMap = (function (exports) {
   }
 
   var __defProp$n = Object.defineProperty;
-  var __defProps$7 = Object.defineProperties;
-  var __getOwnPropDescs$7 = Object.getOwnPropertyDescriptors;
+  var __defProps$9 = Object.defineProperties;
+  var __getOwnPropDescs$9 = Object.getOwnPropertyDescriptors;
   var __getOwnPropSymbols$h = Object.getOwnPropertySymbols;
   var __getProtoOf$1 = Object.getPrototypeOf;
   var __hasOwnProp$h = Object.prototype.hasOwnProperty;
@@ -3942,7 +3999,7 @@ var NgwMap = (function (exports) {
       }
     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$f = (obj, key, value) => __defNormalProp$n(obj, typeof key !== "symbol" ? key + "" : key, value);
   var __superGet$1 = (cls, obj, key) => __reflectGet$1(__getProtoOf$1(cls), key, obj);
   var __async$g = (__this, __arguments, generator) => {
@@ -4115,7 +4172,7 @@ var NgwMap = (function (exports) {
             try {
               this.emitter.emit("preupdate", filterArgs);
               webMap._emitLayerEvent("layer:preupdate", options.id || "", filterArgs);
-              const data = yield getData(filterArgs.filters, __spreadProps$7(__spreadValues$g({}, filterArgs.options), {
+              const data = yield getData(filterArgs.filters, __spreadProps$9(__spreadValues$g({}, filterArgs.options), {
                 srs: this.options.srs
               }));
               let newData = data;
@@ -4168,7 +4225,7 @@ var NgwMap = (function (exports) {
               if (this.clearLayer) {
                 this.clearLayer();
               }
-              const data = yield getData(filters, __spreadProps$7(__spreadValues$g({}, opt), {
+              const data = yield getData(filters, __spreadProps$9(__spreadValues$g({}, opt), {
                 srs: this.options.srs
               }));
               this.setData(data);
@@ -4358,8 +4415,8 @@ var NgwMap = (function (exports) {
   }
 
   var __defProp$m = Object.defineProperty;
-  var __defProps$6 = Object.defineProperties;
-  var __getOwnPropDescs$6 = Object.getOwnPropertyDescriptors;
+  var __defProps$8 = Object.defineProperties;
+  var __getOwnPropDescs$8 = Object.getOwnPropertyDescriptors;
   var __getOwnPropSymbols$g = Object.getOwnPropertySymbols;
   var __hasOwnProp$g = Object.prototype.hasOwnProperty;
   var __propIsEnum$g = Object.prototype.propertyIsEnumerable;
@@ -4375,7 +4432,7 @@ var NgwMap = (function (exports) {
       }
     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 __publicField$e = (obj, key, value) => __defNormalProp$m(obj, typeof key !== "symbol" ? key + "" : key, value);
   var __async$e = (__this, __arguments, generator) => {
     return new Promise((resolve, reject) => {
@@ -4439,7 +4496,7 @@ var NgwMap = (function (exports) {
               baseUrl: connector.options.baseUrl || ""
             });
             if (opt) {
-              const layerAdapterOptions = __spreadProps$6(__spreadValues$f(__spreadValues$f({}, opt), layerOptions.adapterOptions), {
+              const layerAdapterOptions = __spreadProps$8(__spreadValues$f(__spreadValues$f({}, opt), layerOptions.adapterOptions), {
                 params: { resource: resourceId },
                 layers: opt.layers || String(resourceId),
                 resourceId
@@ -4497,8 +4554,8 @@ var NgwMap = (function (exports) {
   }
 
   var __defProp$l = Object.defineProperty;
-  var __defProps$5 = Object.defineProperties;
-  var __getOwnPropDescs$5 = Object.getOwnPropertyDescriptors;
+  var __defProps$7 = Object.defineProperties;
+  var __getOwnPropDescs$7 = Object.getOwnPropertyDescriptors;
   var __getOwnPropSymbols$f = Object.getOwnPropertySymbols;
   var __hasOwnProp$f = Object.prototype.hasOwnProperty;
   var __propIsEnum$f = Object.prototype.propertyIsEnumerable;
@@ -4514,7 +4571,7 @@ var NgwMap = (function (exports) {
       }
     return a;
   };
-  var __spreadProps$5 = (a, b) => __defProps$5(a, __getOwnPropDescs$5(b));
+  var __spreadProps$7 = (a, b) => __defProps$7(a, __getOwnPropDescs$7(b));
   var __async$d = (__this, __arguments, generator) => {
     return new Promise((resolve, reject) => {
       var fulfilled = (value) => {
@@ -4562,7 +4619,7 @@ var NgwMap = (function (exports) {
       const firstStyle = childrenStyles && childrenStyles[0];
       if (firstStyle) {
         return createAsyncAdapter(
-          __spreadProps$5(__spreadValues$e({}, layerOptions), { resource: firstStyle.resource.id }),
+          __spreadProps$7(__spreadValues$e({}, layerOptions), { resource: firstStyle.resource.id }),
           webMap,
           connector
         );
@@ -4585,13 +4642,13 @@ var NgwMap = (function (exports) {
         }
         if (item) {
           const cls = item.resource.cls;
-          const layerOptions = __spreadProps$5(__spreadValues$e({}, options), {
+          const layerOptions = __spreadProps$7(__spreadValues$e({}, options), {
             resource: resourceId
           });
           const adapterOptions = {
             layerOptions,
-            webMap,
             connector,
+            webMap,
             item
           };
           if (supportCls.indexOf(cls) !== -1) {
@@ -4622,10 +4679,10 @@ var NgwMap = (function (exports) {
                   item.resource.parent.id
                 );
                 if (parentItem) {
-                  const parentOptions = __spreadProps$5(__spreadValues$e({}, options), {
+                  const parentOptions = __spreadProps$7(__spreadValues$e({}, options), {
                     resource: item.resource.parent.id
                   });
-                  adapter = createGeoJsonAdapter(__spreadProps$5(__spreadValues$e({}, adapterOptions), {
+                  adapter = createGeoJsonAdapter(__spreadProps$7(__spreadValues$e({}, adapterOptions), {
                     item: parentItem,
                     layerOptions: parentOptions
                   }));
@@ -4714,6 +4771,9 @@ var NgwMap = (function (exports) {
     if (headers) {
       options.headers = headers;
     }
+    if (connector.withCredentials !== void 0) {
+      options.withCredentials = connector.withCredentials;
+    }
     return createAsyncAdapter(options, webMap, connector);
   }
   function extendNgwWebmapLayerAdapter(opt) {
@@ -4751,6 +4811,8 @@ var NgwMap = (function (exports) {
   }
 
   var __defProp$j = Object.defineProperty;
+  var __defProps$6 = Object.defineProperties;
+  var __getOwnPropDescs$6 = Object.getOwnPropertyDescriptors;
   var __getOwnPropSymbols$d = Object.getOwnPropertySymbols;
   var __hasOwnProp$d = Object.prototype.hasOwnProperty;
   var __propIsEnum$d = Object.prototype.propertyIsEnumerable;
@@ -4766,6 +4828,7 @@ var NgwMap = (function (exports) {
       }
     return a;
   };
+  var __spreadProps$6 = (a, b) => __defProps$6(a, __getOwnPropDescs$6(b));
   var __publicField$d = (obj, key, value) => __defNormalProp$j(obj, typeof key !== "symbol" ? key + "" : key, value);
   var __async$c = (__this, __arguments, generator) => {
     return new Promise((resolve, reject) => {
@@ -4872,14 +4935,12 @@ var NgwMap = (function (exports) {
     getItemOptions(item) {
       const transparency = item.item_type === "layer" && item.layer_transparency;
       const opacity = typeof transparency === "number" ? (100 - transparency) / 100 : void 0;
-      const options = {
+      const options = __spreadProps$6(__spreadValues$c({
         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");
@@ -4890,17 +4951,16 @@ var NgwMap = (function (exports) {
       }
       if (item.item_type === "layer") {
         const { maxZoom, minZoom } = this._getZoomRange(item);
-        Object.assign(options, {
-          updateWmsParams: item.updateWmsParams,
+        Object.assign(options, __spreadProps$6(__spreadValues$c({
+          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;
@@ -5206,6 +5266,8 @@ var NgwMap = (function (exports) {
   const WEBMAP_BASELAYER_ID_PREFIX = "webmap-baselayer";
 
   var __defProp$h = Object.defineProperty;
+  var __defProps$5 = Object.defineProperties;
+  var __getOwnPropDescs$5 = Object.getOwnPropertyDescriptors;
   var __getOwnPropSymbols$b = Object.getOwnPropertySymbols;
   var __hasOwnProp$b = Object.prototype.hasOwnProperty;
   var __propIsEnum$b = Object.prototype.propertyIsEnumerable;
@@ -5221,6 +5283,7 @@ var NgwMap = (function (exports) {
       }
     return a;
   };
+  var __spreadProps$5 = (a, b) => __defProps$5(a, __getOwnPropDescs$5(b));
   var __publicField$b = (obj, key, value) => __defNormalProp$h(obj, typeof key !== "symbol" ? key + "" : key, value);
   var __async$9 = (__this, __arguments, generator) => {
     return new Promise((resolve, reject) => {
@@ -5419,35 +5482,32 @@ var NgwMap = (function (exports) {
     }
     _getWebMapLayerItem() {
       return __async$9(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$5(__spreadValues$a({}, 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) {
@@ -9075,7 +9135,8 @@ var NgwMap = (function (exports) {
     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;