@nextgis/leaflet-map-adapter 2.3.0 → 2.5.4

package/lib/leaflet-map-adapter.esm-bundler.js

@@ -1,6 +1,6 @@
-/** Bundle of @nextgis/leaflet-map-adapter; version: 2.3.0; author: NextGIS */
+/** Bundle of @nextgis/leaflet-map-adapter; version: 2.5.4; author: NextGIS */
 import { EventEmitter } from 'events';
-import { Control, DomEvent, GeoJSON, DivIcon, Marker, CircleMarker, FeatureGroup, ImageOverlay as ImageOverlay$1, Layer, Util, CRS, GridLayer, DomUtil, TileLayer as TileLayer$1, Map, latLngBounds, latLng } from 'leaflet';
+import { Control, DomEvent, GeoJSON, DivIcon, Marker, CircleMarker, FeatureGroup, ImageOverlay as ImageOverlay$1, Layer, Util, GridLayer, DomUtil, TileLayer as TileLayer$1, Map, latLngBounds, latLng } from 'leaflet';
 import { defined, debounce as debounce$1 } from '@nextgis/utils';
 import { isPaintCallback, isPaint } from '@nextgis/paint';
 import Queue from '@nextgis/queue';
@@ -379,7 +379,7 @@ var __objRest$2 = (source, exclude) => {
     }
   return target;
 };
-var __publicField$5 = (obj, key, value) => __defNormalProp$8(obj, typeof key !== "symbol" ? key + "" : key, value);
+var __publicField$5 = (obj, key, value) => __defNormalProp$8(obj, key + "" , value);
 class GeoJsonPaint {
   constructor(layer) {
     __publicField$5(this, "layer");
@@ -1086,7 +1086,11 @@ class GeoJsonAdapter extends BaseAdapter {
   }
 }
 
-function callAjax(src, headers) {
+function callAjax({
+  src,
+  headers,
+  withCredentials
+}) {
   let abortFunc = () => {
   };
   const promise = new Promise((resolve, reject) => {
@@ -1096,6 +1100,9 @@ function callAjax(src, headers) {
     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" });
@@ -1117,7 +1124,7 @@ const imageQueue = new Queue({ concurrency: 6, delay: 200 });
 
 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 ImageOverlay$1 {
   constructor(imageUrl, bounds, options) {
     super(imageUrl, bounds, options);
@@ -1131,12 +1138,16 @@ class ImageOverlay extends ImageOverlay$1 {
   }
   _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;
       });
@@ -1153,13 +1164,7 @@ class ImageLayer extends Layer {
   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,
@@ -1170,6 +1175,7 @@ class ImageLayer extends Layer {
       minZoom: 0,
       pane: "tilePane",
       headers: null,
+      withCredentials: false,
       viewPortBuffer: 0,
       setViewDelay: 100
     });
@@ -1239,7 +1245,8 @@ class ImageLayer extends Layer {
     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;
@@ -1314,9 +1321,7 @@ class ImageLayer extends Layer {
       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());
@@ -1324,8 +1329,7 @@ class ImageLayer extends Layer {
         width: size.x,
         height: size.y
       };
-      params[projectionKey] = crs.code;
-      params.bbox = (wmsVersion >= 1.3 && crs === 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];
       Util.extend(this.wmsParams, params);
     }
   }
@@ -1410,13 +1414,13 @@ function makeRemote(Base) {
       }
     }
     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);
@@ -1506,9 +1510,10 @@ class TileAdapter extends BaseAdapter {
           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 {
@@ -1614,8 +1619,11 @@ class WmsAdapter extends BaseAdapter {
         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 TileLayer$1.WMS(url, layerOptions);
       }