@nextgis/leaflet-map-adapter 4.0.0-alpha.0 → 4.0.0-alpha.1

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

@@ -1,9 +1,10 @@
-/** Bundle of @nextgis/leaflet-map-adapter; version: 4.0.0-alpha.0; author: NextGIS */
+/** Bundle of @nextgis/leaflet-map-adapter; version: 4.0.0-alpha.1; author: NextGIS */
 import { LeafletControlContainer, createControl, createButtonControl, createToggleControl } from '@nextgis/leaflet-control-container';
 import { EventEmitter } from 'events';
 import { Control, GeoJSON, DomEvent, 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, isObject, updateUrlParams } from '@nextgis/utils';
 import { isPaintCallback, isPaint } from '@nextgis/paint';
+import { getLayerRequestOptions } from '@nextgis/webmap';
 import Queue from '@nextgis/queue';
 
 class AttributionControl extends Control.Attribution {
@@ -1017,34 +1018,38 @@ class GeoJsonAdapter extends BaseAdapter {
 function callAjax({
   src,
   headers,
-  withCredentials
+  withCredentials,
+  request
 }) {
-  let abortFunc = () => {
-  };
-  const promise = new Promise((resolve, reject) => {
-    const xhr = new XMLHttpRequest();
-    xhr.open("GET", src);
-    xhr.responseType = "arraybuffer";
-    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" });
-      const urlCreator = window.URL || window.webkitURL;
-      const imageUrl = urlCreator.createObjectURL(blob);
-      resolve(imageUrl);
-    };
-    xhr.onerror = reject;
-    xhr.send();
-    abortFunc = () => {
-      xhr.abort();
-      resolve("");
-    };
+  const layerRequest = getLayerRequestOptions({
+    headers,
+    request,
+    withCredentials
   });
+  const requestHeaders = (layerRequest == null ? void 0 : layerRequest.headers) || {};
+  const controller = new AbortController();
+  const promise = fetch(src, {
+    cache: layerRequest == null ? void 0 : layerRequest.cache,
+    credentials: layerRequest == null ? void 0 : layerRequest.credentials,
+    headers: requestHeaders,
+    signal: controller.signal
+  }).then((response) => {
+    if (!response.ok) {
+      throw new Error(response.statusText);
+    }
+    return response.blob();
+  }).then((blob) => {
+    const urlCreator = window.URL || window.webkitURL;
+    return urlCreator.createObjectURL(blob);
+  }).catch((er) => {
+    if (er.name === "AbortError") {
+      return "";
+    }
+    throw er;
+  });
+  const abortFunc = () => {
+    controller.abort();
+  };
   return [promise, abortFunc];
 }
 
@@ -1066,7 +1071,7 @@ class ImageOverlay extends ImageOverlay$1 {
   }
   _initImage() {
     super._initImage();
-    const { headers, withCredentials } = this.options;
+    const { headers, request, withCredentials } = this.options;
     const img = this._image;
     const src = img.src;
     img.src = "";
@@ -1074,6 +1079,7 @@ class ImageOverlay extends ImageOverlay$1 {
       const [promise, abortFunc] = callAjax({
         src,
         headers,
+        request,
         withCredentials
       });
       promise.then((imgUrl) => {
@@ -1182,6 +1188,7 @@ class ImageLayer extends Layer {
       opacity: 0,
       pane: this.options.pane,
       headers: this.options.headers,
+      request: this.options.request,
       withCredentials: this.options.withCredentials
     });
     overlay.addTo(this._map);
@@ -1306,15 +1313,17 @@ class ImageAdapter extends BaseAdapter {
     const url = options && options.url;
     if (url) {
       const updateWmsParamsFromOpt = options.updateWmsParams;
-      this.layer = new ImageLayer(url, __spreadValues$4(__spreadValues$4(__spreadValues$4({
+      const request = getLayerRequestOptions(options);
+      this.layer = new ImageLayer(url, __spreadProps$3(__spreadValues$4(__spreadValues$4(__spreadValues$4({
         pane: this.pane,
-        headers: options.headers,
         setViewDelay: options.setViewDelay
       }, __spreadProps$3(__spreadValues$4({
         transparent: true
       }, options), {
         opacity: (_a = options.opacity) != null ? _a : void 0
-      })), options.params), options.nativeOptions));
+      })), options.params), options.nativeOptions), {
+        request
+      }));
       if (updateWmsParamsFromOpt) {
         const updateWmsParams = this.layer.updateWmsParams;
         this.layer.updateWmsParams = function(map) {
@@ -1369,7 +1378,8 @@ function makeRemote(Base) {
       const [promise, abortFunc] = callAjax({
         src,
         withCredentials: this.options.withCredentials,
-        headers: this.options.headers
+        headers: this.options.headers,
+        request: this.options.request
       });
       promise.then((response) => {
         tile.src = response;
@@ -1460,10 +1470,10 @@ class TileAdapter extends BaseAdapter {
           tileLayerOptions.subdomains = opt.subdomains;
         }
         let layer;
-        if (opt.headers || opt.withCredentials) {
+        const request = getLayerRequestOptions(opt);
+        if (request) {
           layer = new TileLayer(url, __spreadProps$2(__spreadValues$3({}, tileLayerOptions), {
-            headers: opt.headers,
-            withCredentials: opt.withCredentials,
+            request,
             setViewDelay: opt.setViewDelay
           }));
         } else {
@@ -1568,10 +1578,10 @@ class WmsAdapter extends BaseAdapter {
         transparent: true
       }, options.nativeOptions);
       let layer;
-      if (opt.headers || opt.withCredentials) {
+      const request = getLayerRequestOptions(opt);
+      if (request) {
         layer = new WmsLayer(url, __spreadProps(__spreadValues$1({}, layerOptions), {
-          headers: opt.headers,
-          withCredentials: opt.withCredentials
+          request
         }));
       } else {
         layer = new TileLayer$1.WMS(url, layerOptions);