@nextgis/leaflet-map-adapter 2.3.0 → 2.5.4

package/lib/leaflet-map-adapter.global.js

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/leaflet-map-adapter; version: 2.3.0; author: NextGIS */
+/** Bundle of @nextgis/leaflet-map-adapter; version: 2.5.4; author: NextGIS */
 var LeafletMapAdapter = (function () {
   'use strict';
 
@@ -14951,7 +14951,7 @@ var LeafletMapAdapter = (function () {
       }
     return target;
   };
-  var __publicField$6 = (obj, key, value) => __defNormalProp$9(obj, typeof key !== "symbol" ? key + "" : key, value);
+  var __publicField$6 = (obj, key, value) => __defNormalProp$9(obj, key + "" , value);
   class GeoJsonPaint {
     constructor(layer) {
       __publicField$6(this, "layer");
@@ -15658,7 +15658,11 @@ var LeafletMapAdapter = (function () {
     }
   }
 
-  function callAjax(src, headers) {
+  function callAjax({
+    src,
+    headers,
+    withCredentials
+  }) {
     let abortFunc = () => {
     };
     const promise = new Promise((resolve, reject) => {
@@ -15668,6 +15672,9 @@ var LeafletMapAdapter = (function () {
       for (const h in headers) {
         xhr.setRequestHeader(h, headers[h]);
       }
+      if (withCredentials) {
+        xhr.withCredentials = withCredentials;
+      }
       xhr.onload = function() {
         const arrayBufferView = new Uint8Array(this.response);
         const blob = new Blob([arrayBufferView], { type: "image/png" });
@@ -15776,7 +15783,7 @@ var LeafletMapAdapter = (function () {
 
   var __defProp$6 = Object.defineProperty;
   var __defNormalProp$6 = (obj, key, value) => key in obj ? __defProp$6(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __publicField$3 = (obj, key, value) => __defNormalProp$6(obj, typeof key !== "symbol" ? key + "" : key, value);
+  var __publicField$3 = (obj, key, value) => __defNormalProp$6(obj, key + "" , value);
   class ImageOverlay extends leafletSrcExports.ImageOverlay {
     constructor(imageUrl, bounds, options) {
       super(imageUrl, bounds, options);
@@ -15790,12 +15797,16 @@ var LeafletMapAdapter = (function () {
     }
     _initImage() {
       super._initImage();
-      const headers = this.options.headers;
+      const { headers, withCredentials } = this.options;
       const img = this._image;
       const src = img.src;
       img.src = "";
       imageQueue.add(() => {
-        const [promise, abortFunc] = callAjax(src, headers);
+        const [promise, abortFunc] = callAjax({
+          src,
+          headers,
+          withCredentials
+        });
         promise.then((imgUrl) => {
           img.src = imgUrl;
         });
@@ -15812,13 +15823,7 @@ var LeafletMapAdapter = (function () {
     constructor(url, options) {
       super(options);
       __publicField$2(this, "defaultWmsParams", {
-        service: "WMS",
-        request: "GetMap",
-        version: "1.1.1",
-        layers: "",
-        styles: "",
-        format: "image/jpeg",
-        transparent: false
+        request: "GetMap"
       });
       __publicField$2(this, "options", {
         crs: null,
@@ -15829,6 +15834,7 @@ var LeafletMapAdapter = (function () {
         minZoom: 0,
         pane: "tilePane",
         headers: null,
+        withCredentials: false,
         viewPortBuffer: 0,
         setViewDelay: 100
       });
@@ -15898,7 +15904,8 @@ var LeafletMapAdapter = (function () {
       const overlay = new ImageOverlay(url, bounds, {
         opacity: 0,
         pane: this.options.pane,
-        headers: this.options.headers
+        headers: this.options.headers,
+        withCredentials: this.options.withCredentials
       });
       overlay.addTo(this._map);
       this._loadedOverlay = overlay;
@@ -15973,9 +15980,7 @@ var LeafletMapAdapter = (function () {
         size.x = Math.ceil(size.x * factor);
         size.y = Math.ceil(size.y * factor);
       }
-      const wmsVersion = parseFloat(this.wmsParams.version);
       const crs = this.options.crs || map.options.crs;
-      const projectionKey = wmsVersion >= 1.3 ? "crs" : "srs";
       if (crs) {
         const nw = crs.project(bounds.getNorthWest());
         const se = crs.project(bounds.getSouthEast());
@@ -15983,8 +15988,7 @@ var LeafletMapAdapter = (function () {
           width: size.x,
           height: size.y
         };
-        params[projectionKey] = crs.code;
-        params.bbox = (wmsVersion >= 1.3 && crs === leafletSrcExports.CRS.EPSG4326 ? [se.y, nw.x, nw.y, se.x] : [nw.x, se.y, se.x, nw.y]).join(",");
+        params.bbox = [nw.x, se.y, se.x, nw.y];
         leafletSrcExports.Util.extend(this.wmsParams, params);
       }
     }
@@ -16051,13 +16055,13 @@ var LeafletMapAdapter = (function () {
         }
       }
       createTile(coords, done) {
-        const url = this.getTileUrl(coords);
+        const src = this.getTileUrl(coords);
         const tile = document.createElement("img");
-        const [promise, abortFunc] = callAjax(
-          url,
-          // @ts-ignore
-          this.options.headers
-        );
+        const [promise, abortFunc] = callAjax({
+          src,
+          withCredentials: this.options.withCredentials,
+          headers: this.options.headers
+        });
         promise.then((response) => {
           tile.src = response;
           done(null, tile);
@@ -16147,9 +16151,10 @@ var LeafletMapAdapter = (function () {
             tileLayerOptions.subdomains = opt.subdomains;
           }
           let layer;
-          if (opt.headers) {
+          if (opt.headers || opt.withCredentials) {
             layer = new TileLayer(url, __spreadProps$2(__spreadValues$3({}, tileLayerOptions), {
               headers: opt.headers,
+              withCredentials: opt.withCredentials,
               setViewDelay: opt.setViewDelay
             }));
           } else {
@@ -16255,8 +16260,11 @@ var LeafletMapAdapter = (function () {
           transparent: true
         }, options.nativeOptions);
         let layer;
-        if (opt.headers) {
-          layer = new WmsLayer(url, __spreadProps(__spreadValues$1({}, layerOptions), { headers: opt.headers }));
+        if (opt.headers || opt.withCredentials) {
+          layer = new WmsLayer(url, __spreadProps(__spreadValues$1({}, layerOptions), {
+            headers: opt.headers,
+            withCredentials: opt.withCredentials
+          }));
         } else {
           layer = new leafletSrcExports.TileLayer.WMS(url, layerOptions);
         }