@nextgis/ngw-leaflet 2.0.2 → 2.1.1

package/lib/ngw-leaflet.esm-bundler.js

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/ngw-leaflet; version: 2.0.2; author: NextGIS */
+/** Bundle of @nextgis/ngw-leaflet; version: 2.1.1; author: NextGIS */
 import 'leaflet/dist/leaflet.css';
 import LeafletMapAdapter from '@nextgis/leaflet-map-adapter';
 import { NgwMap } from '@nextgis/ngw-map';

package/lib/ngw-leaflet.global.js

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/ngw-leaflet; version: 2.0.2; author: NextGIS */
+/** Bundle of @nextgis/ngw-leaflet; version: 2.1.1; author: NextGIS */
 var NgwLeaflet = (function () {
   'use strict';
 
@@ -17289,6 +17289,16 @@ var NgwLeaflet = (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$N = Object.defineProperty;
@@ -17456,6 +17466,8 @@ var NgwLeaflet = (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);
@@ -17519,19 +17531,17 @@ var NgwLeaflet = (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);
         }
       }
     }
@@ -17665,22 +17675,18 @@ var NgwLeaflet = (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;
@@ -17707,6 +17713,28 @@ var NgwLeaflet = (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$A(_LeafletMapAdapter, "layerAdapters", {
     GEOJSON: GeoJsonAdapter,
@@ -20892,7 +20920,7 @@ var NgwLeaflet = (function () {
       } = props;
       const addLayerOptionsPriority = alop != null ? alop : true;
       const options = layerOptions;
-      const GeoJsonAdapter = Adapter || webMap.mapAdapter.layerAdapters.GEOJSON;
+      const GeoJsonAdapter = Adapter || layerOptions.Adapter || webMap.mapAdapter.layerAdapters.GEOJSON;
       const _loadedIds = [];
       let _fullDataLoad = false;
       let _lastFilterArgs;
@@ -23613,6 +23641,9 @@ var NgwLeaflet = (function () {
         this.setView(center, zoom);
       } else if (bounds) {
         this.fitBounds(bounds);
+        if (zoom !== void 0) {
+          this.setZoom(zoom);
+        }
       }
     }
     _setInitMapState(states) {