@nextgis/leaflet-map-adapter 3.0.0-alpha.0 → 3.0.0-alpha.12

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

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/leaflet-map-adapter; version: 3.0.0-alpha.0; author: NextGIS */
+/** Bundle of @nextgis/leaflet-map-adapter; version: 3.0.0-alpha.5; author: NextGIS */
 var LeafletMapAdapter = (function () {
   'use strict';
 
@@ -32,7 +32,7 @@ var LeafletMapAdapter = (function () {
     this.domain = null;
     if (EventEmitter.usingDomains) {
       // if there is an active domain, then attach to it.
-      if (domain.active ) ;
+      if (domain.active) ;
     }
 
     if (!this._events || this._events === Object.getPrototypeOf(this)._events) {
@@ -14656,6 +14656,21 @@ var LeafletMapAdapter = (function () {
     return wrapper;
   }
 
+  function updateUrlParams(urlStr, params) {
+    const url = new URL(urlStr);
+    const searchParams = new URLSearchParams(url.search);
+    Object.entries(params).forEach(([key, value]) => {
+      if (value === void 0) {
+        searchParams.delete(key);
+      } else {
+        searchParams.set(key, value);
+      }
+    });
+    searchParams.set("timestamp", String((/* @__PURE__ */ new Date()).getTime()));
+    const newSearch = [...searchParams.entries()].map(([key, value]) => `${key}=${value}`).join("&");
+    return `${url.origin}${url.pathname}?${newSearch}`;
+  }
+
   function boundsToArray(bounds) {
     const ne = bounds.getNorthEast();
     const sw = bounds.getSouthWest();
@@ -14921,8 +14936,8 @@ var LeafletMapAdapter = (function () {
   }
 
   var __defProp$9 = Object.defineProperty;
-  var __defProps$4 = Object.defineProperties;
-  var __getOwnPropDescs$4 = Object.getOwnPropertyDescriptors;
+  var __defProps$5 = Object.defineProperties;
+  var __getOwnPropDescs$5 = Object.getOwnPropertyDescriptors;
   var __getOwnPropSymbols$6 = Object.getOwnPropertySymbols;
   var __hasOwnProp$6 = Object.prototype.hasOwnProperty;
   var __propIsEnum$6 = Object.prototype.propertyIsEnumerable;
@@ -14938,7 +14953,7 @@ var LeafletMapAdapter = (function () {
       }
     return a;
   };
-  var __spreadProps$4 = (a, b) => __defProps$4(a, __getOwnPropDescs$4(b));
+  var __spreadProps$5 = (a, b) => __defProps$5(a, __getOwnPropDescs$5(b));
   var __objRest$2 = (source, exclude) => {
     var target = {};
     for (var prop in source)
@@ -15033,7 +15048,7 @@ var LeafletMapAdapter = (function () {
       if (html) {
         element.innerHTML = html;
       }
-      const divIcon = new leafletSrcExports.DivIcon(__spreadProps$4(__spreadValues$6({
+      const divIcon = new leafletSrcExports.DivIcon(__spreadProps$5(__spreadValues$6({
         className: ""
       }, toLIconOpt), {
         html: element
@@ -15082,8 +15097,8 @@ var LeafletMapAdapter = (function () {
   }
 
   var __defProp$8 = Object.defineProperty;
-  var __defProps$3 = Object.defineProperties;
-  var __getOwnPropDescs$3 = Object.getOwnPropertyDescriptors;
+  var __defProps$4 = Object.defineProperties;
+  var __getOwnPropDescs$4 = Object.getOwnPropertyDescriptors;
   var __getOwnPropSymbols$5 = Object.getOwnPropertySymbols;
   var __hasOwnProp$5 = Object.prototype.hasOwnProperty;
   var __propIsEnum$5 = Object.prototype.propertyIsEnumerable;
@@ -15099,7 +15114,7 @@ var LeafletMapAdapter = (function () {
       }
     return a;
   };
-  var __spreadProps$3 = (a, b) => __defProps$3(a, __getOwnPropDescs$3(b));
+  var __spreadProps$4 = (a, b) => __defProps$4(a, __getOwnPropDescs$4(b));
   var __publicField$5 = (obj, key, value) => __defNormalProp$8(obj, typeof key !== "symbol" ? key + "" : key, value);
   var __async = (__this, __arguments, generator) => {
     return new Promise((resolve, reject) => {
@@ -15148,7 +15163,7 @@ var LeafletMapAdapter = (function () {
     addLayer(options) {
       Object.assign(this.options, options);
       this.paint = options.paint;
-      this.layer = new leafletSrcExports.FeatureGroup([], __spreadProps$3(__spreadValues$5({}, options.nativeOptions), {
+      this.layer = new leafletSrcExports.FeatureGroup([], __spreadProps$4(__spreadValues$5({}, options.nativeOptions), {
         pane: this.pane
       }));
       this.selectedPaint = options.selectedPaint;
@@ -15498,7 +15513,7 @@ var LeafletMapAdapter = (function () {
               if (feature) {
                 return this._paint.preparePaint(__spreadValues$5(__spreadValues$5({}, PAINT), paint(feature)));
               } else {
-                return this._paint.preparePaint(__spreadProps$3(__spreadValues$5({}, PAINT), { type: "path" }));
+                return this._paint.preparePaint(__spreadProps$4(__spreadValues$5({}, PAINT), { type: "path" }));
               }
             }
           };
@@ -15658,7 +15673,11 @@ var LeafletMapAdapter = (function () {
     }
   }
 
-  function callAjax(src, headers) {
+  function callAjax({
+    src,
+    headers,
+    withCredentials
+  }) {
     let abortFunc = () => {
     };
     const promise = new Promise((resolve, reject) => {
@@ -15668,6 +15687,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" });
@@ -15790,12 +15812,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;
         });
@@ -15810,6 +15836,7 @@ var LeafletMapAdapter = (function () {
   var __publicField$2 = (obj, key, value) => __defNormalProp$5(obj, typeof key !== "symbol" ? key + "" : key, value);
   class ImageLayer extends leafletSrcExports.Layer {
     constructor(url, options) {
+      var _a;
       super(options);
       __publicField$2(this, "defaultWmsParams", {
         service: "WMS",
@@ -15827,8 +15854,10 @@ var LeafletMapAdapter = (function () {
         opacity: 1,
         isBack: false,
         minZoom: 0,
+        maxZoom: void 0,
         pane: "tilePane",
         headers: null,
+        withCredentials: false,
         viewPortBuffer: 0,
         setViewDelay: 100
       });
@@ -15849,7 +15878,11 @@ var LeafletMapAdapter = (function () {
         }
       }
       leafletSrcExports.Util.setOptions(this, opts);
-      this.wmsParams = leafletSrcExports.Util.extend({}, this.defaultWmsParams, params);
+      this.wmsParams = leafletSrcExports.Util.extend(
+        {},
+        this.defaultWmsParams,
+        (_a = params == null ? void 0 : params.params) != null ? _a : {}
+      );
     }
     setParams(params) {
       leafletSrcExports.Util.extend(this.wmsParams, params);
@@ -15898,7 +15931,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;
@@ -15996,6 +16030,8 @@ var LeafletMapAdapter = (function () {
   }
 
   var __defProp$4 = Object.defineProperty;
+  var __defProps$3 = Object.defineProperties;
+  var __getOwnPropDescs$3 = Object.getOwnPropertyDescriptors;
   var __getOwnPropSymbols$4 = Object.getOwnPropertySymbols;
   var __hasOwnProp$4 = Object.prototype.hasOwnProperty;
   var __propIsEnum$4 = Object.prototype.propertyIsEnumerable;
@@ -16011,6 +16047,7 @@ var LeafletMapAdapter = (function () {
       }
     return a;
   };
+  var __spreadProps$3 = (a, b) => __defProps$3(a, __getOwnPropDescs$3(b));
   var __publicField$1 = (obj, key, value) => __defNormalProp$4(obj, typeof key !== "symbol" ? key + "" : key, value);
   class ImageAdapter extends BaseAdapter {
     constructor() {
@@ -16018,15 +16055,21 @@ var LeafletMapAdapter = (function () {
       __publicField$1(this, "layer");
     }
     addLayer(options) {
+      var _a;
       const url = options && options.url;
       if (url) {
-        options = __spreadValues$4({ transparent: true }, options);
         const updateWmsParamsFromOpt = options.updateWmsParams;
-        this.layer = new ImageLayer(url, __spreadValues$4(__spreadValues$4(__spreadValues$4({
+        this.layer = new ImageLayer(url, __spreadProps$3(__spreadValues$4(__spreadValues$4(__spreadValues$4({
           pane: this.pane,
           headers: options.headers,
           setViewDelay: options.setViewDelay
-        }, options), options.params), options.nativeOptions));
+        }, __spreadProps$3(__spreadValues$4({
+          transparent: true
+        }, options), {
+          opacity: (_a = options.opacity) != null ? _a : void 0
+        })), options.params), options.nativeOptions), {
+          maxZoom: 12
+        }));
         if (updateWmsParamsFromOpt) {
           const updateWmsParams = this.layer.updateWmsParams;
           this.layer.updateWmsParams = function(map) {
@@ -16037,6 +16080,13 @@ var LeafletMapAdapter = (function () {
         return this.layer;
       }
     }
+    updateLayer(options) {
+      if (this.layer) {
+        const params = (options == null ? void 0 : options.params) || {};
+        leafletSrcExports.Util.extend(this.layer.wmsParams, params);
+        this.layer.update();
+      }
+    }
   }
   __publicField$1(ImageAdapter, "queue", imageQueue);
 
@@ -16051,13 +16101,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 +16197,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 {
@@ -16159,13 +16210,12 @@ var LeafletMapAdapter = (function () {
         }
       }
     }
-    updateLayer() {
+    updateLayer(options) {
       if (this.layer) {
         const currentUrl = this.layer._url;
-        const timestamp = (/* @__PURE__ */ new Date()).getTime();
-        const separator = currentUrl.includes("?") ? "&" : "?";
-        const newUrl = currentUrl.replace(/(\?|&)timestamp=\d*/g, "") + separator + `timestamp=${timestamp}`;
-        this.layer.setUrl(newUrl);
+        if (options == null ? void 0 : options.params) {
+          this.layer.setUrl(updateUrlParams(currentUrl, options.params));
+        }
         this.layer.redraw();
       }
     }
@@ -16255,8 +16305,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);
         }