@nextgis/leaflet-map-adapter 2.0.2 → 2.2.0

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

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/leaflet-map-adapter; version: 2.0.2; author: NextGIS */
+/** Bundle of @nextgis/leaflet-map-adapter; version: 2.2.0; author: NextGIS */
 var LeafletMapAdapter = (function () {
   'use strict';
 
@@ -15688,30 +15688,32 @@ var LeafletMapAdapter = (function () {
   class ImageOverlay extends leafletSrcExports.ImageOverlay {
     constructor(imageUrl, bounds, options) {
       super(imageUrl, bounds, options);
-      __publicField$3(this, "_abort", []);
+      __publicField$3(this, "_aborter");
     }
     cancelLoad() {
-      if (this._abort) {
-        this._abort.forEach((x) => x());
-        this._abort = [];
+      if (this._aborter) {
+        this._aborter();
+        this._aborter = void 0;
       }
     }
     _initImage() {
       super._initImage();
       const headers = this.options.headers;
+      const img = this._image;
+      const src = img.src;
       if (headers) {
-        const img = this._image;
-        const src = img.src;
         img.src = "";
-        this._abort.push(
-          callAjax(
-            src,
-            (response) => {
-              img.src = response;
-            },
-            headers
-          )
+        this._aborter = callAjax(
+          src,
+          (response) => {
+            img.src = response;
+          },
+          headers
         );
+      } else {
+        this._aborter = () => {
+          img.setAttribute("src", leafletSrcExports.Util.emptyImageUrl);
+        };
       }
     }
   }
@@ -15750,6 +15752,7 @@ var LeafletMapAdapter = (function () {
       __publicField$2(this, "_url");
       __publicField$2(this, "_currentUrl");
       __publicField$2(this, "_currentOverlay");
+      __publicField$2(this, "_loadedOverlay");
       this._url = url;
       const params = {};
       const opts = {};
@@ -15803,15 +15806,18 @@ var LeafletMapAdapter = (function () {
       this._currentUrl = url;
       const viewPortBuffer = this.options.viewPortBuffer || 0;
       const bounds = this._map.getBounds().pad(viewPortBuffer);
+      if (this._loadedOverlay) {
+        this._loadedOverlay.cancelLoad();
+        this._loadedOverlay.off("load");
+        this._loadedOverlay = void 0;
+      }
       const overlay = new ImageOverlay(url, bounds, {
         opacity: 0,
         pane: this.options.pane,
         headers: this.options.headers
       });
       overlay.addTo(this._map);
-      if (this._currentOverlay) {
-        this._currentOverlay.cancelLoad();
-      }
+      this._loadedOverlay = overlay;
       overlay.once(
         "load",
         () => {
@@ -15824,6 +15830,7 @@ var LeafletMapAdapter = (function () {
           } else if (this._currentOverlay) {
             this._map.removeLayer(this._currentOverlay);
           }
+          this._loadedOverlay = void 0;
           this._currentOverlay = overlay;
           overlay.setOpacity(
             this.options.opacity !== void 0 ? this.options.opacity : 1
@@ -16069,6 +16076,16 @@ var LeafletMapAdapter = (function () {
         }
       }
     }
+    updateLayer() {
+      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);
+        this.layer.redraw();
+      }
+    }
   }
 
   var __defProp$2 = Object.defineProperty;
@@ -16236,6 +16253,8 @@ var LeafletMapAdapter = (function () {
           center: center && [center[1], center[0]],
           zoom
         }, mapAdapterOptions));
+        this._updateMinZoomForBounds(minZoom);
+        this._watchSizeChangeToUpdateMinZoom();
         const defPane = this.map.createPane("order-0");
         this.map._addUnselectCb = (def) => {
           this._addUnselectCb(def);
@@ -16299,19 +16318,17 @@ var LeafletMapAdapter = (function () {
           if (maxBounds) {
             const b = arrayToBoundsExpression(maxBounds);
             map.setMaxBounds(b);
-            map.setMinZoom(map.getBoundsZoom(b));
-            this._watchSizeChangeToUpdateMinZoom(b);
+            this._updateMinZoomForBounds();
           } else {
             map.setMaxBounds(null);
-            this._stopWatchSizeChangeToUpdateMinZoom();
+            this._updateMinZoomForBounds();
           }
         }
         if (maxZoom !== void 0) {
           map.setMaxZoom(maxZoom);
         }
         if (minZoom !== void 0) {
-          this._stopWatchSizeChangeToUpdateMinZoom();
-          map.setMinZoom(minZoom);
+          this._updateMinZoomForBounds(minZoom);
         }
       }
     }
@@ -16445,22 +16462,18 @@ var LeafletMapAdapter = (function () {
       this._unselectCb.length = 0;
       this._unselectCb.push(cb);
     }
-    _watchSizeChangeToUpdateMinZoom(bounds) {
+    _watchSizeChangeToUpdateMinZoom() {
       this._stopWatchSizeChangeToUpdateMinZoom();
       const container = this.getContainer();
       const map = this.map;
       if (container && map && window.ResizeObserver) {
         this._resizeObserver = new ResizeObserver(() => {
-          map.setMinZoom(map.getBoundsZoom(bounds));
+          this._updateMinZoomForBounds();
         });
         this._resizeObserver.observe(container);
       }
     }
     _stopWatchSizeChangeToUpdateMinZoom() {
-      const map = this.map;
-      if (map) {
-        map.setMinZoom(0);
-      }
       if (this._resizeObserver) {
         this._resizeObserver.disconnect();
         this._resizeObserver = void 0;
@@ -16487,6 +16500,28 @@ var LeafletMapAdapter = (function () {
         }
       }
     }
+    _updateMinZoomForBounds(zoom) {
+      var _a;
+      const map = this.map;
+      if (map) {
+        zoom = zoom != null ? zoom : map.getMinZoom();
+        const defaultBounds = leafletSrcExports.latLngBounds(
+          leafletSrcExports.latLng(-90, -18e3),
+          leafletSrcExports.latLng(90, 18e3)
+        );
+        const maxBounds = (_a = map.options.maxBounds) != null ? _a : defaultBounds;
+        if (maxBounds !== void 0) {
+          map.setMinZoom(0);
+          const boundsZoom = map.getBoundsZoom(maxBounds, true);
+          const minZoom = zoom < boundsZoom ? boundsZoom : zoom;
+          map.options.minZoom = minZoom;
+          map.setMinZoom(minZoom);
+          if (map.getZoom() < minZoom) {
+            map.setZoom(minZoom);
+          }
+        }
+      }
+    }
   };
   __publicField(_LeafletMapAdapter, "layerAdapters", {
     GEOJSON: GeoJsonAdapter,