@nextgis/leaflet-map-adapter 2.0.2 → 2.2.0

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

@@ -1,6 +1,6 @@
-/** Bundle of @nextgis/leaflet-map-adapter; version: 2.0.2; author: NextGIS */
+/** Bundle of @nextgis/leaflet-map-adapter; version: 2.2.0; 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 } from 'leaflet';
+import { Control, DomEvent, GeoJSON, DivIcon, Marker, CircleMarker, FeatureGroup, ImageOverlay as ImageOverlay$1, Util, Layer, CRS, 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';
 
@@ -1115,30 +1115,32 @@ var __publicField$3 = (obj, key, value) => {
 class ImageOverlay extends ImageOverlay$1 {
   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", Util.emptyImageUrl);
+      };
     }
   }
 }
@@ -1177,6 +1179,7 @@ class ImageLayer extends Layer {
     __publicField$2(this, "_url");
     __publicField$2(this, "_currentUrl");
     __publicField$2(this, "_currentOverlay");
+    __publicField$2(this, "_loadedOverlay");
     this._url = url;
     const params = {};
     const opts = {};
@@ -1230,15 +1233,18 @@ class ImageLayer extends Layer {
     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",
       () => {
@@ -1251,6 +1257,7 @@ class ImageLayer extends Layer {
         } 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
@@ -1514,6 +1521,16 @@ class TileAdapter extends BaseAdapter {
       }
     }
   }
+  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;
@@ -1681,6 +1698,8 @@ const _LeafletMapAdapter = class _LeafletMapAdapter {
         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);
@@ -1744,19 +1763,17 @@ const _LeafletMapAdapter = class _LeafletMapAdapter {
         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);
       }
     }
   }
@@ -1890,22 +1907,18 @@ const _LeafletMapAdapter = class _LeafletMapAdapter {
     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;
@@ -1932,6 +1945,28 @@ const _LeafletMapAdapter = class _LeafletMapAdapter {
       }
     }
   }
+  _updateMinZoomForBounds(zoom) {
+    var _a;
+    const map = this.map;
+    if (map) {
+      zoom = zoom != null ? zoom : map.getMinZoom();
+      const defaultBounds = latLngBounds(
+        latLng(-90, -18e3),
+        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,