@nextgis/ngw-leaflet 3.0.0-alpha.0 → 3.0.0-alpha.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,4 +1,4 @@
1
- /** Bundle of @nextgis/ngw-leaflet; version: 3.0.0-alpha.0; author: NextGIS */
1
+ /** Bundle of @nextgis/ngw-leaflet; version: 3.0.0-alpha.1; author: NextGIS */
2
2
  function styleInject(css, ref) {
3
3
  if ( ref === void 0 ) ref = {};
4
4
  var insertAt = ref.insertAt;
@@ -16155,8 +16155,8 @@ function preparePaint({
16155
16155
  }
16156
16156
 
16157
16157
  var __defProp$R = Object.defineProperty;
16158
- var __defProps$j = Object.defineProperties;
16159
- var __getOwnPropDescs$j = Object.getOwnPropertyDescriptors;
16158
+ var __defProps$l = Object.defineProperties;
16159
+ var __getOwnPropDescs$l = Object.getOwnPropertyDescriptors;
16160
16160
  var __getOwnPropSymbols$A = Object.getOwnPropertySymbols;
16161
16161
  var __hasOwnProp$A = Object.prototype.hasOwnProperty;
16162
16162
  var __propIsEnum$A = Object.prototype.propertyIsEnumerable;
@@ -16172,7 +16172,7 @@ var __spreadValues$z = (a, b) => {
16172
16172
  }
16173
16173
  return a;
16174
16174
  };
16175
- var __spreadProps$j = (a, b) => __defProps$j(a, __getOwnPropDescs$j(b));
16175
+ var __spreadProps$l = (a, b) => __defProps$l(a, __getOwnPropDescs$l(b));
16176
16176
  var __objRest$5 = (source, exclude) => {
16177
16177
  var target = {};
16178
16178
  for (var prop in source)
@@ -16267,7 +16267,7 @@ class GeoJsonPaint {
16267
16267
  if (html) {
16268
16268
  element.innerHTML = html;
16269
16269
  }
16270
- const divIcon = new leafletSrcExports.DivIcon(__spreadProps$j(__spreadValues$z({
16270
+ const divIcon = new leafletSrcExports.DivIcon(__spreadProps$l(__spreadValues$z({
16271
16271
  className: ""
16272
16272
  }, toLIconOpt), {
16273
16273
  html: element
@@ -16316,8 +16316,8 @@ class GeoJsonPaint {
16316
16316
  }
16317
16317
 
16318
16318
  var __defProp$Q = Object.defineProperty;
16319
- var __defProps$i = Object.defineProperties;
16320
- var __getOwnPropDescs$i = Object.getOwnPropertyDescriptors;
16319
+ var __defProps$k = Object.defineProperties;
16320
+ var __getOwnPropDescs$k = Object.getOwnPropertyDescriptors;
16321
16321
  var __getOwnPropSymbols$z = Object.getOwnPropertySymbols;
16322
16322
  var __hasOwnProp$z = Object.prototype.hasOwnProperty;
16323
16323
  var __propIsEnum$z = Object.prototype.propertyIsEnumerable;
@@ -16333,7 +16333,7 @@ var __spreadValues$y = (a, b) => {
16333
16333
  }
16334
16334
  return a;
16335
16335
  };
16336
- var __spreadProps$i = (a, b) => __defProps$i(a, __getOwnPropDescs$i(b));
16336
+ var __spreadProps$k = (a, b) => __defProps$k(a, __getOwnPropDescs$k(b));
16337
16337
  var __publicField$B = (obj, key, value) => __defNormalProp$Q(obj, typeof key !== "symbol" ? key + "" : key, value);
16338
16338
  var __async$s = (__this, __arguments, generator) => {
16339
16339
  return new Promise((resolve, reject) => {
@@ -16382,7 +16382,7 @@ class GeoJsonAdapter extends BaseAdapter {
16382
16382
  addLayer(options) {
16383
16383
  Object.assign(this.options, options);
16384
16384
  this.paint = options.paint;
16385
- this.layer = new leafletSrcExports.FeatureGroup([], __spreadProps$i(__spreadValues$y({}, options.nativeOptions), {
16385
+ this.layer = new leafletSrcExports.FeatureGroup([], __spreadProps$k(__spreadValues$y({}, options.nativeOptions), {
16386
16386
  pane: this.pane
16387
16387
  }));
16388
16388
  this.selectedPaint = options.selectedPaint;
@@ -16732,7 +16732,7 @@ class GeoJsonAdapter extends BaseAdapter {
16732
16732
  if (feature) {
16733
16733
  return this._paint.preparePaint(__spreadValues$y(__spreadValues$y({}, PAINT), paint(feature)));
16734
16734
  } else {
16735
- return this._paint.preparePaint(__spreadProps$i(__spreadValues$y({}, PAINT), { type: "path" }));
16735
+ return this._paint.preparePaint(__spreadProps$k(__spreadValues$y({}, PAINT), { type: "path" }));
16736
16736
  }
16737
16737
  }
16738
16738
  };
@@ -16892,7 +16892,11 @@ class GeoJsonAdapter extends BaseAdapter {
16892
16892
  }
16893
16893
  }
16894
16894
 
16895
- function callAjax(src, headers) {
16895
+ function callAjax({
16896
+ src,
16897
+ headers,
16898
+ withCredentials
16899
+ }) {
16896
16900
  let abortFunc = () => {
16897
16901
  };
16898
16902
  const promise = new Promise((resolve, reject) => {
@@ -16902,6 +16906,9 @@ function callAjax(src, headers) {
16902
16906
  for (const h in headers) {
16903
16907
  xhr.setRequestHeader(h, headers[h]);
16904
16908
  }
16909
+ if (withCredentials) {
16910
+ xhr.withCredentials = withCredentials;
16911
+ }
16905
16912
  xhr.onload = function() {
16906
16913
  const arrayBufferView = new Uint8Array(this.response);
16907
16914
  const blob = new Blob([arrayBufferView], { type: "image/png" });
@@ -17024,12 +17031,16 @@ class ImageOverlay extends leafletSrcExports.ImageOverlay {
17024
17031
  }
17025
17032
  _initImage() {
17026
17033
  super._initImage();
17027
- const headers = this.options.headers;
17034
+ const { headers, withCredentials } = this.options;
17028
17035
  const img = this._image;
17029
17036
  const src = img.src;
17030
17037
  img.src = "";
17031
17038
  imageQueue.add(() => {
17032
- const [promise, abortFunc] = callAjax(src, headers);
17039
+ const [promise, abortFunc] = callAjax({
17040
+ src,
17041
+ headers,
17042
+ withCredentials
17043
+ });
17033
17044
  promise.then((imgUrl) => {
17034
17045
  img.src = imgUrl;
17035
17046
  });
@@ -17063,6 +17074,7 @@ class ImageLayer extends leafletSrcExports.Layer {
17063
17074
  minZoom: 0,
17064
17075
  pane: "tilePane",
17065
17076
  headers: null,
17077
+ withCredentials: false,
17066
17078
  viewPortBuffer: 0,
17067
17079
  setViewDelay: 100
17068
17080
  });
@@ -17132,7 +17144,8 @@ class ImageLayer extends leafletSrcExports.Layer {
17132
17144
  const overlay = new ImageOverlay(url, bounds, {
17133
17145
  opacity: 0,
17134
17146
  pane: this.options.pane,
17135
- headers: this.options.headers
17147
+ headers: this.options.headers,
17148
+ withCredentials: this.options.withCredentials
17136
17149
  });
17137
17150
  overlay.addTo(this._map);
17138
17151
  this._loadedOverlay = overlay;
@@ -17285,13 +17298,13 @@ function makeRemote(Base) {
17285
17298
  }
17286
17299
  }
17287
17300
  createTile(coords, done) {
17288
- const url = this.getTileUrl(coords);
17301
+ const src = this.getTileUrl(coords);
17289
17302
  const tile = document.createElement("img");
17290
- const [promise, abortFunc] = callAjax(
17291
- url,
17292
- // @ts-ignore
17293
- this.options.headers
17294
- );
17303
+ const [promise, abortFunc] = callAjax({
17304
+ src,
17305
+ withCredentials: this.options.withCredentials,
17306
+ headers: this.options.headers
17307
+ });
17295
17308
  promise.then((response) => {
17296
17309
  tile.src = response;
17297
17310
  done(null, tile);
@@ -17335,8 +17348,8 @@ class TileLayerBase extends leafletSrcExports.TileLayer {
17335
17348
  const TileLayer = makeRemote(TileLayerBase);
17336
17349
 
17337
17350
  var __defProp$L = Object.defineProperty;
17338
- var __defProps$h = Object.defineProperties;
17339
- var __getOwnPropDescs$h = Object.getOwnPropertyDescriptors;
17351
+ var __defProps$j = Object.defineProperties;
17352
+ var __getOwnPropDescs$j = Object.getOwnPropertyDescriptors;
17340
17353
  var __getOwnPropSymbols$x = Object.getOwnPropertySymbols;
17341
17354
  var __hasOwnProp$x = Object.prototype.hasOwnProperty;
17342
17355
  var __propIsEnum$x = Object.prototype.propertyIsEnumerable;
@@ -17352,7 +17365,7 @@ var __spreadValues$w = (a, b) => {
17352
17365
  }
17353
17366
  return a;
17354
17367
  };
17355
- var __spreadProps$h = (a, b) => __defProps$h(a, __getOwnPropDescs$h(b));
17368
+ var __spreadProps$j = (a, b) => __defProps$j(a, __getOwnPropDescs$j(b));
17356
17369
  var __objRest$4 = (source, exclude) => {
17357
17370
  var target = {};
17358
17371
  for (var prop in source)
@@ -17381,9 +17394,10 @@ class TileAdapter extends BaseAdapter {
17381
17394
  tileLayerOptions.subdomains = opt.subdomains;
17382
17395
  }
17383
17396
  let layer;
17384
- if (opt.headers) {
17385
- layer = new TileLayer(url, __spreadProps$h(__spreadValues$w({}, tileLayerOptions), {
17397
+ if (opt.headers || opt.withCredentials) {
17398
+ layer = new TileLayer(url, __spreadProps$j(__spreadValues$w({}, tileLayerOptions), {
17386
17399
  headers: opt.headers,
17400
+ withCredentials: opt.withCredentials,
17387
17401
  setViewDelay: opt.setViewDelay
17388
17402
  }));
17389
17403
  } else {
@@ -17406,8 +17420,8 @@ class TileAdapter extends BaseAdapter {
17406
17420
  }
17407
17421
 
17408
17422
  var __defProp$K = Object.defineProperty;
17409
- var __defProps$g = Object.defineProperties;
17410
- var __getOwnPropDescs$g = Object.getOwnPropertyDescriptors;
17423
+ var __defProps$i = Object.defineProperties;
17424
+ var __getOwnPropDescs$i = Object.getOwnPropertyDescriptors;
17411
17425
  var __getOwnPropSymbols$w = Object.getOwnPropertySymbols;
17412
17426
  var __hasOwnProp$w = Object.prototype.hasOwnProperty;
17413
17427
  var __propIsEnum$w = Object.prototype.propertyIsEnumerable;
@@ -17423,11 +17437,11 @@ var __spreadValues$v = (a, b) => {
17423
17437
  }
17424
17438
  return a;
17425
17439
  };
17426
- var __spreadProps$g = (a, b) => __defProps$g(a, __getOwnPropDescs$g(b));
17440
+ var __spreadProps$i = (a, b) => __defProps$i(a, __getOwnPropDescs$i(b));
17427
17441
  class OsmAdapter extends TileAdapter {
17428
17442
  addLayer(options) {
17429
17443
  const url = "https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png";
17430
- return super.addLayer(__spreadProps$g(__spreadValues$v({
17444
+ return super.addLayer(__spreadProps$i(__spreadValues$v({
17431
17445
  name: "OpenStreetMap",
17432
17446
  attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
17433
17447
  }, options), {
@@ -17444,8 +17458,8 @@ class WmsLayerBase extends leafletSrcExports.TileLayer.WMS {
17444
17458
  const WmsLayer = makeRemote(WmsLayerBase);
17445
17459
 
17446
17460
  var __defProp$J = Object.defineProperty;
17447
- var __defProps$f = Object.defineProperties;
17448
- var __getOwnPropDescs$f = Object.getOwnPropertyDescriptors;
17461
+ var __defProps$h = Object.defineProperties;
17462
+ var __getOwnPropDescs$h = Object.getOwnPropertyDescriptors;
17449
17463
  var __getOwnPropSymbols$v = Object.getOwnPropertySymbols;
17450
17464
  var __hasOwnProp$v = Object.prototype.hasOwnProperty;
17451
17465
  var __propIsEnum$v = Object.prototype.propertyIsEnumerable;
@@ -17461,7 +17475,7 @@ var __spreadValues$u = (a, b) => {
17461
17475
  }
17462
17476
  return a;
17463
17477
  };
17464
- var __spreadProps$f = (a, b) => __defProps$f(a, __getOwnPropDescs$f(b));
17478
+ var __spreadProps$h = (a, b) => __defProps$h(a, __getOwnPropDescs$h(b));
17465
17479
  var __objRest$3 = (source, exclude) => {
17466
17480
  var target = {};
17467
17481
  for (var prop in source)
@@ -17489,8 +17503,11 @@ class WmsAdapter extends BaseAdapter {
17489
17503
  transparent: true
17490
17504
  }, options.nativeOptions);
17491
17505
  let layer;
17492
- if (opt.headers) {
17493
- layer = new WmsLayer(url, __spreadProps$f(__spreadValues$u({}, layerOptions), { headers: opt.headers }));
17506
+ if (opt.headers || opt.withCredentials) {
17507
+ layer = new WmsLayer(url, __spreadProps$h(__spreadValues$u({}, layerOptions), {
17508
+ headers: opt.headers,
17509
+ withCredentials: opt.withCredentials
17510
+ }));
17494
17511
  } else {
17495
17512
  layer = new leafletSrcExports.TileLayer.WMS(url, layerOptions);
17496
17513
  }
@@ -18606,8 +18623,8 @@ let loadData;
18606
18623
  }
18607
18624
 
18608
18625
  var __defProp$A = Object.defineProperty;
18609
- var __defProps$e = Object.defineProperties;
18610
- var __getOwnPropDescs$e = Object.getOwnPropertyDescriptors;
18626
+ var __defProps$g = Object.defineProperties;
18627
+ var __getOwnPropDescs$g = Object.getOwnPropertyDescriptors;
18611
18628
  var __getOwnPropSymbols$r = Object.getOwnPropertySymbols;
18612
18629
  var __hasOwnProp$r = Object.prototype.hasOwnProperty;
18613
18630
  var __propIsEnum$r = Object.prototype.propertyIsEnumerable;
@@ -18623,7 +18640,7 @@ var __spreadValues$q = (a, b) => {
18623
18640
  }
18624
18641
  return a;
18625
18642
  };
18626
- var __spreadProps$e = (a, b) => __defProps$e(a, __getOwnPropDescs$e(b));
18643
+ var __spreadProps$g = (a, b) => __defProps$g(a, __getOwnPropDescs$g(b));
18627
18644
  var __objRest$2 = (source, exclude) => {
18628
18645
  var target = {};
18629
18646
  for (var prop in source)
@@ -18667,6 +18684,7 @@ class NgwConnector {
18667
18684
  __publicField$p(this, "user");
18668
18685
  __publicField$p(this, "resources");
18669
18686
  __publicField$p(this, "cache");
18687
+ __publicField$p(this, "withCredentials");
18670
18688
  __publicField$p(this, "routeStr", "/api/component/pyramid/route");
18671
18689
  __publicField$p(this, "activeRequests", {});
18672
18690
  __publicField$p(this, "requestTransform");
@@ -18675,11 +18693,15 @@ class NgwConnector {
18675
18693
  if (exist) {
18676
18694
  return exist;
18677
18695
  } else {
18678
- if (this.options.route) {
18679
- this.routeStr = this.options.route;
18696
+ const { route, requestTransform, withCredentials } = this.options;
18697
+ if (route) {
18698
+ this.routeStr = route;
18680
18699
  }
18681
- if (this.options.requestTransform) {
18682
- this.requestTransform = this.options.requestTransform;
18700
+ if (requestTransform) {
18701
+ this.requestTransform = requestTransform;
18702
+ }
18703
+ if (withCredentials !== void 0) {
18704
+ this.withCredentials = withCredentials;
18683
18705
  }
18684
18706
  this.resources = new ResourcesControl({
18685
18707
  connector: this,
@@ -18953,6 +18975,7 @@ class NgwConnector {
18953
18975
  url = template(url, restParams);
18954
18976
  }
18955
18977
  url = encodeURI(fixUrlStr(url));
18978
+ options = __spreadValues$q({ withCredentials: this.withCredentials }, options);
18956
18979
  const {
18957
18980
  cache,
18958
18981
  signal: externalSignal,
@@ -18984,7 +19007,7 @@ class NgwConnector {
18984
19007
  }
18985
19008
  });
18986
19009
  if (cache && method === "GET") {
18987
- const cacheOptions = cacheProps ? cacheProps : __spreadProps$e(__spreadValues$q({}, objectRemoveEmpty({
19010
+ const cacheOptions = cacheProps ? cacheProps : __spreadProps$g(__spreadValues$q({}, objectRemoveEmpty({
18988
19011
  headers,
18989
19012
  withCredentials,
18990
19013
  responseType,
@@ -19152,8 +19175,8 @@ __publicField$p(NgwConnector, "errors", {
19152
19175
  });
19153
19176
 
19154
19177
  var __defProp$z = Object.defineProperty;
19155
- var __defProps$d = Object.defineProperties;
19156
- var __getOwnPropDescs$d = Object.getOwnPropertyDescriptors;
19178
+ var __defProps$f = Object.defineProperties;
19179
+ var __getOwnPropDescs$f = Object.getOwnPropertyDescriptors;
19157
19180
  var __getOwnPropSymbols$q = Object.getOwnPropertySymbols;
19158
19181
  var __hasOwnProp$q = Object.prototype.hasOwnProperty;
19159
19182
  var __propIsEnum$q = Object.prototype.propertyIsEnumerable;
@@ -19169,7 +19192,7 @@ var __spreadValues$p = (a, b) => {
19169
19192
  }
19170
19193
  return a;
19171
19194
  };
19172
- var __spreadProps$d = (a, b) => __defProps$d(a, __getOwnPropDescs$d(b));
19195
+ var __spreadProps$f = (a, b) => __defProps$f(a, __getOwnPropDescs$f(b));
19173
19196
  var __async$o = (__this, __arguments, generator) => {
19174
19197
  return new Promise((resolve, reject) => {
19175
19198
  var fulfilled = (value) => {
@@ -19274,13 +19297,13 @@ function getQueries(opt, _queries = [], _parentAllParams = []) {
19274
19297
  for (const f of filters_) {
19275
19298
  if (isPropertyFilter(f)) {
19276
19299
  _queries.push(
19277
- fetchNgwLayerItemsRequest(__spreadProps$d(__spreadValues$p({}, opt), {
19300
+ fetchNgwLayerItemsRequest(__spreadProps$f(__spreadValues$p({}, opt), {
19278
19301
  paramList: [..._parentAllParams, ...paramList, createParam(f)]
19279
19302
  }))
19280
19303
  );
19281
19304
  } else {
19282
19305
  getQueries(
19283
- __spreadProps$d(__spreadValues$p({}, opt), {
19306
+ __spreadProps$f(__spreadValues$p({}, opt), {
19284
19307
  filters: f
19285
19308
  }),
19286
19309
  _queries,
@@ -19301,7 +19324,7 @@ function getQueries(opt, _queries = [], _parentAllParams = []) {
19301
19324
  if (propertiesFilterList.length) {
19302
19325
  for (const x of propertiesFilterList) {
19303
19326
  getQueries(
19304
- __spreadProps$d(__spreadValues$p({}, opt), {
19327
+ __spreadProps$f(__spreadValues$p({}, opt), {
19305
19328
  filters: x
19306
19329
  }),
19307
19330
  _queries,
@@ -19310,7 +19333,7 @@ function getQueries(opt, _queries = [], _parentAllParams = []) {
19310
19333
  }
19311
19334
  } else {
19312
19335
  _queries.push(
19313
- fetchNgwLayerItemsRequest(__spreadProps$d(__spreadValues$p({}, opt), {
19336
+ fetchNgwLayerItemsRequest(__spreadProps$f(__spreadValues$p({}, opt), {
19314
19337
  paramList: [..._parentAllParams, ...paramList, ...filters2]
19315
19338
  }))
19316
19339
  );
@@ -19376,8 +19399,8 @@ function fetchNgwLayerItemsRequest(options) {
19376
19399
  }
19377
19400
 
19378
19401
  var __defProp$y = Object.defineProperty;
19379
- var __defProps$c = Object.defineProperties;
19380
- var __getOwnPropDescs$c = Object.getOwnPropertyDescriptors;
19402
+ var __defProps$e = Object.defineProperties;
19403
+ var __getOwnPropDescs$e = Object.getOwnPropertyDescriptors;
19381
19404
  var __getOwnPropSymbols$p = Object.getOwnPropertySymbols;
19382
19405
  var __hasOwnProp$p = Object.prototype.hasOwnProperty;
19383
19406
  var __propIsEnum$p = Object.prototype.propertyIsEnumerable;
@@ -19393,7 +19416,7 @@ var __spreadValues$o = (a, b) => {
19393
19416
  }
19394
19417
  return a;
19395
19418
  };
19396
- var __spreadProps$c = (a, b) => __defProps$c(a, __getOwnPropDescs$c(b));
19419
+ var __spreadProps$e = (a, b) => __defProps$e(a, __getOwnPropDescs$e(b));
19397
19420
  var __async$n = (__this, __arguments, generator) => {
19398
19421
  return new Promise((resolve, reject) => {
19399
19422
  var fulfilled = (value) => {
@@ -19431,16 +19454,16 @@ function fetchNgwLayerItem(options) {
19431
19454
  if (resp.geom) {
19432
19455
  return createGeoJsonFeature(resp);
19433
19456
  } else {
19434
- const onlyGeomItem = yield fetchNgwLayerItem(__spreadProps$c(__spreadValues$o({}, options), {
19457
+ const onlyGeomItem = yield fetchNgwLayerItem(__spreadProps$e(__spreadValues$o({}, options), {
19435
19458
  geom: true,
19436
19459
  fields: null,
19437
19460
  extensions: null
19438
19461
  }));
19439
19462
  const geom = onlyGeomItem.geom;
19440
- return createGeoJsonFeature(__spreadProps$c(__spreadValues$o({}, resp), { geom }));
19463
+ return createGeoJsonFeature(__spreadProps$e(__spreadValues$o({}, resp), { geom }));
19441
19464
  }
19442
19465
  });
19443
- return __spreadProps$c(__spreadValues$o({}, resp), {
19466
+ return __spreadProps$e(__spreadValues$o({}, resp), {
19444
19467
  toGeojson
19445
19468
  });
19446
19469
  });
@@ -20097,8 +20120,8 @@ class WebmapLayerOpacityPropertyHandler extends BaseProperty {
20097
20120
  }
20098
20121
 
20099
20122
  var __defProp$r = Object.defineProperty;
20100
- var __defProps$b = Object.defineProperties;
20101
- var __getOwnPropDescs$b = Object.getOwnPropertyDescriptors;
20123
+ var __defProps$d = Object.defineProperties;
20124
+ var __getOwnPropDescs$d = Object.getOwnPropertyDescriptors;
20102
20125
  var __getOwnPropSymbols$k = Object.getOwnPropertySymbols;
20103
20126
  var __hasOwnProp$k = Object.prototype.hasOwnProperty;
20104
20127
  var __propIsEnum$k = Object.prototype.propertyIsEnumerable;
@@ -20114,7 +20137,7 @@ var __spreadValues$j = (a, b) => {
20114
20137
  }
20115
20138
  return a;
20116
20139
  };
20117
- var __spreadProps$b = (a, b) => __defProps$b(a, __getOwnPropDescs$b(b));
20140
+ var __spreadProps$d = (a, b) => __defProps$d(a, __getOwnPropDescs$d(b));
20118
20141
  function getNgwWebmapExtent(webmap) {
20119
20142
  const bottom = webmap["extent_bottom"];
20120
20143
  const left = webmap["extent_left"];
@@ -20182,14 +20205,14 @@ function fetchNgwResourceExtent(item, connector, options) {
20182
20205
  if (resource.cls && resource.cls.indexOf("style") !== -1) {
20183
20206
  return connector.getResource(resource.parent.id, options).then((res) => {
20184
20207
  if (res) {
20185
- return fetchNgwLayerExtent(__spreadProps$b(__spreadValues$j({}, options), {
20208
+ return fetchNgwLayerExtent(__spreadProps$d(__spreadValues$j({}, options), {
20186
20209
  resourceId: res.resource.id,
20187
20210
  connector
20188
20211
  }));
20189
20212
  }
20190
20213
  });
20191
20214
  } else {
20192
- return fetchNgwLayerExtent(__spreadProps$b(__spreadValues$j({}, options), {
20215
+ return fetchNgwLayerExtent(__spreadProps$d(__spreadValues$j({}, options), {
20193
20216
  resourceId: resource.id,
20194
20217
  connector
20195
20218
  }));
@@ -20511,8 +20534,8 @@ __publicField$g(QmsKit, "utils", {
20511
20534
  });
20512
20535
 
20513
20536
  var __defProp$n = Object.defineProperty;
20514
- var __defProps$a = Object.defineProperties;
20515
- var __getOwnPropDescs$a = Object.getOwnPropertyDescriptors;
20537
+ var __defProps$c = Object.defineProperties;
20538
+ var __getOwnPropDescs$c = Object.getOwnPropertyDescriptors;
20516
20539
  var __getOwnPropSymbols$h = Object.getOwnPropertySymbols;
20517
20540
  var __getProtoOf$2 = Object.getPrototypeOf;
20518
20541
  var __hasOwnProp$h = Object.prototype.hasOwnProperty;
@@ -20530,7 +20553,7 @@ var __spreadValues$g = (a, b) => {
20530
20553
  }
20531
20554
  return a;
20532
20555
  };
20533
- var __spreadProps$a = (a, b) => __defProps$a(a, __getOwnPropDescs$a(b));
20556
+ var __spreadProps$c = (a, b) => __defProps$c(a, __getOwnPropDescs$c(b));
20534
20557
  var __superGet$2 = (cls, obj, key) => __reflectGet$2(__getProtoOf$2(cls), key, obj);
20535
20558
  var __async$j = (__this, __arguments, generator) => {
20536
20559
  return new Promise((resolve, reject) => {
@@ -20575,7 +20598,7 @@ function createBasemapLayerAdapter(_0) {
20575
20598
  class BasemapTileAdapter extends TileAdapter {
20576
20599
  addLayer(opt) {
20577
20600
  return __async$j(this, null, function* () {
20578
- return __superGet$2(BasemapTileAdapter.prototype, this, "addLayer").call(this, __spreadProps$a(__spreadValues$g({}, opt), { url }));
20601
+ return __superGet$2(BasemapTileAdapter.prototype, this, "addLayer").call(this, __spreadProps$c(__spreadValues$g({}, opt), { url }));
20579
20602
  });
20580
20603
  }
20581
20604
  }
@@ -20655,8 +20678,8 @@ function prepareNgwFieldsToPropertiesFilter(fields) {
20655
20678
  }
20656
20679
 
20657
20680
  var __defProp$m = Object.defineProperty;
20658
- var __defProps$9 = Object.defineProperties;
20659
- var __getOwnPropDescs$9 = Object.getOwnPropertyDescriptors;
20681
+ var __defProps$b = Object.defineProperties;
20682
+ var __getOwnPropDescs$b = Object.getOwnPropertyDescriptors;
20660
20683
  var __getOwnPropSymbols$g = Object.getOwnPropertySymbols;
20661
20684
  var __hasOwnProp$g = Object.prototype.hasOwnProperty;
20662
20685
  var __propIsEnum$g = Object.prototype.propertyIsEnumerable;
@@ -20672,7 +20695,7 @@ var __spreadValues$f = (a, b) => {
20672
20695
  }
20673
20696
  return a;
20674
20697
  };
20675
- var __spreadProps$9 = (a, b) => __defProps$9(a, __getOwnPropDescs$9(b));
20698
+ var __spreadProps$b = (a, b) => __defProps$b(a, __getOwnPropDescs$b(b));
20676
20699
  var __async$i = (__this, __arguments, generator) => {
20677
20700
  return new Promise((resolve, reject) => {
20678
20701
  var fulfilled = (value) => {
@@ -20698,13 +20721,13 @@ function fetchNgwLayerItems(options) {
20698
20721
  var _a;
20699
20722
  const filters = options.filters;
20700
20723
  if (filters) {
20701
- let data = yield createFeatureFieldFilterQueries(__spreadProps$9(__spreadValues$f({}, options), {
20724
+ let data = yield createFeatureFieldFilterQueries(__spreadProps$b(__spreadValues$f({}, options), {
20702
20725
  filters
20703
20726
  }));
20704
20727
  const clientFilterValidate = (_a = options.clientFilterValidate) != null ? _a : isFilterWithAnyCase(filters);
20705
20728
  if (clientFilterValidate) {
20706
20729
  data = data.filter((y) => {
20707
- const fields = prepareNgwFieldsToPropertiesFilter(__spreadProps$9(__spreadValues$f({}, y.fields), {
20730
+ const fields = prepareNgwFieldsToPropertiesFilter(__spreadProps$b(__spreadValues$f({}, y.fields), {
20708
20731
  id: y.id
20709
20732
  }));
20710
20733
  const result = propertiesFilter(fields, filters);
@@ -20793,8 +20816,8 @@ function getLayerFilterOptions(options) {
20793
20816
  }
20794
20817
 
20795
20818
  var __defProp$l = Object.defineProperty;
20796
- var __defProps$8 = Object.defineProperties;
20797
- var __getOwnPropDescs$8 = Object.getOwnPropertyDescriptors;
20819
+ var __defProps$a = Object.defineProperties;
20820
+ var __getOwnPropDescs$a = Object.getOwnPropertyDescriptors;
20798
20821
  var __getOwnPropSymbols$f = Object.getOwnPropertySymbols;
20799
20822
  var __getProtoOf$1 = Object.getPrototypeOf;
20800
20823
  var __hasOwnProp$f = Object.prototype.hasOwnProperty;
@@ -20812,7 +20835,7 @@ var __spreadValues$e = (a, b) => {
20812
20835
  }
20813
20836
  return a;
20814
20837
  };
20815
- var __spreadProps$8 = (a, b) => __defProps$8(a, __getOwnPropDescs$8(b));
20838
+ var __spreadProps$a = (a, b) => __defProps$a(a, __getOwnPropDescs$a(b));
20816
20839
  var __publicField$f = (obj, key, value) => __defNormalProp$l(obj, typeof key !== "symbol" ? key + "" : key, value);
20817
20840
  var __superGet$1 = (cls, obj, key) => __reflectGet$1(__getProtoOf$1(cls), key, obj);
20818
20841
  var __async$g = (__this, __arguments, generator) => {
@@ -20991,7 +21014,7 @@ function createGeoJsonAdapter(props) {
20991
21014
  try {
20992
21015
  this.emitter.emit("preupdate", filterArgs);
20993
21016
  webMap._emitLayerEvent("layer:preupdate", options.id || "", filterArgs);
20994
- const data = yield getData(filterArgs.filters, __spreadProps$8(__spreadValues$e({}, filterArgs.options), {
21017
+ const data = yield getData(filterArgs.filters, __spreadProps$a(__spreadValues$e({}, filterArgs.options), {
20995
21018
  srs: this.options.srs
20996
21019
  }));
20997
21020
  let newData = data;
@@ -21044,7 +21067,7 @@ function createGeoJsonAdapter(props) {
21044
21067
  if (this.clearLayer) {
21045
21068
  this.clearLayer();
21046
21069
  }
21047
- const data = yield getData(filters, __spreadProps$8(__spreadValues$e({}, opt), {
21070
+ const data = yield getData(filters, __spreadProps$a(__spreadValues$e({}, opt), {
21048
21071
  srs: this.options.srs
21049
21072
  }));
21050
21073
  this.setData(data);
@@ -21234,8 +21257,8 @@ function ngwApiToAdapterOptions({
21234
21257
  }
21235
21258
 
21236
21259
  var __defProp$k = Object.defineProperty;
21237
- var __defProps$7 = Object.defineProperties;
21238
- var __getOwnPropDescs$7 = Object.getOwnPropertyDescriptors;
21260
+ var __defProps$9 = Object.defineProperties;
21261
+ var __getOwnPropDescs$9 = Object.getOwnPropertyDescriptors;
21239
21262
  var __getOwnPropSymbols$e = Object.getOwnPropertySymbols;
21240
21263
  var __hasOwnProp$e = Object.prototype.hasOwnProperty;
21241
21264
  var __propIsEnum$e = Object.prototype.propertyIsEnumerable;
@@ -21251,7 +21274,7 @@ var __spreadValues$d = (a, b) => {
21251
21274
  }
21252
21275
  return a;
21253
21276
  };
21254
- var __spreadProps$7 = (a, b) => __defProps$7(a, __getOwnPropDescs$7(b));
21277
+ var __spreadProps$9 = (a, b) => __defProps$9(a, __getOwnPropDescs$9(b));
21255
21278
  var __publicField$e = (obj, key, value) => __defNormalProp$k(obj, typeof key !== "symbol" ? key + "" : key, value);
21256
21279
  var __async$e = (__this, __arguments, generator) => {
21257
21280
  return new Promise((resolve, reject) => {
@@ -21315,7 +21338,7 @@ function createRasterAdapter(_0) {
21315
21338
  baseUrl: connector.options.baseUrl || ""
21316
21339
  });
21317
21340
  if (opt) {
21318
- const layerAdapterOptions = __spreadProps$7(__spreadValues$d(__spreadValues$d({}, opt), layerOptions.adapterOptions), {
21341
+ const layerAdapterOptions = __spreadProps$9(__spreadValues$d(__spreadValues$d({}, opt), layerOptions.adapterOptions), {
21319
21342
  params: { resource: resourceId },
21320
21343
  layers: opt.layers || String(resourceId),
21321
21344
  resourceId
@@ -21373,8 +21396,8 @@ function createRasterAdapter(_0) {
21373
21396
  }
21374
21397
 
21375
21398
  var __defProp$j = Object.defineProperty;
21376
- var __defProps$6 = Object.defineProperties;
21377
- var __getOwnPropDescs$6 = Object.getOwnPropertyDescriptors;
21399
+ var __defProps$8 = Object.defineProperties;
21400
+ var __getOwnPropDescs$8 = Object.getOwnPropertyDescriptors;
21378
21401
  var __getOwnPropSymbols$d = Object.getOwnPropertySymbols;
21379
21402
  var __hasOwnProp$d = Object.prototype.hasOwnProperty;
21380
21403
  var __propIsEnum$d = Object.prototype.propertyIsEnumerable;
@@ -21390,7 +21413,7 @@ var __spreadValues$c = (a, b) => {
21390
21413
  }
21391
21414
  return a;
21392
21415
  };
21393
- var __spreadProps$6 = (a, b) => __defProps$6(a, __getOwnPropDescs$6(b));
21416
+ var __spreadProps$8 = (a, b) => __defProps$8(a, __getOwnPropDescs$8(b));
21394
21417
  var __async$d = (__this, __arguments, generator) => {
21395
21418
  return new Promise((resolve, reject) => {
21396
21419
  var fulfilled = (value) => {
@@ -21438,7 +21461,7 @@ function createAdapterFromFirstStyle(_0) {
21438
21461
  const firstStyle = childrenStyles && childrenStyles[0];
21439
21462
  if (firstStyle) {
21440
21463
  return createAsyncAdapter(
21441
- __spreadProps$6(__spreadValues$c({}, layerOptions), { resource: firstStyle.resource.id }),
21464
+ __spreadProps$8(__spreadValues$c({}, layerOptions), { resource: firstStyle.resource.id }),
21442
21465
  webMap,
21443
21466
  connector
21444
21467
  );
@@ -21461,13 +21484,13 @@ function createAsyncAdapter(options, webMap, connector) {
21461
21484
  }
21462
21485
  if (item) {
21463
21486
  const cls = item.resource.cls;
21464
- const layerOptions = __spreadProps$6(__spreadValues$c({}, options), {
21487
+ const layerOptions = __spreadProps$8(__spreadValues$c({}, options), {
21465
21488
  resource: resourceId
21466
21489
  });
21467
21490
  const adapterOptions = {
21468
21491
  layerOptions,
21469
- webMap,
21470
21492
  connector,
21493
+ webMap,
21471
21494
  item
21472
21495
  };
21473
21496
  if (supportCls.indexOf(cls) !== -1) {
@@ -21498,10 +21521,10 @@ function createAsyncAdapter(options, webMap, connector) {
21498
21521
  item.resource.parent.id
21499
21522
  );
21500
21523
  if (parentItem) {
21501
- const parentOptions = __spreadProps$6(__spreadValues$c({}, options), {
21524
+ const parentOptions = __spreadProps$8(__spreadValues$c({}, options), {
21502
21525
  resource: item.resource.parent.id
21503
21526
  });
21504
- adapter = createGeoJsonAdapter(__spreadProps$6(__spreadValues$c({}, adapterOptions), {
21527
+ adapter = createGeoJsonAdapter(__spreadProps$8(__spreadValues$c({}, adapterOptions), {
21505
21528
  item: parentItem,
21506
21529
  layerOptions: parentOptions
21507
21530
  }));
@@ -21590,6 +21613,9 @@ function createNgwLayerAdapter(options, webMap, connector) {
21590
21613
  if (headers) {
21591
21614
  options.headers = headers;
21592
21615
  }
21616
+ if (connector.withCredentials !== void 0) {
21617
+ options.withCredentials = connector.withCredentials;
21618
+ }
21593
21619
  return createAsyncAdapter(options, webMap, connector);
21594
21620
  }
21595
21621
  function extendNgwWebmapLayerAdapter(opt) {
@@ -21627,6 +21653,8 @@ function setScaleRatio(scale, lat = 0) {
21627
21653
  }
21628
21654
 
21629
21655
  var __defProp$h = Object.defineProperty;
21656
+ var __defProps$7 = Object.defineProperties;
21657
+ var __getOwnPropDescs$7 = Object.getOwnPropertyDescriptors;
21630
21658
  var __getOwnPropSymbols$b = Object.getOwnPropertySymbols;
21631
21659
  var __hasOwnProp$b = Object.prototype.hasOwnProperty;
21632
21660
  var __propIsEnum$b = Object.prototype.propertyIsEnumerable;
@@ -21642,6 +21670,7 @@ var __spreadValues$a = (a, b) => {
21642
21670
  }
21643
21671
  return a;
21644
21672
  };
21673
+ var __spreadProps$7 = (a, b) => __defProps$7(a, __getOwnPropDescs$7(b));
21645
21674
  var __publicField$d = (obj, key, value) => __defNormalProp$h(obj, typeof key !== "symbol" ? key + "" : key, value);
21646
21675
  var __async$c = (__this, __arguments, generator) => {
21647
21676
  return new Promise((resolve, reject) => {
@@ -21747,14 +21776,12 @@ const _NgwWebmapItem = class _NgwWebmapItem extends Item {
21747
21776
  getItemOptions(item) {
21748
21777
  const transparency = item.item_type === "layer" && item.layer_transparency;
21749
21778
  const opacity = typeof transparency === "number" ? (100 - transparency) / 100 : void 0;
21750
- const options = {
21779
+ const options = __spreadProps$7(__spreadValues$a({
21751
21780
  visibility: false,
21752
- name: item.display_name,
21753
- headers: this.options.headers,
21754
- crossOrigin: this.options.crossOrigin,
21755
- setViewDelay: this.options.setViewDelay,
21781
+ name: item.display_name
21782
+ }, this.options), {
21756
21783
  params: { resource: this.item.resourceId, item: this.item }
21757
- };
21784
+ });
21758
21785
  if (this.options.order) {
21759
21786
  const subOrder = this.options.drawOrderEnabled && "draw_order_position" in item ? this._rootDescendantsCount - item.draw_order_position : this.id;
21760
21787
  const subLevel = String(subOrder).padStart(4, "0");
@@ -21765,17 +21792,16 @@ const _NgwWebmapItem = class _NgwWebmapItem extends Item {
21765
21792
  }
21766
21793
  if (item.item_type === "layer") {
21767
21794
  const { maxZoom, minZoom } = this._getZoomRange(item);
21768
- Object.assign(options, {
21769
- updateWmsParams: item.updateWmsParams,
21795
+ Object.assign(options, __spreadProps$7(__spreadValues$a({
21796
+ updateWmsParams: item.updateWmsParams
21797
+ }, this.options), {
21770
21798
  url: item.url,
21771
- headers: this.options.headers,
21772
- ratio: this.options.ratio,
21773
21799
  maxZoom,
21774
21800
  minZoom,
21775
21801
  minScale: item.layer_min_scale_denom,
21776
21802
  maxScale: item.layer_max_scale_denom,
21777
21803
  interactive: item.layer_identifiable
21778
- });
21804
+ }));
21779
21805
  }
21780
21806
  if (opacity !== void 0) {
21781
21807
  options.opacity = opacity;
@@ -22081,6 +22107,8 @@ function createOnFirstShowNgwAdapter(_0) {
22081
22107
  const WEBMAP_BASELAYER_ID_PREFIX = "webmap-baselayer";
22082
22108
 
22083
22109
  var __defProp$f = Object.defineProperty;
22110
+ var __defProps$6 = Object.defineProperties;
22111
+ var __getOwnPropDescs$6 = Object.getOwnPropertyDescriptors;
22084
22112
  var __getOwnPropSymbols$9 = Object.getOwnPropertySymbols;
22085
22113
  var __hasOwnProp$9 = Object.prototype.hasOwnProperty;
22086
22114
  var __propIsEnum$9 = Object.prototype.propertyIsEnumerable;
@@ -22096,6 +22124,7 @@ var __spreadValues$8 = (a, b) => {
22096
22124
  }
22097
22125
  return a;
22098
22126
  };
22127
+ var __spreadProps$6 = (a, b) => __defProps$6(a, __getOwnPropDescs$6(b));
22099
22128
  var __publicField$b = (obj, key, value) => __defNormalProp$f(obj, typeof key !== "symbol" ? key + "" : key, value);
22100
22129
  var __async$9 = (__this, __arguments, generator) => {
22101
22130
  return new Promise((resolve, reject) => {
@@ -22294,35 +22323,32 @@ class NgwWebmapLayerAdapter {
22294
22323
  }
22295
22324
  _getWebMapLayerItem() {
22296
22325
  return __async$9(this, null, function* () {
22297
- if (this.resourceId) {
22298
- const webmap = yield this.getWebMapConfig(this.resourceId);
22299
- if (webmap && webmap.root_item) {
22300
- return new Promise((resolve) => {
22301
- const options = {};
22302
- if (this.options.connector && this.options.connector.options.auth) {
22303
- const headers = this.options.connector.getAuthorizationHeaders();
22304
- if (headers) {
22305
- options.headers = headers;
22306
- }
22307
- }
22308
- options.setViewDelay = this.options.setViewDelay;
22309
- options.order = this.options.order;
22310
- options.ratio = this.options.ratio;
22311
- options.crossOrigin = this.options.crossOrigin;
22312
- options.minZoom = this.options.minZoom;
22313
- options.maxZoom = this.options.maxZoom;
22314
- options.drawOrderEnabled = webmap.draw_order_enabled;
22315
- options.popupOptions = this.options.popupOptions;
22316
- const layer = new this.NgwWebmapItem(
22317
- this.options.webMap,
22318
- webmap.root_item,
22319
- options,
22320
- this.options.connector
22321
- );
22322
- layer.emitter.on("init", () => resolve(layer));
22323
- });
22324
- }
22325
- }
22326
+ if (!this.resourceId) {
22327
+ return void 0;
22328
+ }
22329
+ const webmap = yield this.getWebMapConfig(this.resourceId);
22330
+ if (!webmap || !webmap.root_item) {
22331
+ return void 0;
22332
+ }
22333
+ return new Promise((resolve) => {
22334
+ const connector = this.options.connector;
22335
+ const headers = (connector == null ? void 0 : connector.options.auth) ? connector.getAuthorizationHeaders() : void 0;
22336
+ const withCredentials = connector.withCredentials;
22337
+ const options = __spreadProps$6(__spreadValues$8({}, this.options), {
22338
+ withCredentials,
22339
+ headers,
22340
+ drawOrderEnabled: webmap.draw_order_enabled
22341
+ });
22342
+ const layer = new this.NgwWebmapItem(
22343
+ this.options.webMap,
22344
+ webmap.root_item,
22345
+ options,
22346
+ connector
22347
+ );
22348
+ layer.emitter.on("init", () => {
22349
+ resolve(layer);
22350
+ });
22351
+ });
22326
22352
  });
22327
22353
  }
22328
22354
  getWebMapConfig(id) {
@@ -25078,7 +25104,8 @@ function prepareWebMapOptions(options) {
25078
25104
  if (!options.connector) {
25079
25105
  options.connector = new NgwConnector({
25080
25106
  baseUrl: options.baseUrl || "",
25081
- auth: options.auth
25107
+ auth: options.auth,
25108
+ withCredentials: options.withCredentials
25082
25109
  });
25083
25110
  } else if (options.connector) {
25084
25111
  options.baseUrl = options.connector.options.baseUrl;