@nextgis/ngw-leaflet 1.7.0 → 1.8.0

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

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/ngw-leaflet; version: 1.7.0; author: NextGIS */
+/** Bundle of @nextgis/ngw-leaflet; version: 1.8.0; author: NextGIS */
 function styleInject(css, ref) {
   if ( ref === void 0 ) ref = {};
   var insertAt = ref.insertAt;
@@ -16674,11 +16674,11 @@ class WebMapLayers extends WebMapMain {
                 const order = l.options.baselayer ? 0 : l.options.order;
                 // do not show baselayer if another on the map
                 if (l.options.baselayer && this._baselayers.length) {
-                    const anotherVisibleLayerBaseLayer = this._baselayers.find((x) => {
+                    const anotherVisibleBaselayers = this._baselayers.filter((x) => {
                         return x !== l.id && this.isLayerVisible(x);
                     });
-                    if (anotherVisibleLayerBaseLayer) {
-                        await this.hideLayer(anotherVisibleLayerBaseLayer);
+                    for (const bl of anotherVisibleBaselayers) {
+                        await this.hideLayer(bl);
                     }
                 }
                 if (l.showLayer) {
@@ -21788,7 +21788,8 @@ class BaseAdapter {
             this.pane = pane;
         }
     }
-    addLayer(_options) {
+    addLayer(options) {
+        Object.assign(this.options, options);
         return undefined;
     }
 }
@@ -21807,11 +21808,14 @@ class GeoJsonAdapter extends BaseAdapter {
         this.$unselect = () => {
             this.unselect();
         };
-        this.layer = new leafletSrc.exports.FeatureGroup([], { pane: this.pane });
     }
     addLayer(options) {
-        this.options = options;
+        Object.assign(this.options, options);
         this.paint = options.paint;
+        this.layer = new leafletSrc.exports.FeatureGroup([], {
+            ...options.nativeOptions,
+            pane: this.pane,
+        });
         this.selectedPaint = options.selectedPaint;
         options.paint = this.paint;
         if (options.data) {
@@ -21871,39 +21875,37 @@ class GeoJsonAdapter extends BaseAdapter {
     filter(fun) {
         // Some optimization
         this._filterFun = fun;
-        // @ts-ignore
-        const _map = this.layer._map;
-        if (_map) {
-            this.layer.remove();
-        }
-        const filteredLayers = [];
-        this._layers.forEach(({ feature, layer }) => {
-            if (layer) {
-                const ok = fun
-                    ? fun({
-                        target: this,
-                        feature,
-                        layer,
-                        ...createFeaturePositionOptions(feature),
-                    })
-                    : true;
-                if (ok) {
-                    this.layer.addLayer(layer);
-                    filteredLayers.push({
-                        target: this,
-                        feature,
-                        layer,
-                        ...createFeaturePositionOptions(feature),
-                    });
-                }
-                else {
-                    this.layer.removeLayer(layer);
+        const layer_ = this.layer;
+        const map = layer_ && layer_._map;
+        if (layer_ && map) {
+            layer_.remove();
+            const filteredLayers = [];
+            this._layers.forEach(({ feature, layer }) => {
+                if (layer) {
+                    const ok = fun
+                        ? fun({
+                            target: this,
+                            feature,
+                            layer,
+                            ...createFeaturePositionOptions(feature),
+                        })
+                        : true;
+                    if (ok) {
+                        layer_.addLayer(layer);
+                        filteredLayers.push({
+                            target: this,
+                            feature,
+                            layer,
+                            ...createFeaturePositionOptions(feature),
+                        });
+                    }
+                    else {
+                        layer_.removeLayer(layer);
+                    }
                 }
-            }
-        });
-        this._filteredLayers = filteredLayers;
-        if (_map) {
-            this.layer.addTo(_map);
+            });
+            this._filteredLayers = filteredLayers;
+            layer_.addTo(map);
         }
         return this._filteredLayers;
     }
@@ -21924,24 +21926,27 @@ class GeoJsonAdapter extends BaseAdapter {
     }
     clearLayer(cb) {
         this.unselect();
-        if (cb) {
-            for (let fry = this._layers.length; fry--;) {
-                const def = this._layers[fry];
-                if (def) {
-                    const { feature, layer } = def;
-                    if (feature && layer) {
-                        const exist = cb(feature);
-                        if (exist) {
-                            this.layer.removeLayer(layer);
-                            this._layers.splice(fry, 1);
+        const layer_ = this.layer;
+        if (layer_) {
+            if (cb) {
+                for (let fry = this._layers.length; fry--;) {
+                    const def = this._layers[fry];
+                    if (def) {
+                        const { feature, layer } = def;
+                        if (feature && layer) {
+                            const exist = cb(feature);
+                            if (exist) {
+                                layer_.removeLayer(layer);
+                                this._layers.splice(fry, 1);
+                            }
                         }
                     }
                 }
             }
-        }
-        else {
-            this.layer.clearLayers();
-            this._layers = [];
+            else {
+                layer_.clearLayers();
+                this._layers = [];
+            }
         }
     }
     setData(data) {
@@ -22003,8 +22008,10 @@ class GeoJsonAdapter extends BaseAdapter {
         return this.getBounds();
     }
     getBounds() {
-        const bounds = this.layer.getBounds();
-        return boundsToArray(bounds);
+        if (this.layer) {
+            const bounds = this.layer.getBounds();
+            return boundsToArray(bounds);
+        }
     }
     setOpacity(value) {
         this.options.opacity = value;
@@ -22219,6 +22226,13 @@ class GeoJsonAdapter extends BaseAdapter {
             lopt = this._createPaintOptions(paint, type);
         }
         lopt.onEachFeature = (feature, layer) => {
+            this._onEachFeature(feature, layer);
+        };
+        return lopt;
+    }
+    _onEachFeature(feature, layer) {
+        const layer_ = this.layer;
+        if (layer_) {
             const def = {
                 target: this,
                 feature,
@@ -22236,7 +22250,7 @@ class GeoJsonAdapter extends BaseAdapter {
                 const { popup, popupOptions, selectable, interactive, selectOnHover } = this.options;
                 // @ts-ignore
                 layer.options.interactive = defined(interactive) ? interactive : true;
-                this.layer.addLayer(layer);
+                layer_.addLayer(layer);
                 if (selectable) {
                     if (selectOnHover) {
                         layer.on('mouseover', () => {
@@ -22261,8 +22275,7 @@ class GeoJsonAdapter extends BaseAdapter {
                 }
                 this._updateTooltip({ layer, feature });
             }
-        };
-        return lopt;
+        }
     }
     _handleMouseEvents(layer) {
         const isSelected = (l) => this._selectedLayers.indexOf(l) !== -1;
@@ -22666,7 +22679,6 @@ class ImageLayer extends leafletSrc.exports.Layer {
     }
 }
 
-// @ts-ignore
 class ImageAdapter extends BaseAdapter {
     addLayer(options) {
         const url = options && options.url;
@@ -22678,10 +22690,11 @@ class ImageAdapter extends BaseAdapter {
                 headers: options.headers,
                 setViewDelay: options.setViewDelay,
                 /**
-                 * TODO: safe remove, use only options.params
+                 * TODO: safe remove, use only options.nativeOptions
                  */
                 ...options,
                 ...options.params,
+                ...options.nativeOptions,
             });
             if (updateWmsParamsFromOpt) {
                 const updateWmsParams = this.layer.updateWmsParams;
@@ -22800,33 +22813,33 @@ const WmsLayer = makeRemote(WmsLayerBase);
 
 class WmsAdapter extends BaseAdapter {
     addLayer(options) {
-        if (options) {
-            const { url, ...opt } = options;
-            if (url) {
-                const layerOptions = {
-                    pane: this.pane,
-                    attribution: opt.attribution,
-                    minZoom: opt.minZoom,
-                    maxZoom: opt.maxZoom,
-                    layers: options.layers,
-                    format: options.format,
-                };
-                let layer;
-                if (opt.headers) {
-                    layer = new WmsLayer(url, { ...layerOptions, headers: opt.headers });
-                }
-                else {
-                    layer = new leafletSrc.exports.TileLayer.WMS(url, layerOptions);
-                }
-                return layer;
+        Object.assign(this.options, options);
+        const { url, ...opt } = options;
+        if (url) {
+            const layerOptions = {
+                pane: this.pane,
+                attribution: opt.attribution,
+                minZoom: opt.minZoom,
+                maxZoom: opt.maxZoom,
+                layers: options.layers,
+                format: options.format,
+                ...options.nativeOptions,
+            };
+            let layer;
+            if (opt.headers) {
+                layer = new WmsLayer(url, { ...layerOptions, headers: opt.headers });
             }
+            else {
+                layer = new leafletSrc.exports.TileLayer.WMS(url, layerOptions);
+            }
+            return layer;
         }
     }
 }
 
 class OsmAdapter extends TileAdapter {
     addLayer(options) {
-        const url = options.url || 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png';
+        const url = 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png';
         return super.addLayer({
             name: 'OpenStreetMap',
             attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors',