@nextgis/ngw-map 3.0.0-alpha.0 → 3.0.0-alpha.2

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.
@@ -1,4 +1,4 @@
1
- /** Bundle of @nextgis/ngw-map; version: 3.0.0-alpha.0; author: NextGIS */
1
+ /** Bundle of @nextgis/ngw-map; version: 3.0.0-alpha.2; author: NextGIS */
2
2
  var domain;
3
3
 
4
4
  // This constructor is used to store event handlers. Instantiating this is
@@ -938,6 +938,62 @@ const _Cache = class _Cache {
938
938
  __publicField$v(_Cache, "instance", {});
939
939
  let Cache = _Cache;
940
940
 
941
+ var pkg = {
942
+ name: "@nextgis/ngw-connector",
943
+ version: "3.0.0-alpha.2",
944
+ _priority: 12,
945
+ description: "A lightweight HTTP client optimized for use with NextGIS Web API",
946
+ main: "index.js",
947
+ module: "lib/ngw-connector.esm-bundler.js",
948
+ unpkg: "lib/ngw-connector.global.prod.js",
949
+ jsdelivr: "lib/ngw-connector.global.prod.js",
950
+ types: "lib/index.d.ts",
951
+ dependencies: {
952
+ "@nextgis/cache": "^3.0.0-alpha.1",
953
+ "@nextgis/cancelable-promise": "^3.0.0-alpha.1",
954
+ "@nextgis/utils": "^3.0.0-alpha.1",
955
+ "@types/events": "^3.0.0",
956
+ events: "*",
957
+ "form-data": "^4.0.0"
958
+ },
959
+ devDependencies: {
960
+ "@nextgis/build-tools": "^3.0.0-alpha.1"
961
+ },
962
+ scripts: {
963
+ clean: "rimraf ./lib",
964
+ dev: "node ../build-tools/lib/build.js",
965
+ prod: "npm run dev -- --release",
966
+ lint: "eslint ./src/**/*.ts --fix --c ../../.eslintrc",
967
+ watch: "npm run dev -- --watch",
968
+ "gen:types": "node ./scripts/generator"
969
+ },
970
+ buildOptions: {
971
+ name: "NgwConnector",
972
+ formats: [
973
+ "esm-bundler",
974
+ "esm-browser",
975
+ "cjs",
976
+ "global"
977
+ ]
978
+ },
979
+ keywords: [
980
+ "NextGIS",
981
+ "MAP"
982
+ ],
983
+ author: "NextGIS",
984
+ files: [
985
+ "index.js",
986
+ "lib"
987
+ ],
988
+ license: "MIT",
989
+ homepage: "https://github.com/nextgis/nextgis_frontend/tree/master/packages/ngw-connector#readme",
990
+ repository: {
991
+ type: "git",
992
+ url: "git://github.com/nextgis/nextgis_frontend.git"
993
+ },
994
+ gitHead: "edc68033f914f6c95c4125b9738bba6d36e990b4"
995
+ };
996
+
941
997
  var __defProp$J = Object.defineProperty;
942
998
  var __defNormalProp$J = (obj, key, value) => key in obj ? __defProp$J(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
943
999
  var __publicField$u = (obj, key, value) => __defNormalProp$J(obj, typeof key !== "symbol" ? key + "" : key, value);
@@ -1502,8 +1558,8 @@ let loadData;
1502
1558
  }
1503
1559
 
1504
1560
  var __defProp$D = Object.defineProperty;
1505
- var __defProps$d = Object.defineProperties;
1506
- var __getOwnPropDescs$d = Object.getOwnPropertyDescriptors;
1561
+ var __defProps$f = Object.defineProperties;
1562
+ var __getOwnPropDescs$f = Object.getOwnPropertyDescriptors;
1507
1563
  var __getOwnPropSymbols$u = Object.getOwnPropertySymbols;
1508
1564
  var __hasOwnProp$u = Object.prototype.hasOwnProperty;
1509
1565
  var __propIsEnum$u = Object.prototype.propertyIsEnumerable;
@@ -1519,7 +1575,7 @@ var __spreadValues$t = (a, b) => {
1519
1575
  }
1520
1576
  return a;
1521
1577
  };
