@nextgis/ngw-leaflet 2.0.2 → 2.1.1

package/README.md

@@ -64,7 +64,7 @@ const ngwMap = new NgwMap({
 });
 ```
 
-Check out the [API Documentation](https://code-api.nextgis.com/modules/ngw_map.html)
+Check out the [API Documentation](https://code-api.nextgis.com/modules/_nextgis_ngw_map.html)
 
 ## Commercial support
 

package/lib/ngw-leaflet.esm-browser.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 */
 function styleInject(css, ref) {
   if ( ref === void 0 ) ref = {};
   var insertAt = ref.insertAt;
@@ -17286,6 +17286,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$N = Object.defineProperty;
@@ -17453,6 +17463,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);
@@ -17516,19 +17528,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);
       }
     }
   }
@@ -17662,22 +17672,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;
@@ -17704,6 +17710,28 @@ const _LeafletMapAdapter = class _LeafletMapAdapter {
       }
     }
   }
+  _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,
@@ -20889,7 +20917,7 @@ function createGeoJsonAdapter(props) {
     } = 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;
@@ -23610,6 +23638,9 @@ const _WebMapMain = class _WebMapMain {
       this.setView(center, zoom);
     } else if (bounds) {
       this.fitBounds(bounds);
+      if (zoom !== void 0) {
+        this.setZoom(zoom);
+      }
     }
   }
   _setInitMapState(states) {