@nextgis/ngw-leaflet 2.1.0 → 2.2.0

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

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/ngw-leaflet; version: 2.1.0; author: NextGIS */
+/** Bundle of @nextgis/ngw-leaflet; version: 2.2.0; 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.1.0; author: NextGIS */
+/** Bundle of @nextgis/ngw-leaflet; version: 2.2.0; author: NextGIS */
 var NgwLeaflet = (function () {
   'use strict';
 
@@ -16908,30 +16908,32 @@ var NgwLeaflet = (function () {
   class ImageOverlay extends leafletSrcExports.ImageOverlay {
     constructor(imageUrl, bounds, options) {
       super(imageUrl, bounds, options);
-      __publicField$D(this, "_abort", []);
+      __publicField$D(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);
+        };
       }
     }
   }
@@ -16970,6 +16972,7 @@ var NgwLeaflet = (function () {
       __publicField$C(this, "_url");
       __publicField$C(this, "_currentUrl");
       __publicField$C(this, "_currentOverlay");
+      __publicField$C(this, "_loadedOverlay");
       this._url = url;
       const params = {};
       const opts = {};
@@ -17023,15 +17026,18 @@ var NgwLeaflet = (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",
         () => {
@@ -17044,6 +17050,7 @@ var NgwLeaflet = (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
@@ -20920,7 +20927,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;