1522
- var __spreadProps$d = (a, b) => __defProps$d(a, __getOwnPropDescs$d(b));
1578
+ var __spreadProps$f = (a, b) => __defProps$f(a, __getOwnPropDescs$f(b));
1523
1579
  var __objRest$2 = (source, exclude) => {
1524
1580
  var target = {};
1525
1581
  for (var prop in source)
@@ -1563,6 +1619,8 @@ class NgwConnector {
1563
1619
  __publicField$p(this, "user");
1564
1620
  __publicField$p(this, "resources");
1565
1621
  __publicField$p(this, "cache");
1622
+ __publicField$p(this, "withCredentials");
1623
+ __publicField$p(this, "client", `NextGIS-NGW-Connector/${pkg.version}`);
1566
1624
  __publicField$p(this, "routeStr", "/api/component/pyramid/route");
1567
1625
  __publicField$p(this, "activeRequests", {});
1568
1626
  __publicField$p(this, "requestTransform");
@@ -1571,11 +1629,15 @@ class NgwConnector {
1571
1629
  if (exist) {
1572
1630
  return exist;
1573
1631
  } else {
1574
- if (this.options.route) {
1575
- this.routeStr = this.options.route;
1632
+ const { route, requestTransform, withCredentials } = this.options;
1633
+ if (route) {
1634
+ this.routeStr = route;
1576
1635
  }
1577
- if (this.options.requestTransform) {
1578
- this.requestTransform = this.options.requestTransform;
1636
+ if (requestTransform) {
1637
+ this.requestTransform = requestTransform;
1638
+ }
1639
+ if (withCredentials !== void 0) {
1640
+ this.withCredentials = withCredentials;
1579
1641
  }
1580
1642
  this.resources = new ResourcesControl({
1581
1643
  connector: this,
@@ -1629,8 +1691,9 @@ class NgwConnector {
1629
1691
  yield this._login({ login, password });
1630
1692
  }
1631
1693
  }
1694
+ const routeUrl = `${this.routeStr}?client=${this.client}`;
1632
1695
  return yield this.makeQuery(
1633
- this.routeStr,
1696
+ routeUrl,
1634
1697
  {},
1635
1698
  {
1636
1699
  cacheName: "route",
@@ -1849,6 +1912,7 @@ class NgwConnector {
1849
1912
  url = template(url, restParams);
1850
1913
  }
1851
1914
  url = encodeURI(fixUrlStr(url));
1915
+ options = __spreadValues$t({ withCredentials: this.withCredentials }, options);
1852
1916
  const {
1853
1917
  cache,
1854
1918
  signal: externalSignal,
@@ -1880,7 +1944,7 @@ class NgwConnector {
1880
1944
  }
1881
1945
  });
1882
1946
  if (cache && method === "GET") {
1883
- const cacheOptions = cacheProps ? cacheProps : __spreadProps$d(__spreadValues$t({}, objectRemoveEmpty({
1947
+ const cacheOptions = cacheProps ? cacheProps : __spreadProps$f(__spreadValues$t({}, objectRemoveEmpty({
1884
1948
  headers,
1885
1949
  withCredentials,
1886
1950
  responseType,
@@ -2142,8 +2206,8 @@ function propertiesFilter(properties, filters) {
2142
2206
  }
2143
2207
 
2144
2208
  var __defProp$B = Object.defineProperty;
2145
- var __defProps$c = Object.defineProperties;
2146
- var __getOwnPropDescs$c = Object.getOwnPropertyDescriptors;
2209
+ var __defProps$e = Object.defineProperties;
2210
+ var __getOwnPropDescs$e = Object.getOwnPropertyDescriptors;
2147
2211
  var __getOwnPropSymbols$s = Object.getOwnPropertySymbols;
2148
2212
  var __hasOwnProp$s = Object.prototype.hasOwnProperty;
2149
2213
  var __propIsEnum$s = Object.prototype.propertyIsEnumerable;
@@ -2159,7 +2223,7 @@ var __spreadValues$r = (a, b) => {
2159
2223
  }
2160
2224
  return a;
2161
2225
  };
2162
- var __spreadProps$c = (a, b) => __defProps$c(a, __getOwnPropDescs$c(b));
2226
+ var __spreadProps$e = (a, b) => __defProps$e(a, __getOwnPropDescs$e(b));
2163
2227
  var __async$p = (__this, __arguments, generator) => {
2164
2228
  return new Promise((resolve, reject) => {
2165
2229
  var fulfilled = (value) => {
@@ -2200,7 +2264,7 @@ function updateItemRequestParam(params, options) {
2200
2264
  if (extensionsStr !== "*") {
2201
2265
  params.extensions = extensionsStr;
2202
2266
  }
2203
- if (fields !== void 0) {
2267
+ if (fields !== void 0 && fields !== null) {
2204
2268
  params.fields = Array.isArray(fields) ? fields.join(",") : "";
2205
2269
  }
2206
2270
  if (geom !== void 0) {
@@ -2264,13 +2328,13 @@ function getQueries(opt, _queries = [], _parentAllParams = []) {
2264
2328
  for (const f of filters_) {
2265
2329
  if (isPropertyFilter(f)) {
2266
2330
  _queries.push(
2267
- fetchNgwLayerItemsRequest(__spreadProps$c(__spreadValues$r({}, opt), {
2331
+ fetchNgwLayerItemsRequest(__spreadProps$e(__spreadValues$r({}, opt), {
2268
2332
  paramList: [..._parentAllParams, ...paramList, createParam(f)]
2269
2333
  }))
2270
2334
  );
2271
2335
  } else {
2272
2336
  getQueries(
2273
- __spreadProps$c(__spreadValues$r({}, opt), {
2337
+ __spreadProps$e(__spreadValues$r({}, opt), {
2274
2338
  filters: f
2275
2339
  }),
2276
2340
  _queries,
@@ -2291,7 +2355,7 @@ function getQueries(opt, _queries = [], _parentAllParams = []) {
2291
2355
  if (propertiesFilterList.length) {
2292
2356
  for (const x of propertiesFilterList) {
2293
2357
  getQueries(
2294
- __spreadProps$c(__spreadValues$r({}, opt), {
2358
+ __spreadProps$e(__spreadValues$r({}, opt), {
2295
2359
  filters: x
2296
2360
  }),
2297
2361
  _queries,
@@ -2300,7 +2364,7 @@ function getQueries(opt, _queries = [], _parentAllParams = []) {
2300
2364
  }
2301
2365
  } else {
2302
2366
  _queries.push(
2303
- fetchNgwLayerItemsRequest(__spreadProps$c(__spreadValues$r({}, opt), {
2367
+ fetchNgwLayerItemsRequest(__spreadProps$e(__spreadValues$r({}, opt), {
2304
2368
  paramList: [..._parentAllParams, ...paramList, ...filters2]
2305
2369
  }))
2306
2370
  );
@@ -2366,8 +2430,8 @@ function fetchNgwLayerItemsRequest(options) {
2366
2430
  }
2367
2431
 
2368
2432
  var __defProp$A = Object.defineProperty;
2369
- var __defProps$b = Object.defineProperties;
2370
- var __getOwnPropDescs$b = Object.getOwnPropertyDescriptors;
2433
+ var __defProps$d = Object.defineProperties;
2434
+ var __getOwnPropDescs$d = Object.getOwnPropertyDescriptors;
2371
2435
  var __getOwnPropSymbols$r = Object.getOwnPropertySymbols;
2372
2436
  var __hasOwnProp$r = Object.prototype.hasOwnProperty;
2373
2437
  var __propIsEnum$r = Object.prototype.propertyIsEnumerable;
@@ -2383,7 +2447,7 @@ var __spreadValues$q = (a, b) => {
2383
2447
  }
2384
2448
  return a;
2385
2449
  };
2386
- var __spreadProps$b = (a, b) => __defProps$b(a, __getOwnPropDescs$b(b));
2450
+ var __spreadProps$d = (a, b) => __defProps$d(a, __getOwnPropDescs$d(b));
2387
2451
  var __async$o = (__this, __arguments, generator) => {
2388
2452
  return new Promise((resolve, reject) => {
2389
2453
  var fulfilled = (value) => {
@@ -2421,16 +2485,16 @@ function fetchNgwLayerItem(options) {
2421
2485
  if (resp.geom) {
2422
2486
  return createGeoJsonFeature(resp);
2423
2487
  } else {
2424
- const onlyGeomItem = yield fetchNgwLayerItem(__spreadProps$b(__spreadValues$q({}, options), {
2488
+ const onlyGeomItem = yield fetchNgwLayerItem(__spreadProps$d(__spreadValues$q({}, options), {
2425
2489
  geom: true,
2426
2490
  fields: null,
2427
2491
  extensions: null
2428
2492
  }));
2429
2493
  const geom = onlyGeomItem.geom;
2430
- return createGeoJsonFeature(__spreadProps$b(__spreadValues$q({}, resp), { geom }));
2494
+ return createGeoJsonFeature(__spreadProps$d(__spreadValues$q({}, resp), { geom }));
2431
2495
  }
2432
2496
  });
2433
- return __spreadProps$b(__spreadValues$q({}, resp), {
2497
+ return __spreadProps$d(__spreadValues$q({}, resp), {
2434
2498
  toGeojson
2435
2499
  });
2436
2500
  });
@@ -3087,8 +3151,8 @@ class WebmapLayerOpacityPropertyHandler extends BaseProperty {
3087
3151
  }
3088
3152
 
3089
3153
  var __defProp$t = Object.defineProperty;
3090
- var __defProps$a = Object.defineProperties;
3091
- var __getOwnPropDescs$a = Object.getOwnPropertyDescriptors;
3154
+ var __defProps$c = Object.defineProperties;
3155
+ var __getOwnPropDescs$c = Object.getOwnPropertyDescriptors;
3092
3156
  var __getOwnPropSymbols$m = Object.getOwnPropertySymbols;
3093
3157
  var __hasOwnProp$m = Object.prototype.hasOwnProperty;
3094
3158
  var __propIsEnum$m = Object.prototype.propertyIsEnumerable;
@@ -3104,7 +3168,7 @@ var __spreadValues$l = (a, b) => {
3104
3168
  }
3105
3169
  return a;
3106
3170
  };
3107
- var __spreadProps$a = (a, b) => __defProps$a(a, __getOwnPropDescs$a(b));
3171
+ var __spreadProps$c = (a, b) => __defProps$c(a, __getOwnPropDescs$c(b));
3108
3172
  function getNgwWebmapExtent(webmap) {
3109
3173
  const bottom = webmap["extent_bottom"];
3110
3174
  const left = webmap["extent_left"];
@@ -3172,14 +3236,14 @@ function fetchNgwResourceExtent(item, connector, options) {
3172
3236
  if (resource.cls && resource.cls.indexOf("style") !== -1) {
3173
3237
  return connector.getResource(resource.parent.id, options).then((res) => {
3174
3238
  if (res) {
3175
- return fetchNgwLayerExtent(__spreadProps$a(__spreadValues$l({}, options), {
3239
+ return fetchNgwLayerExtent(__spreadProps$c(__spreadValues$l({}, options), {
3176
3240
  resourceId: res.resource.id,
3177
3241
  connector
3178
3242
  }));
3179
3243
  }
3180
3244
  });
3181
3245
  } else {
3182
- return fetchNgwLayerExtent(__spreadProps$a(__spreadValues$l({}, options), {
3246
+ return fetchNgwLayerExtent(__spreadProps$c(__spreadValues$l({}, options), {
3183
3247
  resourceId: resource.id,
3184
3248
  connector
3185
3249
  }));
@@ -3501,8 +3565,8 @@ __publicField$g(QmsKit, "utils", {
3501
3565
  });
3502
3566
 
3503
3567
  var __defProp$p = Object.defineProperty;
3504
- var __defProps$9 = Object.defineProperties;
3505
- var __getOwnPropDescs$9 = Object.getOwnPropertyDescriptors;
3568
+ var __defProps$b = Object.defineProperties;
3569
+ var __getOwnPropDescs$b = Object.getOwnPropertyDescriptors;
3506
3570
  var __getOwnPropSymbols$j = Object.getOwnPropertySymbols;
3507
3571
  var __getProtoOf$2 = Object.getPrototypeOf;
3508
3572
  var __hasOwnProp$j = Object.prototype.hasOwnProperty;
@@ -3520,7 +3584,7 @@ var __spreadValues$i = (a, b) => {
3520
3584
  }
3521
3585
  return a;
3522
3586
  };
3523
- var __spreadProps$9 = (a, b) => __defProps$9(a, __getOwnPropDescs$9(b));
3587
+ var __spreadProps$b = (a, b) => __defProps$b(a, __getOwnPropDescs$b(b));
3524
3588
  var __superGet$2 = (cls, obj, key) => __reflectGet$2(__getProtoOf$2(cls), key, obj);
3525
3589
  var __async$k = (__this, __arguments, generator) => {
3526
3590
  return new Promise((resolve, reject) => {
@@ -3565,7 +3629,7 @@ function createBasemapLayerAdapter(_0) {
3565
3629
  class BasemapTileAdapter extends TileAdapter {
3566
3630
  addLayer(opt) {
3567
3631
  return __async$k(this, null, function* () {
3568
- return __superGet$2(BasemapTileAdapter.prototype, this, "addLayer").call(this, __spreadProps$9(__spreadValues$i({}, opt), { url }));
3632
+ return __superGet$2(BasemapTileAdapter.prototype, this, "addLayer").call(this, __spreadProps$b(__spreadValues$i({}, opt), { url }));
3569
3633
  });
3570
3634
  }
3571
3635
  }
@@ -3645,8 +3709,8 @@ function prepareNgwFieldsToPropertiesFilter(fields) {
3645
3709
  }
3646
3710
 
3647
3711
  var __defProp$o = Object.defineProperty;
3648
- var __defProps$8 = Object.defineProperties;
3649
- var __getOwnPropDescs$8 = Object.getOwnPropertyDescriptors;
3712
+ var __defProps$a = Object.defineProperties;
3713
+ var __getOwnPropDescs$a = Object.getOwnPropertyDescriptors;
3650
3714
  var __getOwnPropSymbols$i = Object.getOwnPropertySymbols;
3651
3715
  var __hasOwnProp$i = Object.prototype.hasOwnProperty;
3652
3716
  var __propIsEnum$i = Object.prototype.propertyIsEnumerable;
@@ -3662,7 +3726,7 @@ var __spreadValues$h = (a, b) => {
3662
3726
  }
3663
3727
  return a;
3664
3728
  };
3665
- var __spreadProps$8 = (a, b) => __defProps$8(a, __getOwnPropDescs$8(b));
3729
+ var __spreadProps$a = (a, b) => __defProps$a(a, __getOwnPropDescs$a(b));
3666
3730
  var __async$j = (__this, __arguments, generator) => {
3667
3731
  return new Promise((resolve, reject) => {
3668
3732
  var fulfilled = (value) => {
@@ -3688,13 +3752,13 @@ function fetchNgwLayerItems(options) {
3688
3752
  var _a;
3689
3753
  const filters = options.filters;
3690
3754
  if (filters) {
3691
- let data = yield createFeatureFieldFilterQueries(__spreadProps$8(__spreadValues$h({}, options), {
3755
+ let data = yield createFeatureFieldFilterQueries(__spreadProps$a(__spreadValues$h({}, options), {
3692
3756
  filters
3693
3757
  }));
3694
3758
  const clientFilterValidate = (_a = options.clientFilterValidate) != null ? _a : isFilterWithAnyCase(filters);
3695
3759
  if (clientFilterValidate) {
3696
3760
  data = data.filter((y) => {
3697
- const fields = prepareNgwFieldsToPropertiesFilter(__spreadProps$8(__spreadValues$h({}, y.fields), {
3761
+ const fields = prepareNgwFieldsToPropertiesFilter(__spreadProps$a(__spreadValues$h({}, y.fields), {
3698
3762
  id: y.id
3699
3763
  }));
3700
3764
  const result = propertiesFilter(fields, filters);
@@ -3783,8 +3847,8 @@ function getLayerFilterOptions(options) {
3783
3847
  }
3784
3848
 
3785
3849
  var __defProp$n = Object.defineProperty;
3786
- var __defProps$7 = Object.defineProperties;
3787
- var __getOwnPropDescs$7 = Object.getOwnPropertyDescriptors;
3850
+ var __defProps$9 = Object.defineProperties;
3851
+ var __getOwnPropDescs$9 = Object.getOwnPropertyDescriptors;
3788
3852
  var __getOwnPropSymbols$h = Object.getOwnPropertySymbols;
3789
3853
  var __getProtoOf$1 = Object.getPrototypeOf;
3790
3854
  var __hasOwnProp$h = Object.prototype.hasOwnProperty;
@@ -3802,7 +3866,7 @@ var __spreadValues$g = (a, b) => {
3802
3866
  }
3803
3867
  return a;
3804
3868
  };
3805
- var __spreadProps$7 = (a, b) => __defProps$7(a, __getOwnPropDescs$7(b));
3869
+ var __spreadProps$9 = (a, b) => __defProps$9(a, __getOwnPropDescs$9(b));
3806
3870
  var __publicField$f = (obj, key, value) => __defNormalProp$n(obj, typeof key !== "symbol" ? key + "" : key, value);
3807
3871
  var __superGet$1 = (cls, obj, key) => __reflectGet$1(__getProtoOf$1(cls), key, obj);
3808
3872
  var __async$h = (__this, __arguments, generator) => {
@@ -3981,7 +4045,7 @@ function createGeoJsonAdapter(props) {
3981
4045
  try {
3982
4046
  this.emitter.emit("preupdate", filterArgs);
3983
4047
  webMap._emitLayerEvent("layer:preupdate", options.id || "", filterArgs);
3984
- const data = yield getData(filterArgs.filters, __spreadProps$7(__spreadValues$g({}, filterArgs.options), {
4048
+ const data = yield getData(filterArgs.filters, __spreadProps$9(__spreadValues$g({}, filterArgs.options), {
3985
4049
  srs: this.options.srs
3986
4050
  }));
3987
4051
  let newData = data;
@@ -4034,7 +4098,7 @@ function createGeoJsonAdapter(props) {
4034
4098
  if (this.clearLayer) {
4035
4099
  this.clearLayer();
4036
4100
  }
4037
- const data = yield getData(filters, __spreadProps$7(__spreadValues$g({}, opt), {
4101
+ const data = yield getData(filters, __spreadProps$9(__spreadValues$g({}, opt), {
4038
4102
  srs: this.options.srs
4039
4103
  }));
4040
4104
  this.setData(data);
@@ -4224,8 +4288,8 @@ function ngwApiToAdapterOptions({
4224
4288
  }
4225
4289
 
4226
4290
  var __defProp$m = Object.defineProperty;
4227
- var __defProps$6 = Object.defineProperties;
4228
- var __getOwnPropDescs$6 = Object.getOwnPropertyDescriptors;
4291
+ var __defProps$8 = Object.defineProperties;
4292
+ var __getOwnPropDescs$8 = Object.getOwnPropertyDescriptors;
4229
4293
  var __getOwnPropSymbols$g = Object.getOwnPropertySymbols;
4230
4294
  var __hasOwnProp$g = Object.prototype.hasOwnProperty;
4231
4295
  var __propIsEnum$g = Object.prototype.propertyIsEnumerable;
@@ -4241,7 +4305,7 @@ var __spreadValues$f = (a, b) => {
4241
4305
  }
4242
4306
  return a;
4243
4307
  };
4244
- var __spreadProps$6 = (a, b) => __defProps$6(a, __getOwnPropDescs$6(b));
4308
+ var __spreadProps$8 = (a, b) => __defProps$8(a, __getOwnPropDescs$8(b));
4245
4309
  var __publicField$e = (obj, key, value) => __defNormalProp$m(obj, typeof key !== "symbol" ? key + "" : key, value);
4246
4310
  var __async$f = (__this, __arguments, generator) => {
4247
4311
  return new Promise((resolve, reject) => {
@@ -4305,7 +4369,7 @@ function createRasterAdapter(_0) {
4305
4369
  baseUrl: connector.options.baseUrl || ""
4306
4370
  });
4307
4371
  if (opt) {
4308
- const layerAdapterOptions = __spreadProps$6(__spreadValues$f(__spreadValues$f({}, opt), layerOptions.adapterOptions), {
4372
+ const layerAdapterOptions = __spreadProps$8(__spreadValues$f(__spreadValues$f({}, opt), layerOptions.adapterOptions), {
4309
4373
  params: { resource: resourceId },
4310
4374
  layers: opt.layers || String(resourceId),
4311
4375
  resourceId
@@ -4363,8 +4427,8 @@ function createRasterAdapter(_0) {
4363
4427
  }
4364
4428
 
4365
4429
  var __defProp$l = Object.defineProperty;
4366
- var __defProps$5 = Object.defineProperties;
4367
- var __getOwnPropDescs$5 = Object.getOwnPropertyDescriptors;
4430
+ var __defProps$7 = Object.defineProperties;
4431
+ var __getOwnPropDescs$7 = Object.getOwnPropertyDescriptors;
4368
4432
  var __getOwnPropSymbols$f = Object.getOwnPropertySymbols;
4369
4433
  var __hasOwnProp$f = Object.prototype.hasOwnProperty;
4370
4434
  var __propIsEnum$f = Object.prototype.propertyIsEnumerable;
@@ -4380,7 +4444,7 @@ var __spreadValues$e = (a, b) => {
4380
4444
  }
4381
4445
  return a;
4382
4446
  };
4383
- var __spreadProps$5 = (a, b) => __defProps$5(a, __getOwnPropDescs$5(b));
4447
+ var __spreadProps$7 = (a, b) => __defProps$7(a, __getOwnPropDescs$7(b));
4384
4448
  var __async$e = (__this, __arguments, generator) => {
4385
4449
  return new Promise((resolve, reject) => {
4386
4450
  var fulfilled = (value) => {
@@ -4428,7 +4492,7 @@ function createAdapterFromFirstStyle(_0) {
4428
4492
  const firstStyle = childrenStyles && childrenStyles[0];
4429
4493
  if (firstStyle) {
4430
4494
  return createAsyncAdapter(
4431
- __spreadProps$5(__spreadValues$e({}, layerOptions), { resource: firstStyle.resource.id }),
4495
+ __spreadProps$7(__spreadValues$e({}, layerOptions), { resource: firstStyle.resource.id }),
4432
4496
  webMap,
4433
4497
  connector
4434
4498
  );
@@ -4451,13 +4515,13 @@ function createAsyncAdapter(options, webMap, connector) {
4451
4515
  }
4452
4516
  if (item) {
4453
4517
  const cls = item.resource.cls;
4454
- const layerOptions = __spreadProps$5(__spreadValues$e({}, options), {
4518
+ const layerOptions = __spreadProps$7(__spreadValues$e({}, options), {
4455
4519
  resource: resourceId
4456
4520
  });
4457
4521
  const adapterOptions = {
4458
4522
  layerOptions,
4459
- webMap,
4460
4523
  connector,
4524
+ webMap,
4461
4525
  item
4462
4526
  };
4463
4527
  if (supportCls.indexOf(cls) !== -1) {
@@ -4488,10 +4552,10 @@ function createAsyncAdapter(options, webMap, connector) {
4488
4552
  item.resource.parent.id
4489
4553
  );
4490
4554
  if (parentItem) {
4491
- const parentOptions = __spreadProps$5(__spreadValues$e({}, options), {
4555
+ const parentOptions = __spreadProps$7(__spreadValues$e({}, options), {
4492
4556
  resource: item.resource.parent.id
4493
4557
  });
4494
- adapter = createGeoJsonAdapter(__spreadProps$5(__spreadValues$e({}, adapterOptions), {
4558
+ adapter = createGeoJsonAdapter(__spreadProps$7(__spreadValues$e({}, adapterOptions), {
4495
4559
  item: parentItem,
4496
4560
  layerOptions: parentOptions
4497
4561
  }));
@@ -4580,6 +4644,9 @@ function createNgwLayerAdapter(options, webMap, connector) {
4580
4644
  if (headers) {
4581
4645
  options.headers = headers;
4582
4646
  }
4647
+ if (connector.withCredentials !== void 0) {
4648
+ options.withCredentials = connector.withCredentials;
4649
+ }
4583
4650
  return createAsyncAdapter(options, webMap, connector);
4584
4651
  }
4585
4652
  function extendNgwWebmapLayerAdapter(opt) {
@@ -4617,6 +4684,8 @@ function setScaleRatio(scale, lat = 0) {
4617
4684
  }
4618
4685
 
4619
4686
  var __defProp$j = Object.defineProperty;
4687
+ var __defProps$6 = Object.defineProperties;
4688
+ var __getOwnPropDescs$6 = Object.getOwnPropertyDescriptors;
4620
4689
  var __getOwnPropSymbols$d = Object.getOwnPropertySymbols;
4621
4690
  var __hasOwnProp$d = Object.prototype.hasOwnProperty;
4622
4691
  var __propIsEnum$d = Object.prototype.propertyIsEnumerable;
@@ -4632,6 +4701,7 @@ var __spreadValues$c = (a, b) => {
4632
4701
  }
4633
4702
  return a;
4634
4703
  };
4704
+ var __spreadProps$6 = (a, b) => __defProps$6(a, __getOwnPropDescs$6(b));
4635
4705
  var __publicField$d = (obj, key, value) => __defNormalProp$j(obj, typeof key !== "symbol" ? key + "" : key, value);
4636
4706
  var __async$d = (__this, __arguments, generator) => {
4637
4707
  return new Promise((resolve, reject) => {
@@ -4737,14 +4807,12 @@ const _NgwWebmapItem = class _NgwWebmapItem extends Item {
4737
4807
  getItemOptions(item) {
4738
4808
  const transparency = item.item_type === "layer" && item.layer_transparency;
4739
4809
  const opacity = typeof transparency === "number" ? (100 - transparency) / 100 : void 0;
4740
- const options = {
4810
+ const options = __spreadProps$6(__spreadValues$c({
4741
4811
  visibility: false,
4742
- name: item.display_name,
4743
- headers: this.options.headers,
4744
- crossOrigin: this.options.crossOrigin,
4745
- setViewDelay: this.options.setViewDelay,
4812
+ name: item.display_name
4813
+ }, this.options), {
4746
4814
  params: { resource: this.item.resourceId, item: this.item }
4747
- };
4815
+ });
4748
4816
  if (this.options.order) {
4749
4817
  const subOrder = this.options.drawOrderEnabled && "draw_order_position" in item ? this._rootDescendantsCount - item.draw_order_position : this.id;
4750
4818
  const subLevel = String(subOrder).padStart(4, "0");
@@ -4755,17 +4823,16 @@ const _NgwWebmapItem = class _NgwWebmapItem extends Item {
4755
4823
  }
4756
4824
  if (item.item_type === "layer") {
4757
4825
  const { maxZoom, minZoom } = this._getZoomRange(item);
4758
- Object.assign(options, {
4759
- updateWmsParams: item.updateWmsParams,
4826
+ Object.assign(options, __spreadProps$6(__spreadValues$c({
4827
+ updateWmsParams: item.updateWmsParams
4828
+ }, this.options), {
4760
4829
  url: item.url,
4761
- headers: this.options.headers,
4762
- ratio: this.options.ratio,
4763
4830
  maxZoom,
4764
4831
  minZoom,
4765
4832
  minScale: item.layer_min_scale_denom,
4766
4833
  maxScale: item.layer_max_scale_denom,
4767
4834
  interactive: item.layer_identifiable
4768
- });
4835
+ }));
4769
4836
  }
4770
4837
  if (opacity !== void 0) {
4771
4838
  options.opacity = opacity;
@@ -5071,6 +5138,8 @@ function createOnFirstShowNgwAdapter(_0) {
5071
5138
  const WEBMAP_BASELAYER_ID_PREFIX = "webmap-baselayer";
5072
5139
 
5073
5140
  var __defProp$h = Object.defineProperty;
5141
+ var __defProps$5 = Object.defineProperties;
5142
+ var __getOwnPropDescs$5 = Object.getOwnPropertyDescriptors;
5074
5143
  var __getOwnPropSymbols$b = Object.getOwnPropertySymbols;
5075
5144
  var __hasOwnProp$b = Object.prototype.hasOwnProperty;
5076
5145
  var __propIsEnum$b = Object.prototype.propertyIsEnumerable;
@@ -5086,6 +5155,7 @@ var __spreadValues$a = (a, b) => {
5086
5155
  }
5087
5156
  return a;
5088
5157
  };
5158
+ var __spreadProps$5 = (a, b) => __defProps$5(a, __getOwnPropDescs$5(b));
5089
5159
  var __publicField$b = (obj, key, value) => __defNormalProp$h(obj, typeof key !== "symbol" ? key + "" : key, value);
5090
5160
  var __async$a = (__this, __arguments, generator) => {
5091
5161
  return new Promise((resolve, reject) => {
@@ -5284,35 +5354,32 @@ class NgwWebmapLayerAdapter {
5284
5354
  }
5285
5355
  _getWebMapLayerItem() {
5286
5356
  return __async$a(this, null, function* () {
5287
- if (this.resourceId) {
5288
- const webmap = yield this.getWebMapConfig(this.resourceId);
5289
- if (webmap && webmap.root_item) {
5290
- return new Promise((resolve) => {
5291
- const options = {};
5292
- if (this.options.connector && this.options.connector.options.auth) {
5293
- const headers = this.options.connector.getAuthorizationHeaders();
5294
- if (headers) {
5295
- options.headers = headers;
5296
- }
5297
- }
5298
- options.setViewDelay = this.options.setViewDelay;
5299
- options.order = this.options.order;
5300
- options.ratio = this.options.ratio;
5301
- options.crossOrigin = this.options.crossOrigin;
5302
- options.minZoom = this.options.minZoom;
5303
- options.maxZoom = this.options.maxZoom;
5304
- options.drawOrderEnabled = webmap.draw_order_enabled;
5305
- options.popupOptions = this.options.popupOptions;
5306
- const layer = new this.NgwWebmapItem(
5307
- this.options.webMap,
5308
- webmap.root_item,
5309
- options,
5310
- this.options.connector
5311
- );
5312
- layer.emitter.on("init", () => resolve(layer));
5313
- });
5314
- }
5315
- }
5357
+ if (!this.resourceId) {
5358
+ return void 0;
5359
+ }
5360
+ const webmap = yield this.getWebMapConfig(this.resourceId);
5361
+ if (!webmap || !webmap.root_item) {
5362
+ return void 0;
5363
+ }
5364
+ return new Promise((resolve) => {
5365
+ const connector = this.options.connector;
5366
+ const headers = (connector == null ? void 0 : connector.options.auth) ? connector.getAuthorizationHeaders() : void 0;
5367
+ const withCredentials = connector.withCredentials;
5368
+ const options = __spreadProps$5(__spreadValues$a({}, this.options), {
5369
+ withCredentials,
5370
+ headers,
5371
+ drawOrderEnabled: webmap.draw_order_enabled
5372
+ });
5373
+ const layer = new this.NgwWebmapItem(
5374
+ this.options.webMap,
5375
+ webmap.root_item,
5376
+ options,
5377
+ connector
5378
+ );
5379
+ layer.emitter.on("init", () => {
5380
+ resolve(layer);
5381
+ });
5382
+ });
5316
5383
  });
5317
5384
  }
5318
5385
  getWebMapConfig(id) {
@@ -8959,7 +9026,8 @@ function prepareWebMapOptions(options) {
8959
9026
  if (!options.connector) {
8960
9027
  options.connector = new NgwConnector({
8961
9028
  baseUrl: options.baseUrl || "",
8962
- auth: options.auth
9029
+ auth: options.auth,
9030
+ withCredentials: options.withCredentials
8963
9031
  });
8964
9032
  } else if (options.connector) {
8965
9033
  options.baseUrl = options.connector.options.baseUrl;