@nextgis/ngw-leaflet 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-leaflet; version: 3.0.0-alpha.0; author: NextGIS */
1
+ /** Bundle of @nextgis/ngw-leaflet; version: 3.0.0-alpha.2; author: NextGIS */
2
2
  var NgwLeaflet = (function () {
3
3
  'use strict';
4
4
 
@@ -16158,8 +16158,8 @@ var NgwLeaflet = (function () {
16158
16158
  }
16159
16159
 
16160
16160
  var __defProp$R = Object.defineProperty;
16161
- var __defProps$j = Object.defineProperties;
16162
- var __getOwnPropDescs$j = Object.getOwnPropertyDescriptors;
16161
+ var __defProps$l = Object.defineProperties;
16162
+ var __getOwnPropDescs$l = Object.getOwnPropertyDescriptors;
16163
16163
  var __getOwnPropSymbols$A = Object.getOwnPropertySymbols;
16164
16164
  var __hasOwnProp$A = Object.prototype.hasOwnProperty;
16165
16165
  var __propIsEnum$A = Object.prototype.propertyIsEnumerable;
@@ -16175,7 +16175,7 @@ var NgwLeaflet = (function () {
16175
16175
  }
16176
16176
  return a;
16177
16177
  };
16178
- var __spreadProps$j = (a, b) => __defProps$j(a, __getOwnPropDescs$j(b));
16178
+ var __spreadProps$l = (a, b) => __defProps$l(a, __getOwnPropDescs$l(b));
16179
16179
  var __objRest$5 = (source, exclude) => {
16180
16180
  var target = {};
16181
16181
  for (var prop in source)
@@ -16270,7 +16270,7 @@ var NgwLeaflet = (function () {
16270
16270
  if (html) {
16271
16271
  element.innerHTML = html;
16272
16272
  }
16273
- const divIcon = new leafletSrcExports.DivIcon(__spreadProps$j(__spreadValues$z({
16273
+ const divIcon = new leafletSrcExports.DivIcon(__spreadProps$l(__spreadValues$z({
16274
16274
  className: ""
16275
16275
  }, toLIconOpt), {
16276
16276
  html: element
@@ -16319,8 +16319,8 @@ var NgwLeaflet = (function () {
16319
16319
  }
16320
16320
 
16321
16321
  var __defProp$Q = Object.defineProperty;
16322
- var __defProps$i = Object.defineProperties;
16323
- var __getOwnPropDescs$i = Object.getOwnPropertyDescriptors;
16322
+ var __defProps$k = Object.defineProperties;
16323
+ var __getOwnPropDescs$k = Object.getOwnPropertyDescriptors;
16324
16324
  var __getOwnPropSymbols$z = Object.getOwnPropertySymbols;
16325
16325
  var __hasOwnProp$z = Object.prototype.hasOwnProperty;
16326
16326
  var __propIsEnum$z = Object.prototype.propertyIsEnumerable;
@@ -16336,7 +16336,7 @@ var NgwLeaflet = (function () {
16336
16336
  }
16337
16337
  return a;
16338
16338
  };
16339
- var __spreadProps$i = (a, b) => __defProps$i(a, __getOwnPropDescs$i(b));
16339
+ var __spreadProps$k = (a, b) => __defProps$k(a, __getOwnPropDescs$k(b));
16340
16340
  var __publicField$B = (obj, key, value) => __defNormalProp$Q(obj, typeof key !== "symbol" ? key + "" : key, value);
16341
16341
  var __async$s = (__this, __arguments, generator) => {
16342
16342
  return new Promise((resolve, reject) => {
@@ -16385,7 +16385,7 @@ var NgwLeaflet = (function () {
16385
16385
  addLayer(options) {
16386
16386
  Object.assign(this.options, options);
16387
16387
  this.paint = options.paint;
16388
- this.layer = new leafletSrcExports.FeatureGroup([], __spreadProps$i(__spreadValues$y({}, options.nativeOptions), {
16388
+ this.layer = new leafletSrcExports.FeatureGroup([], __spreadProps$k(__spreadValues$y({}, options.nativeOptions), {
16389
16389
  pane: this.pane
16390
16390
  }));
16391
16391
  this.selectedPaint = options.selectedPaint;
@@ -16735,7 +16735,7 @@ var NgwLeaflet = (function () {
16735
16735
  if (feature) {
16736
16736
  return this._paint.preparePaint(__spreadValues$y(__spreadValues$y({}, PAINT), paint(feature)));
16737
16737
  } else {
16738
- return this._paint.preparePaint(__spreadProps$i(__spreadValues$y({}, PAINT), { type: "path" }));
16738
+ return this._paint.preparePaint(__spreadProps$k(__spreadValues$y({}, PAINT), { type: "path" }));
16739
16739
  }
16740
16740
  }
16741
16741
  };
@@ -16895,7 +16895,11 @@ var NgwLeaflet = (function () {
16895
16895
  }
16896
16896
  }
16897
16897
 
16898
- function callAjax(src, headers) {
16898
+ function callAjax({
16899
+ src,
16900
+ headers,
16901
+ withCredentials
16902
+ }) {
16899
16903
  let abortFunc = () => {
16900
16904
  };
16901
16905
  const promise = new Promise((resolve, reject) => {
@@ -16905,6 +16909,9 @@ var NgwLeaflet = (function () {
16905
16909
  for (const h in headers) {
16906
16910
  xhr.setRequestHeader(h, headers[h]);
16907
16911
  }
16912
+ if (withCredentials) {
16913
+ xhr.withCredentials = withCredentials;
16914
+ }
16908
16915
  xhr.onload = function() {
16909
16916
  const arrayBufferView = new Uint8Array(this.response);
16910
16917
  const blob = new Blob([arrayBufferView], { type: "image/png" });
@@ -17027,12 +17034,16 @@ var NgwLeaflet = (function () {
17027
17034
  }
17028
17035
  _initImage() {
17029
17036
  super._initImage();
17030
- const headers = this.options.headers;
17037
+ const { headers, withCredentials } = this.options;
17031
17038
  const img = this._image;
17032
17039
  const src = img.src;
17033
17040
  img.src = "";
17034
17041
  imageQueue.add(() => {
17035
- const [promise, abortFunc] = callAjax(src, headers);
17042
+ const [promise, abortFunc] = callAjax({
17043
+ src,
17044
+ headers,
17045
+ withCredentials
17046
+ });
17036
17047
  promise.then((imgUrl) => {
17037
17048
  img.src = imgUrl;
17038
17049
  });
@@ -17066,6 +17077,7 @@ var NgwLeaflet = (function () {
17066
17077
  minZoom: 0,
17067
17078
  pane: "tilePane",
17068
17079
  headers: null,
17080
+ withCredentials: false,
17069
17081
  viewPortBuffer: 0,
17070
17082
  setViewDelay: 100
17071
17083
  });
@@ -17135,7 +17147,8 @@ var NgwLeaflet = (function () {
17135
17147
  const overlay = new ImageOverlay(url, bounds, {
17136
17148
  opacity: 0,
17137
17149
  pane: this.options.pane,
17138
- headers: this.options.headers
17150
+ headers: this.options.headers,
17151
+ withCredentials: this.options.withCredentials
17139
17152
  });
17140
17153
  overlay.addTo(this._map);
17141
17154
  this._loadedOverlay = overlay;
@@ -17288,13 +17301,13 @@ var NgwLeaflet = (function () {
17288
17301
  }
17289
17302
  }
17290
17303
  createTile(coords, done) {
17291
- const url = this.getTileUrl(coords);
17304
+ const src = this.getTileUrl(coords);
17292
17305
  const tile = document.createElement("img");
17293
- const [promise, abortFunc] = callAjax(
17294
- url,
17295
- // @ts-ignore
17296
- this.options.headers
17297
- );
17306
+ const [promise, abortFunc] = callAjax({
17307
+ src,
17308
+ withCredentials: this.options.withCredentials,
17309
+ headers: this.options.headers
17310
+ });
17298
17311
  promise.then((response) => {
17299
17312
  tile.src = response;
17300
17313
  done(null, tile);
@@ -17338,8 +17351,8 @@ var NgwLeaflet = (function () {
17338
17351
  const TileLayer = makeRemote(TileLayerBase);
17339
17352
 
17340
17353
  var __defProp$L = Object.defineProperty;
17341
- var __defProps$h = Object.defineProperties;
17342
- var __getOwnPropDescs$h = Object.getOwnPropertyDescriptors;
17354
+ var __defProps$j = Object.defineProperties;
17355
+ var __getOwnPropDescs$j = Object.getOwnPropertyDescriptors;
17343
17356
  var __getOwnPropSymbols$x = Object.getOwnPropertySymbols;
17344
17357
  var __hasOwnProp$x = Object.prototype.hasOwnProperty;
17345
17358
  var __propIsEnum$x = Object.prototype.propertyIsEnumerable;
@@ -17355,7 +17368,7 @@ var NgwLeaflet = (function () {
17355
17368
  }
17356
17369
  return a;
17357
17370
  };
17358
- var __spreadProps$h = (a, b) => __defProps$h(a, __getOwnPropDescs$h(b));
17371
+ var __spreadProps$j = (a, b) => __defProps$j(a, __getOwnPropDescs$j(b));
17359
17372
  var __objRest$4 = (source, exclude) => {
17360
17373
  var target = {};
17361
17374
  for (var prop in source)
@@ -17384,9 +17397,10 @@ var NgwLeaflet = (function () {
17384
17397
  tileLayerOptions.subdomains = opt.subdomains;
17385
17398
  }
17386
17399
  let layer;
17387
- if (opt.headers) {
17388
- layer = new TileLayer(url, __spreadProps$h(__spreadValues$w({}, tileLayerOptions), {
17400
+ if (opt.headers || opt.withCredentials) {
17401
+ layer = new TileLayer(url, __spreadProps$j(__spreadValues$w({}, tileLayerOptions), {
17389
17402
  headers: opt.headers,
17403
+ withCredentials: opt.withCredentials,
17390
17404
  setViewDelay: opt.setViewDelay
17391
17405
  }));
17392
17406
  } else {
@@ -17409,8 +17423,8 @@ var NgwLeaflet = (function () {
17409
17423
  }
17410
17424
 
17411
17425
  var __defProp$K = Object.defineProperty;
17412
- var __defProps$g = Object.defineProperties;
17413
- var __getOwnPropDescs$g = Object.getOwnPropertyDescriptors;
17426
+ var __defProps$i = Object.defineProperties;
17427
+ var __getOwnPropDescs$i = Object.getOwnPropertyDescriptors;
17414
17428
  var __getOwnPropSymbols$w = Object.getOwnPropertySymbols;
17415
17429
  var __hasOwnProp$w = Object.prototype.hasOwnProperty;
17416
17430
  var __propIsEnum$w = Object.prototype.propertyIsEnumerable;
@@ -17426,11 +17440,11 @@ var NgwLeaflet = (function () {
17426
17440
  }
17427
17441
  return a;
17428
17442
  };
17429
- var __spreadProps$g = (a, b) => __defProps$g(a, __getOwnPropDescs$g(b));
17443
+ var __spreadProps$i = (a, b) => __defProps$i(a, __getOwnPropDescs$i(b));
17430
17444
  class OsmAdapter extends TileAdapter {
17431
17445
  addLayer(options) {
17432
17446
  const url = "https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png";
17433
- return super.addLayer(__spreadProps$g(__spreadValues$v({
17447
+ return super.addLayer(__spreadProps$i(__spreadValues$v({
17434
17448
  name: "OpenStreetMap",
17435
17449
  attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
17436
17450
  }, options), {
@@ -17447,8 +17461,8 @@ var NgwLeaflet = (function () {
17447
17461
  const WmsLayer = makeRemote(WmsLayerBase);
17448
17462
 
17449
17463
  var __defProp$J = Object.defineProperty;
17450
- var __defProps$f = Object.defineProperties;
17451
- var __getOwnPropDescs$f = Object.getOwnPropertyDescriptors;
17464
+ var __defProps$h = Object.defineProperties;
17465
+ var __getOwnPropDescs$h = Object.getOwnPropertyDescriptors;
17452
17466
  var __getOwnPropSymbols$v = Object.getOwnPropertySymbols;
17453
17467
  var __hasOwnProp$v = Object.prototype.hasOwnProperty;
17454
17468
  var __propIsEnum$v = Object.prototype.propertyIsEnumerable;
@@ -17464,7 +17478,7 @@ var NgwLeaflet = (function () {
17464
17478
  }
17465
17479
  return a;
17466
17480
  };
17467
- var __spreadProps$f = (a, b) => __defProps$f(a, __getOwnPropDescs$f(b));
17481
+ var __spreadProps$h = (a, b) => __defProps$h(a, __getOwnPropDescs$h(b));
17468
17482
  var __objRest$3 = (source, exclude) => {
17469
17483
  var target = {};
17470
17484
  for (var prop in source)
@@ -17492,8 +17506,11 @@ var NgwLeaflet = (function () {
17492
17506
  transparent: true
17493
17507
  }, options.nativeOptions);
17494
17508
  let layer;
17495
- if (opt.headers) {
17496
- layer = new WmsLayer(url, __spreadProps$f(__spreadValues$u({}, layerOptions), { headers: opt.headers }));
17509
+ if (opt.headers || opt.withCredentials) {
17510
+ layer = new WmsLayer(url, __spreadProps$h(__spreadValues$u({}, layerOptions), {
17511
+ headers: opt.headers,
17512
+ withCredentials: opt.withCredentials
17513
+ }));
17497
17514
  } else {
17498
17515
  layer = new leafletSrcExports.TileLayer.WMS(url, layerOptions);
17499
17516
  }
@@ -18045,6 +18062,62 @@ var NgwLeaflet = (function () {
18045
18062
  __publicField$v(_Cache, "instance", {});
18046
18063
  let Cache = _Cache;
18047
18064
 
18065
+ var pkg = {
18066
+ name: "@nextgis/ngw-connector",
18067
+ version: "3.0.0-alpha.2",
18068
+ _priority: 12,
18069
+ description: "A lightweight HTTP client optimized for use with NextGIS Web API",
18070
+ main: "index.js",
18071
+ module: "lib/ngw-connector.esm-bundler.js",
18072
+ unpkg: "lib/ngw-connector.global.prod.js",
18073
+ jsdelivr: "lib/ngw-connector.global.prod.js",
18074
+ types: "lib/index.d.ts",
18075
+ dependencies: {
18076
+ "@nextgis/cache": "^3.0.0-alpha.1",
18077
+ "@nextgis/cancelable-promise": "^3.0.0-alpha.1",
18078
+ "@nextgis/utils": "^3.0.0-alpha.1",
18079
+ "@types/events": "^3.0.0",
18080
+ events: "*",
18081
+ "form-data": "^4.0.0"
18082
+ },
18083
+ devDependencies: {
18084
+ "@nextgis/build-tools": "^3.0.0-alpha.1"
18085
+ },
18086
+ scripts: {
18087
+ clean: "rimraf ./lib",
18088
+ dev: "node ../build-tools/lib/build.js",
18089
+ prod: "npm run dev -- --release",
18090
+ lint: "eslint ./src/**/*.ts --fix --c ../../.eslintrc",
18091
+ watch: "npm run dev -- --watch",
18092
+ "gen:types": "node ./scripts/generator"
18093
+ },
18094
+ buildOptions: {
18095
+ name: "NgwConnector",
18096
+ formats: [
18097
+ "esm-bundler",
18098
+ "esm-browser",
18099
+ "cjs",
18100
+ "global"
18101
+ ]
18102
+ },
18103
+ keywords: [
18104
+ "NextGIS",
18105
+ "MAP"
18106
+ ],
18107
+ author: "NextGIS",
18108
+ files: [
18109
+ "index.js",
18110
+ "lib"
18111
+ ],
18112
+ license: "MIT",
18113
+ homepage: "https://github.com/nextgis/nextgis_frontend/tree/master/packages/ngw-connector#readme",
18114
+ repository: {
18115
+ type: "git",
18116
+ url: "git://github.com/nextgis/nextgis_frontend.git"
18117
+ },
18118
+ gitHead: "edc68033f914f6c95c4125b9738bba6d36e990b4"
18119
+ };
18120
+
18048
18121
  var __defProp$G = Object.defineProperty;
18049
18122
  var __defNormalProp$G = (obj, key, value) => key in obj ? __defProp$G(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
18050
18123
  var __publicField$u = (obj, key, value) => __defNormalProp$G(obj, typeof key !== "symbol" ? key + "" : key, value);
@@ -18609,8 +18682,8 @@ var NgwLeaflet = (function () {
18609
18682
  }
18610
18683
 
18611
18684
  var __defProp$A = Object.defineProperty;
18612
- var __defProps$e = Object.defineProperties;
18613
- var __getOwnPropDescs$e = Object.getOwnPropertyDescriptors;
18685
+ var __defProps$g = Object.defineProperties;
18686
+ var __getOwnPropDescs$g = Object.getOwnPropertyDescriptors;
18614
18687
  var __getOwnPropSymbols$r = Object.getOwnPropertySymbols;
18615
18688
  var __hasOwnProp$r = Object.prototype.hasOwnProperty;
18616
18689
  var __propIsEnum$r = Object.prototype.propertyIsEnumerable;
@@ -18626,7 +18699,7 @@ var NgwLeaflet = (function () {
18626
18699
  }
18627
18700
  return a;
18628
18701
  };
18629
- var __spreadProps$e = (a, b) => __defProps$e(a, __getOwnPropDescs$e(b));
18702
+ var __spreadProps$g = (a, b) => __defProps$g(a, __getOwnPropDescs$g(b));
18630
18703
  var __objRest$2 = (source, exclude) => {
18631
18704
  var target = {};
18632
18705
  for (var prop in source)
@@ -18670,6 +18743,8 @@ var NgwLeaflet = (function () {
18670
18743
  __publicField$p(this, "user");
18671
18744
  __publicField$p(this, "resources");
18672
18745
  __publicField$p(this, "cache");
18746
+ __publicField$p(this, "withCredentials");
18747
+ __publicField$p(this, "client", `NextGIS-NGW-Connector/${pkg.version}`);
18673
18748
  __publicField$p(this, "routeStr", "/api/component/pyramid/route");
18674
18749
  __publicField$p(this, "activeRequests", {});
18675
18750
  __publicField$p(this, "requestTransform");
@@ -18678,11 +18753,15 @@ var NgwLeaflet = (function () {
18678
18753
  if (exist) {
18679
18754
  return exist;
18680
18755
  } else {
18681
- if (this.options.route) {
18682
- this.routeStr = this.options.route;
18756
+ const { route, requestTransform, withCredentials } = this.options;
18757
+ if (route) {
18758
+ this.routeStr = route;
18683
18759
  }
18684
- if (this.options.requestTransform) {
18685
- this.requestTransform = this.options.requestTransform;
18760
+ if (requestTransform) {
18761
+ this.requestTransform = requestTransform;
18762
+ }
18763
+ if (withCredentials !== void 0) {
18764
+ this.withCredentials = withCredentials;
18686
18765
  }
18687
18766
  this.resources = new ResourcesControl({
18688
18767
  connector: this,
@@ -18736,8 +18815,9 @@ var NgwLeaflet = (function () {
18736
18815
  yield this._login({ login, password });
18737
18816
  }
18738
18817
  }
18818
+ const routeUrl = `${this.routeStr}?client=${this.client}`;
18739
18819
  return yield this.makeQuery(
18740
- this.routeStr,
18820
+ routeUrl,
18741
18821
  {},
18742
18822
  {
18743
18823
  cacheName: "route",
@@ -18956,6 +19036,7 @@ var NgwLeaflet = (function () {
18956
19036
  url = template(url, restParams);
18957
19037
  }
18958
19038
  url = encodeURI(fixUrlStr(url));
19039
+ options = __spreadValues$q({ withCredentials: this.withCredentials }, options);
18959
19040
  const {
18960
19041
  cache,
18961
19042
  signal: externalSignal,
@@ -18987,7 +19068,7 @@ var NgwLeaflet = (function () {
18987
19068
  }
18988
19069
  });
18989
19070
  if (cache && method === "GET") {
18990
- const cacheOptions = cacheProps ? cacheProps : __spreadProps$e(__spreadValues$q({}, objectRemoveEmpty({
19071
+ const cacheOptions = cacheProps ? cacheProps : __spreadProps$g(__spreadValues$q({}, objectRemoveEmpty({
18991
19072
  headers,
18992
19073
  withCredentials,
18993
19074
  responseType,
@@ -19155,8 +19236,8 @@ var NgwLeaflet = (function () {
19155
19236
  });
19156
19237
 
19157
19238
  var __defProp$z = Object.defineProperty;
19158
- var __defProps$d = Object.defineProperties;
19159
- var __getOwnPropDescs$d = Object.getOwnPropertyDescriptors;
19239
+ var __defProps$f = Object.defineProperties;
19240
+ var __getOwnPropDescs$f = Object.getOwnPropertyDescriptors;
19160
19241
  var __getOwnPropSymbols$q = Object.getOwnPropertySymbols;
19161
19242
  var __hasOwnProp$q = Object.prototype.hasOwnProperty;
19162
19243
  var __propIsEnum$q = Object.prototype.propertyIsEnumerable;
@@ -19172,7 +19253,7 @@ var NgwLeaflet = (function () {
19172
19253
  }
19173
19254
  return a;
19174
19255
  };
19175
- var __spreadProps$d = (a, b) => __defProps$d(a, __getOwnPropDescs$d(b));
19256
+ var __spreadProps$f = (a, b) => __defProps$f(a, __getOwnPropDescs$f(b));
19176
19257
  var __async$o = (__this, __arguments, generator) => {
19177
19258
  return new Promise((resolve, reject) => {
19178
19259
  var fulfilled = (value) => {
@@ -19213,7 +19294,7 @@ var NgwLeaflet = (function () {
19213
19294
  if (extensionsStr !== "*") {
19214
19295
  params.extensions = extensionsStr;
19215
19296
  }
19216
- if (fields !== void 0) {
19297
+ if (fields !== void 0 && fields !== null) {
19217
19298
  params.fields = Array.isArray(fields) ? fields.join(",") : "";
19218
19299
  }
19219
19300
  if (geom !== void 0) {
@@ -19277,13 +19358,13 @@ var NgwLeaflet = (function () {
19277
19358
  for (const f of filters_) {
19278
19359
  if (isPropertyFilter(f)) {
19279
19360
  _queries.push(
19280
- fetchNgwLayerItemsRequest(__spreadProps$d(__spreadValues$p({}, opt), {
19361
+ fetchNgwLayerItemsRequest(__spreadProps$f(__spreadValues$p({}, opt), {
19281
19362
  paramList: [..._parentAllParams, ...paramList, createParam(f)]
19282
19363
  }))
19283
19364
  );
19284
19365
  } else {
19285
19366
  getQueries(
19286
- __spreadProps$d(__spreadValues$p({}, opt), {
19367
+ __spreadProps$f(__spreadValues$p({}, opt), {
19287
19368
  filters: f
19288
19369
  }),
19289
19370
  _queries,
@@ -19304,7 +19385,7 @@ var NgwLeaflet = (function () {
19304
19385
  if (propertiesFilterList.length) {
19305
19386
  for (const x of propertiesFilterList) {
19306
19387
  getQueries(
19307
- __spreadProps$d(__spreadValues$p({}, opt), {
19388
+ __spreadProps$f(__spreadValues$p({}, opt), {
19308
19389
  filters: x
19309
19390
  }),
19310
19391
  _queries,
@@ -19313,7 +19394,7 @@ var NgwLeaflet = (function () {
19313
19394
  }
19314
19395
  } else {
19315
19396
  _queries.push(
19316
- fetchNgwLayerItemsRequest(__spreadProps$d(__spreadValues$p({}, opt), {
19397
+ fetchNgwLayerItemsRequest(__spreadProps$f(__spreadValues$p({}, opt), {
19317
19398
  paramList: [..._parentAllParams, ...paramList, ...filters2]
19318
19399
  }))
19319
19400
  );
@@ -19379,8 +19460,8 @@ var NgwLeaflet = (function () {
19379
19460
  }
19380
19461
 
19381
19462
  var __defProp$y = Object.defineProperty;
19382
- var __defProps$c = Object.defineProperties;
19383
- var __getOwnPropDescs$c = Object.getOwnPropertyDescriptors;
19463
+ var __defProps$e = Object.defineProperties;
19464
+ var __getOwnPropDescs$e = Object.getOwnPropertyDescriptors;
19384
19465
  var __getOwnPropSymbols$p = Object.getOwnPropertySymbols;
19385
19466
  var __hasOwnProp$p = Object.prototype.hasOwnProperty;
19386
19467
  var __propIsEnum$p = Object.prototype.propertyIsEnumerable;
@@ -19396,7 +19477,7 @@ var NgwLeaflet = (function () {
19396
19477
  }
19397
19478
  return a;
19398
19479
  };
19399
- var __spreadProps$c = (a, b) => __defProps$c(a, __getOwnPropDescs$c(b));
19480
+ var __spreadProps$e = (a, b) => __defProps$e(a, __getOwnPropDescs$e(b));
19400
19481
  var __async$n = (__this, __arguments, generator) => {
19401
19482
  return new Promise((resolve, reject) => {
19402
19483
  var fulfilled = (value) => {
@@ -19434,16 +19515,16 @@ var NgwLeaflet = (function () {
19434
19515
  if (resp.geom) {
19435
19516
  return createGeoJsonFeature(resp);
19436
19517
  } else {
19437
- const onlyGeomItem = yield fetchNgwLayerItem(__spreadProps$c(__spreadValues$o({}, options), {
19518
+ const onlyGeomItem = yield fetchNgwLayerItem(__spreadProps$e(__spreadValues$o({}, options), {
19438
19519
  geom: true,
19439
19520
  fields: null,
19440
19521
  extensions: null
19441
19522
  }));
19442
19523
  const geom = onlyGeomItem.geom;
19443
- return createGeoJsonFeature(__spreadProps$c(__spreadValues$o({}, resp), { geom }));
19524
+ return createGeoJsonFeature(__spreadProps$e(__spreadValues$o({}, resp), { geom }));
19444
19525
  }
19445
19526
  });
19446
- return __spreadProps$c(__spreadValues$o({}, resp), {
19527
+ return __spreadProps$e(__spreadValues$o({}, resp), {
19447
19528
  toGeojson
19448
19529
  });
19449
19530
  });
@@ -20100,8 +20181,8 @@ var NgwLeaflet = (function () {
20100
20181
  }
20101
20182
 
20102
20183
  var __defProp$r = Object.defineProperty;
20103
- var __defProps$b = Object.defineProperties;
20104
- var __getOwnPropDescs$b = Object.getOwnPropertyDescriptors;
20184
+ var __defProps$d = Object.defineProperties;
20185
+ var __getOwnPropDescs$d = Object.getOwnPropertyDescriptors;
20105
20186
  var __getOwnPropSymbols$k = Object.getOwnPropertySymbols;
20106
20187
  var __hasOwnProp$k = Object.prototype.hasOwnProperty;
20107
20188
  var __propIsEnum$k = Object.prototype.propertyIsEnumerable;
@@ -20117,7 +20198,7 @@ var NgwLeaflet = (function () {
20117
20198
  }
20118
20199
  return a;
20119
20200
  };
20120
- var __spreadProps$b = (a, b) => __defProps$b(a, __getOwnPropDescs$b(b));
20201
+ var __spreadProps$d = (a, b) => __defProps$d(a, __getOwnPropDescs$d(b));
20121
20202
  function getNgwWebmapExtent(webmap) {
20122
20203
  const bottom = webmap["extent_bottom"];
20123
20204
  const left = webmap["extent_left"];
@@ -20185,14 +20266,14 @@ var NgwLeaflet = (function () {
20185
20266
  if (resource.cls && resource.cls.indexOf("style") !== -1) {
20186
20267
  return connector.getResource(resource.parent.id, options).then((res) => {
20187
20268
  if (res) {
20188
- return fetchNgwLayerExtent(__spreadProps$b(__spreadValues$j({}, options), {
20269
+ return fetchNgwLayerExtent(__spreadProps$d(__spreadValues$j({}, options), {
20189
20270
  resourceId: res.resource.id,
20190
20271
  connector
20191
20272
  }));
20192
20273
  }
20193
20274
  });
20194
20275
  } else {
20195
- return fetchNgwLayerExtent(__spreadProps$b(__spreadValues$j({}, options), {
20276
+ return fetchNgwLayerExtent(__spreadProps$d(__spreadValues$j({}, options), {
20196
20277
  resourceId: resource.id,
20197
20278
  connector
20198
20279
  }));
@@ -20514,8 +20595,8 @@ var NgwLeaflet = (function () {
20514
20595
  });
20515
20596
 
20516
20597
  var __defProp$n = Object.defineProperty;
20517
- var __defProps$a = Object.defineProperties;
20518
- var __getOwnPropDescs$a = Object.getOwnPropertyDescriptors;
20598
+ var __defProps$c = Object.defineProperties;
20599
+ var __getOwnPropDescs$c = Object.getOwnPropertyDescriptors;
20519
20600
  var __getOwnPropSymbols$h = Object.getOwnPropertySymbols;
20520
20601
  var __getProtoOf$2 = Object.getPrototypeOf;
20521
20602
  var __hasOwnProp$h = Object.prototype.hasOwnProperty;
@@ -20533,7 +20614,7 @@ var NgwLeaflet = (function () {
20533
20614
  }
20534
20615
  return a;
20535
20616
  };
20536
- var __spreadProps$a = (a, b) => __defProps$a(a, __getOwnPropDescs$a(b));
20617
+ var __spreadProps$c = (a, b) => __defProps$c(a, __getOwnPropDescs$c(b));
20537
20618
  var __superGet$2 = (cls, obj, key) => __reflectGet$2(__getProtoOf$2(cls), key, obj);
20538
20619
  var __async$j = (__this, __arguments, generator) => {
20539
20620
  return new Promise((resolve, reject) => {
@@ -20578,7 +20659,7 @@ var NgwLeaflet = (function () {
20578
20659
  class BasemapTileAdapter extends TileAdapter {
20579
20660
  addLayer(opt) {
20580
20661
  return __async$j(this, null, function* () {
20581
- return __superGet$2(BasemapTileAdapter.prototype, this, "addLayer").call(this, __spreadProps$a(__spreadValues$g({}, opt), { url }));
20662
+ return __superGet$2(BasemapTileAdapter.prototype, this, "addLayer").call(this, __spreadProps$c(__spreadValues$g({}, opt), { url }));
20582
20663
  });
20583
20664
  }
20584
20665
  }
@@ -20658,8 +20739,8 @@ var NgwLeaflet = (function () {
20658
20739
  }
20659
20740
 
20660
20741
  var __defProp$m = Object.defineProperty;
20661
- var __defProps$9 = Object.defineProperties;
20662
- var __getOwnPropDescs$9 = Object.getOwnPropertyDescriptors;
20742
+ var __defProps$b = Object.defineProperties;
20743
+ var __getOwnPropDescs$b = Object.getOwnPropertyDescriptors;
20663
20744
  var __getOwnPropSymbols$g = Object.getOwnPropertySymbols;
20664
20745
  var __hasOwnProp$g = Object.prototype.hasOwnProperty;
20665
20746
  var __propIsEnum$g = Object.prototype.propertyIsEnumerable;
@@ -20675,7 +20756,7 @@ var NgwLeaflet = (function () {
20675
20756
  }
20676
20757
  return a;
20677
20758
  };
20678
- var __spreadProps$9 = (a, b) => __defProps$9(a, __getOwnPropDescs$9(b));
20759
+ var __spreadProps$b = (a, b) => __defProps$b(a, __getOwnPropDescs$b(b));
20679
20760
  var __async$i = (__this, __arguments, generator) => {
20680
20761
  return new Promise((resolve, reject) => {
20681
20762
  var fulfilled = (value) => {
@@ -20701,13 +20782,13 @@ var NgwLeaflet = (function () {
20701
20782
  var _a;
20702
20783
  const filters = options.filters;
20703
20784
  if (filters) {
20704
- let data = yield createFeatureFieldFilterQueries(__spreadProps$9(__spreadValues$f({}, options), {
20785
+ let data = yield createFeatureFieldFilterQueries(__spreadProps$b(__spreadValues$f({}, options), {
20705
20786
  filters
20706
20787
  }));
20707
20788
  const clientFilterValidate = (_a = options.clientFilterValidate) != null ? _a : isFilterWithAnyCase(filters);
20708
20789
  if (clientFilterValidate) {
20709
20790
  data = data.filter((y) => {
20710
- const fields = prepareNgwFieldsToPropertiesFilter(__spreadProps$9(__spreadValues$f({}, y.fields), {
20791
+ const fields = prepareNgwFieldsToPropertiesFilter(__spreadProps$b(__spreadValues$f({}, y.fields), {
20711
20792
  id: y.id
20712
20793
  }));
20713
20794
  const result = propertiesFilter(fields, filters);
@@ -20796,8 +20877,8 @@ var NgwLeaflet = (function () {
20796
20877
  }
20797
20878
 
20798
20879
  var __defProp$l = Object.defineProperty;
20799
- var __defProps$8 = Object.defineProperties;
20800
- var __getOwnPropDescs$8 = Object.getOwnPropertyDescriptors;
20880
+ var __defProps$a = Object.defineProperties;
20881
+ var __getOwnPropDescs$a = Object.getOwnPropertyDescriptors;
20801
20882
  var __getOwnPropSymbols$f = Object.getOwnPropertySymbols;
20802
20883
  var __getProtoOf$1 = Object.getPrototypeOf;
20803
20884
  var __hasOwnProp$f = Object.prototype.hasOwnProperty;
@@ -20815,7 +20896,7 @@ var NgwLeaflet = (function () {
20815
20896
  }
20816
20897
  return a;
20817
20898
  };
20818
- var __spreadProps$8 = (a, b) => __defProps$8(a, __getOwnPropDescs$8(b));
20899
+ var __spreadProps$a = (a, b) => __defProps$a(a, __getOwnPropDescs$a(b));
20819
20900
  var __publicField$f = (obj, key, value) => __defNormalProp$l(obj, typeof key !== "symbol" ? key + "" : key, value);
20820
20901
  var __superGet$1 = (cls, obj, key) => __reflectGet$1(__getProtoOf$1(cls), key, obj);
20821
20902
  var __async$g = (__this, __arguments, generator) => {
@@ -20994,7 +21075,7 @@ var NgwLeaflet = (function () {
20994
21075
  try {
20995
21076
  this.emitter.emit("preupdate", filterArgs);
20996
21077
  webMap._emitLayerEvent("layer:preupdate", options.id || "", filterArgs);
20997
- const data = yield getData(filterArgs.filters, __spreadProps$8(__spreadValues$e({}, filterArgs.options), {
21078
+ const data = yield getData(filterArgs.filters, __spreadProps$a(__spreadValues$e({}, filterArgs.options), {
20998
21079
  srs: this.options.srs
20999
21080
  }));
21000
21081
  let newData = data;
@@ -21047,7 +21128,7 @@ var NgwLeaflet = (function () {
21047
21128
  if (this.clearLayer) {
21048
21129
  this.clearLayer();
21049
21130
  }
21050
- const data = yield getData(filters, __spreadProps$8(__spreadValues$e({}, opt), {
21131
+ const data = yield getData(filters, __spreadProps$a(__spreadValues$e({}, opt), {
21051
21132
  srs: this.options.srs
21052
21133
  }));
21053
21134
  this.setData(data);
@@ -21237,8 +21318,8 @@ var NgwLeaflet = (function () {
21237
21318
  }
21238
21319
 
21239
21320
  var __defProp$k = Object.defineProperty;
21240
- var __defProps$7 = Object.defineProperties;
21241
- var __getOwnPropDescs$7 = Object.getOwnPropertyDescriptors;
21321
+ var __defProps$9 = Object.defineProperties;
21322
+ var __getOwnPropDescs$9 = Object.getOwnPropertyDescriptors;
21242
21323
  var __getOwnPropSymbols$e = Object.getOwnPropertySymbols;
21243
21324
  var __hasOwnProp$e = Object.prototype.hasOwnProperty;
21244
21325
  var __propIsEnum$e = Object.prototype.propertyIsEnumerable;
@@ -21254,7 +21335,7 @@ var NgwLeaflet = (function () {
21254
21335
  }
21255
21336
  return a;
21256
21337
  };
21257
- var __spreadProps$7 = (a, b) => __defProps$7(a, __getOwnPropDescs$7(b));
21338
+ var __spreadProps$9 = (a, b) => __defProps$9(a, __getOwnPropDescs$9(b));
21258
21339
  var __publicField$e = (obj, key, value) => __defNormalProp$k(obj, typeof key !== "symbol" ? key + "" : key, value);
21259
21340
  var __async$e = (__this, __arguments, generator) => {
21260
21341
  return new Promise((resolve, reject) => {
@@ -21318,7 +21399,7 @@ var NgwLeaflet = (function () {
21318
21399
  baseUrl: connector.options.baseUrl || ""
21319
21400
  });
21320
21401
  if (opt) {
21321
- const layerAdapterOptions = __spreadProps$7(__spreadValues$d(__spreadValues$d({}, opt), layerOptions.adapterOptions), {
21402
+ const layerAdapterOptions = __spreadProps$9(__spreadValues$d(__spreadValues$d({}, opt), layerOptions.adapterOptions), {
21322
21403
  params: { resource: resourceId },
21323
21404
  layers: opt.layers || String(resourceId),
21324
21405
  resourceId
@@ -21376,8 +21457,8 @@ var NgwLeaflet = (function () {
21376
21457
  }
21377
21458
 
21378
21459
  var __defProp$j = Object.defineProperty;
21379
- var __defProps$6 = Object.defineProperties;
21380
- var __getOwnPropDescs$6 = Object.getOwnPropertyDescriptors;
21460
+ var __defProps$8 = Object.defineProperties;
21461
+ var __getOwnPropDescs$8 = Object.getOwnPropertyDescriptors;
21381
21462
  var __getOwnPropSymbols$d = Object.getOwnPropertySymbols;
21382
21463
  var __hasOwnProp$d = Object.prototype.hasOwnProperty;
21383
21464
  var __propIsEnum$d = Object.prototype.propertyIsEnumerable;
@@ -21393,7 +21474,7 @@ var NgwLeaflet = (function () {
21393
21474
  }
21394
21475
  return a;
21395
21476
  };
21396
- var __spreadProps$6 = (a, b) => __defProps$6(a, __getOwnPropDescs$6(b));
21477
+ var __spreadProps$8 = (a, b) => __defProps$8(a, __getOwnPropDescs$8(b));
21397
21478
  var __async$d = (__this, __arguments, generator) => {
21398
21479
  return new Promise((resolve, reject) => {
21399
21480
  var fulfilled = (value) => {
@@ -21441,7 +21522,7 @@ var NgwLeaflet = (function () {
21441
21522
  const firstStyle = childrenStyles && childrenStyles[0];
21442
21523
  if (firstStyle) {
21443
21524
  return createAsyncAdapter(
21444
- __spreadProps$6(__spreadValues$c({}, layerOptions), { resource: firstStyle.resource.id }),
21525
+ __spreadProps$8(__spreadValues$c({}, layerOptions), { resource: firstStyle.resource.id }),
21445
21526
  webMap,
21446
21527
  connector
21447
21528
  );
@@ -21464,13 +21545,13 @@ var NgwLeaflet = (function () {
21464
21545
  }
21465
21546
  if (item) {
21466
21547
  const cls = item.resource.cls;
21467
- const layerOptions = __spreadProps$6(__spreadValues$c({}, options), {
21548
+ const layerOptions = __spreadProps$8(__spreadValues$c({}, options), {
21468
21549
  resource: resourceId
21469
21550
  });
21470
21551
  const adapterOptions = {
21471
21552
  layerOptions,
21472
- webMap,
21473
21553
  connector,
21554
+ webMap,
21474
21555
  item
21475
21556
  };
21476
21557
  if (supportCls.indexOf(cls) !== -1) {
@@ -21501,10 +21582,10 @@ var NgwLeaflet = (function () {
21501
21582
  item.resource.parent.id
21502
21583
  );
21503
21584
  if (parentItem) {
21504
- const parentOptions = __spreadProps$6(__spreadValues$c({}, options), {
21585
+ const parentOptions = __spreadProps$8(__spreadValues$c({}, options), {
21505
21586
  resource: item.resource.parent.id
21506
21587
  });
21507
- adapter = createGeoJsonAdapter(__spreadProps$6(__spreadValues$c({}, adapterOptions), {
21588
+ adapter = createGeoJsonAdapter(__spreadProps$8(__spreadValues$c({}, adapterOptions), {
21508
21589
  item: parentItem,
21509
21590
  layerOptions: parentOptions
21510
21591
  }));
@@ -21593,6 +21674,9 @@ var NgwLeaflet = (function () {
21593
21674
  if (headers) {
21594
21675
  options.headers = headers;
21595
21676
  }
21677
+ if (connector.withCredentials !== void 0) {
21678
+ options.withCredentials = connector.withCredentials;
21679
+ }
21596
21680
  return createAsyncAdapter(options, webMap, connector);
21597
21681
  }
21598
21682
  function extendNgwWebmapLayerAdapter(opt) {
@@ -21630,6 +21714,8 @@ var NgwLeaflet = (function () {
21630
21714
  }
21631
21715
 
21632
21716
  var __defProp$h = Object.defineProperty;
21717
+ var __defProps$7 = Object.defineProperties;
21718
+ var __getOwnPropDescs$7 = Object.getOwnPropertyDescriptors;
21633
21719
  var __getOwnPropSymbols$b = Object.getOwnPropertySymbols;
21634
21720
  var __hasOwnProp$b = Object.prototype.hasOwnProperty;
21635
21721
  var __propIsEnum$b = Object.prototype.propertyIsEnumerable;
@@ -21645,6 +21731,7 @@ var NgwLeaflet = (function () {
21645
21731
  }
21646
21732
  return a;
21647
21733
  };
21734
+ var __spreadProps$7 = (a, b) => __defProps$7(a, __getOwnPropDescs$7(b));
21648
21735
  var __publicField$d = (obj, key, value) => __defNormalProp$h(obj, typeof key !== "symbol" ? key + "" : key, value);
21649
21736
  var __async$c = (__this, __arguments, generator) => {
21650
21737
  return new Promise((resolve, reject) => {
@@ -21750,14 +21837,12 @@ var NgwLeaflet = (function () {
21750
21837
  getItemOptions(item) {
21751
21838
  const transparency = item.item_type === "layer" && item.layer_transparency;
21752
21839
  const opacity = typeof transparency === "number" ? (100 - transparency) / 100 : void 0;
21753
- const options = {
21840
+ const options = __spreadProps$7(__spreadValues$a({
21754
21841
  visibility: false,
21755
- name: item.display_name,
21756
- headers: this.options.headers,
21757
- crossOrigin: this.options.crossOrigin,
21758
- setViewDelay: this.options.setViewDelay,
21842
+ name: item.display_name
21843
+ }, this.options), {
21759
21844
  params: { resource: this.item.resourceId, item: this.item }
21760
- };
21845
+ });
21761
21846
  if (this.options.order) {
21762
21847
  const subOrder = this.options.drawOrderEnabled && "draw_order_position" in item ? this._rootDescendantsCount - item.draw_order_position : this.id;
21763
21848
  const subLevel = String(subOrder).padStart(4, "0");
@@ -21768,17 +21853,16 @@ var NgwLeaflet = (function () {
21768
21853
  }
21769
21854
  if (item.item_type === "layer") {
21770
21855
  const { maxZoom, minZoom } = this._getZoomRange(item);
21771
- Object.assign(options, {
21772
- updateWmsParams: item.updateWmsParams,
21856
+ Object.assign(options, __spreadProps$7(__spreadValues$a({
21857
+ updateWmsParams: item.updateWmsParams
21858
+ }, this.options), {
21773
21859
  url: item.url,
21774
- headers: this.options.headers,
21775
- ratio: this.options.ratio,
21776
21860
  maxZoom,
21777
21861
  minZoom,
21778
21862
  minScale: item.layer_min_scale_denom,
21779
21863
  maxScale: item.layer_max_scale_denom,
21780
21864
  interactive: item.layer_identifiable
21781
- });
21865
+ }));
21782
21866
  }
21783
21867
  if (opacity !== void 0) {
21784
21868
  options.opacity = opacity;
@@ -22084,6 +22168,8 @@ var NgwLeaflet = (function () {
22084
22168
  const WEBMAP_BASELAYER_ID_PREFIX = "webmap-baselayer";
22085
22169
 
22086
22170
  var __defProp$f = Object.defineProperty;
22171
+ var __defProps$6 = Object.defineProperties;
22172
+ var __getOwnPropDescs$6 = Object.getOwnPropertyDescriptors;
22087
22173
  var __getOwnPropSymbols$9 = Object.getOwnPropertySymbols;
22088
22174
  var __hasOwnProp$9 = Object.prototype.hasOwnProperty;
22089
22175
  var __propIsEnum$9 = Object.prototype.propertyIsEnumerable;
@@ -22099,6 +22185,7 @@ var NgwLeaflet = (function () {
22099
22185
  }
22100
22186
  return a;
22101
22187
  };
22188
+ var __spreadProps$6 = (a, b) => __defProps$6(a, __getOwnPropDescs$6(b));
22102
22189
  var __publicField$b = (obj, key, value) => __defNormalProp$f(obj, typeof key !== "symbol" ? key + "" : key, value);
22103
22190
  var __async$9 = (__this, __arguments, generator) => {
22104
22191
  return new Promise((resolve, reject) => {
@@ -22297,35 +22384,32 @@ var NgwLeaflet = (function () {
22297
22384
  }
22298
22385
  _getWebMapLayerItem() {
22299
22386
  return __async$9(this, null, function* () {
22300
- if (this.resourceId) {
22301
- const webmap = yield this.getWebMapConfig(this.resourceId);
22302
- if (webmap && webmap.root_item) {
22303
- return new Promise((resolve) => {
22304
- const options = {};
22305
- if (this.options.connector && this.options.connector.options.auth) {
22306
- const headers = this.options.connector.getAuthorizationHeaders();
22307
- if (headers) {
22308
- options.headers = headers;
22309
- }
22310
- }
22311
- options.setViewDelay = this.options.setViewDelay;
22312
- options.order = this.options.order;
22313
- options.ratio = this.options.ratio;
22314
- options.crossOrigin = this.options.crossOrigin;
22315
- options.minZoom = this.options.minZoom;
22316
- options.maxZoom = this.options.maxZoom;
22317
- options.drawOrderEnabled = webmap.draw_order_enabled;
22318
- options.popupOptions = this.options.popupOptions;
22319
- const layer = new this.NgwWebmapItem(
22320
- this.options.webMap,
22321
- webmap.root_item,
22322
- options,
22323
- this.options.connector
22324
- );
22325
- layer.emitter.on("init", () => resolve(layer));
22326
- });
22327
- }
22328
- }
22387
+ if (!this.resourceId) {
22388
+ return void 0;
22389
+ }
22390
+ const webmap = yield this.getWebMapConfig(this.resourceId);
22391
+ if (!webmap || !webmap.root_item) {
22392
+ return void 0;
22393
+ }
22394
+ return new Promise((resolve) => {
22395
+ const connector = this.options.connector;
22396
+ const headers = (connector == null ? void 0 : connector.options.auth) ? connector.getAuthorizationHeaders() : void 0;
22397
+ const withCredentials = connector.withCredentials;
22398
+ const options = __spreadProps$6(__spreadValues$8({}, this.options), {
22399
+ withCredentials,
22400
+ headers,
22401
+ drawOrderEnabled: webmap.draw_order_enabled
22402
+ });
22403
+ const layer = new this.NgwWebmapItem(
22404
+ this.options.webMap,
22405
+ webmap.root_item,
22406
+ options,
22407
+ connector
22408
+ );
22409
+ layer.emitter.on("init", () => {
22410
+ resolve(layer);
22411
+ });
22412
+ });
22329
22413
  });
22330
22414
  }
22331
22415
  getWebMapConfig(id) {
@@ -25081,7 +25165,8 @@ var NgwLeaflet = (function () {
25081
25165
  if (!options.connector) {
25082
25166
  options.connector = new NgwConnector({
25083
25167
  baseUrl: options.baseUrl || "",
25084
- auth: options.auth
25168
+ auth: options.auth,
25169
+ withCredentials: options.withCredentials
25085
25170
  });
25086
25171
  } else if (options.connector) {
25087
25172
  options.baseUrl = options.connector.options.baseUrl;