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

package/lib/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { EventEmitter } from 'events';
 import { Control, ControlOptions, Map, Layer, GridLayer, LeafletMouseEvent } from 'leaflet';
 import { AttributionControlOptions, MapAdapter, LayerAdapter, MapOptions, ViewOptions, FitOptions, MapControl, CreateControlOptions, ButtonControlOptions, LocateOptions, LocationEvents, Locate } from '@nextgis/webmap';

package/lib/leaflet-map-adapter.esm-browser.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 domain;
 
 // This constructor is used to store event handlers. Instantiating this is
@@ -29,7 +29,7 @@ EventEmitter.init = 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) {
@@ -14653,6 +14653,21 @@ function debounce(cb, wait = 10) {
   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();
@@ -14918,8 +14933,8 @@ function isPaintCallback(paint) {
 }
 
 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;
@@ -14935,7 +14950,7 @@ var __spreadValues$6 = (a, b) => {
     }
   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)
@@ -15030,7 +15045,7 @@ class GeoJsonPaint {
     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
@@ -15079,8 +15094,8 @@ class GeoJsonPaint {
 }
 
 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;
@@ -15096,7 +15111,7 @@ var __spreadValues$5 = (a, b) => {
     }
   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) => {
@@ -15145,7 +15160,7 @@ class GeoJsonAdapter extends BaseAdapter {
   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;
@@ -15495,7 +15510,7 @@ class GeoJsonAdapter extends BaseAdapter {
             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" }));
             }
           }
         };
@@ -15655,7 +15670,11 @@ class GeoJsonAdapter extends BaseAdapter {
   }
 }
 
-function callAjax(src, headers) {
+function callAjax({
+  src,
+  headers,
+  withCredentials
+}) {
   let abortFunc = () => {
   };
   const promise = new Promise((resolve, reject) => {
@@ -15665,6 +15684,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" });
@@ -15787,12 +15809,16 @@ class ImageOverlay extends leafletSrcExports.ImageOverlay {
   }
   _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;
       });
@@ -15807,6 +15833,7 @@ var __defNormalProp$5 = (obj, key, value) => key in obj ? __defProp$5(obj, key,
 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",
@@ -15824,8 +15851,10 @@ class ImageLayer extends leafletSrcExports.Layer {
       opacity: 1,
       isBack: false,
       minZoom: 0,
+      maxZoom: void 0,
       pane: "tilePane",
       headers: null,
+      withCredentials: false,
       viewPortBuffer: 0,
       setViewDelay: 100
     });
@@ -15846,7 +15875,11 @@ class ImageLayer extends leafletSrcExports.Layer {
       }
     }
     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);
@@ -15895,7 +15928,8 @@ class ImageLayer extends leafletSrcExports.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;
@@ -15993,6 +16027,8 @@ class ImageLayer extends leafletSrcExports.Layer {
 }
 
 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;
@@ -16008,6 +16044,7 @@ var __spreadValues$4 = (a, b) => {
     }
   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() {
@@ -16015,15 +16052,21 @@ class ImageAdapter extends BaseAdapter {
     __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) {
@@ -16034,6 +16077,13 @@ class ImageAdapter extends BaseAdapter {
       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);
 
@@ -16048,13 +16098,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);
@@ -16144,9 +16194,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 {
@@ -16156,13 +16207,12 @@ class TileAdapter extends BaseAdapter {
       }
     }
   }
-  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();
     }
   }
@@ -16252,8 +16302,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 leafletSrcExports.TileLayer.WMS(url, layerOptions);
       }