@nextgis/ngw-leaflet 1.7.0 → 1.8.0

package/lib/ngw-leaflet.esm-bundler.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 */
 import 'leaflet/dist/leaflet.css';
 import { Icon } from 'leaflet';
 import { NgwMap } from '@nextgis/ngw-map';

package/lib/ngw-leaflet.global.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 */
 var NgwLeaflet = (function () {
     'use strict';
 
@@ -16931,7 +16931,7 @@ var NgwLeaflet = (function () {
             var toStatus = status !== undefined ? status : !onMap;
             var silent = options.silent !== undefined ? options.silent : false;
             var action = function (l) { return __awaiter(_this, void 0, void 0, function () {
-                var id, preEventName, eventName, order, anotherVisibleLayerBaseLayer;
+                var id, preEventName, eventName, order, anotherVisibleBaselayers, _i, anotherVisibleBaselayers_1, bl;
                 var _this = this;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
@@ -16943,18 +16943,25 @@ var NgwLeaflet = (function () {
                                 this._emitLayerEvent(preEventName, id, l);
                                 this._emitLayerEvent('layer:pretoggle', id, l);
                             }
-                            if (!(toStatus && this.mapAdapter)) return [3 /*break*/, 3];
+                            if (!(toStatus && this.mapAdapter)) return [3 /*break*/, 5];
                             order = l.options.baselayer ? 0 : l.options.order;
-                            if (!(l.options.baselayer && this._baselayers.length)) return [3 /*break*/, 2];
-                            anotherVisibleLayerBaseLayer = this._baselayers.find(function (x) {
+                            if (!(l.options.baselayer && this._baselayers.length)) return [3 /*break*/, 4];
+                            anotherVisibleBaselayers = this._baselayers.filter(function (x) {
                                 return x !== l.id && _this.isLayerVisible(x);
                             });
-                            if (!anotherVisibleLayerBaseLayer) return [3 /*break*/, 2];
-                            return [4 /*yield*/, this.hideLayer(anotherVisibleLayerBaseLayer)];
+                            _i = 0, anotherVisibleBaselayers_1 = anotherVisibleBaselayers;
+                            _a.label = 1;
                         case 1:
-                            _a.sent();
-                            _a.label = 2;
+                            if (!(_i < anotherVisibleBaselayers_1.length)) return [3 /*break*/, 4];
+                            bl = anotherVisibleBaselayers_1[_i];
+                            return [4 /*yield*/, this.hideLayer(bl)];
                         case 2:
+                            _a.sent();
+                            _a.label = 3;
+                        case 3:
+                            _i++;
+                            return [3 /*break*/, 1];
+                        case 4:
                             if (l.showLayer) {
                                 l.showLayer.call(l, l.layer);
                             }
@@ -16964,16 +16971,16 @@ var NgwLeaflet = (function () {
                             if (order !== undefined) {
                                 this.mapAdapter.setLayerOrder(l.layer, order, this._layers);
                             }
-                            return [3 /*break*/, 4];
-                        case 3:
+                            return [3 /*break*/, 6];
+                        case 5:
                             if (l.hideLayer) {
                                 l.hideLayer.call(l, l.layer);
                             }
                             else if (l.layer !== undefined) {
                                 this.mapAdapter.hideLayer(l.layer);
                             }
-                            _a.label = 4;
-                        case 4:
+                            _a.label = 6;
+                        case 6:
                             if (!silent) {
                                 this._emitLayerEvent(eventName, id, l);
                                 this._emitLayerEvent('layer:toggle', id, l);
@@ -22642,7 +22649,8 @@ var NgwLeaflet = (function () {
                 this.pane = pane;
             }
         }
-        BaseAdapter.prototype.addLayer = function (_options) {
+        BaseAdapter.prototype.addLayer = function (options) {
+            Object.assign(this.options, options);
             return undefined;
         };
         return BaseAdapter;
@@ -22663,12 +22671,12 @@ var NgwLeaflet = (function () {
             _this.$unselect = function () {
                 _this.unselect();
             };
-            _this.layer = new leafletSrc.exports.FeatureGroup([], { pane: _this.pane });
             return _this;
         }
         GeoJsonAdapter.prototype.addLayer = function (options) {
-            this.options = options;
+            Object.assign(this.options, options);
             this.paint = options.paint;
+            this.layer = new leafletSrc.exports.FeatureGroup([], __assign(__assign({}, options.nativeOptions), { pane: this.pane }));
             this.selectedPaint = options.selectedPaint;
             options.paint = this.paint;
             if (options.data) {
@@ -22728,30 +22736,28 @@ var NgwLeaflet = (function () {
             var _this = this;
             // Some optimization
             this._filterFun = fun;
-            // @ts-ignore
-            var _map = this.layer._map;
-            if (_map) {
-                this.layer.remove();
-            }
-            var filteredLayers = [];
-            this._layers.forEach(function (_a) {
-                var feature = _a.feature, layer = _a.layer;
-                if (layer) {
-                    var ok = fun
-                        ? fun(__assign({ target: _this, feature: feature, layer: layer }, createFeaturePositionOptions(feature)))
-                        : true;
-                    if (ok) {
-                        _this.layer.addLayer(layer);
-                        filteredLayers.push(__assign({ target: _this, feature: feature, layer: layer }, createFeaturePositionOptions(feature)));
-                    }
-                    else {
-                        _this.layer.removeLayer(layer);
+            var layer_ = this.layer;
+            var map = layer_ && layer_._map;
+            if (layer_ && map) {
+                layer_.remove();
+                var filteredLayers_1 = [];
+                this._layers.forEach(function (_a) {
+                    var feature = _a.feature, layer = _a.layer;
+                    if (layer) {
+                        var ok = fun
+                            ? fun(__assign({ target: _this, feature: feature, layer: layer }, createFeaturePositionOptions(feature)))
+                            : true;
+                        if (ok) {
+                            layer_.addLayer(layer);
+                            filteredLayers_1.push(__assign({ target: _this, feature: feature, layer: layer }, createFeaturePositionOptions(feature)));
+                        }
+                        else {
+                            layer_.removeLayer(layer);
+                        }
                     }
-                }
-            });
-            this._filteredLayers = filteredLayers;
-            if (_map) {
-                this.layer.addTo(_map);
+                });
+                this._filteredLayers = filteredLayers_1;
+                layer_.addTo(map);
             }
             return this._filteredLayers;
         };
@@ -22768,24 +22774,27 @@ var NgwLeaflet = (function () {
         };
         GeoJsonAdapter.prototype.clearLayer = function (cb) {
             this.unselect();
-            if (cb) {
-                for (var fry = this._layers.length; fry--;) {
-                    var def = this._layers[fry];
-                    if (def) {
-                        var feature = def.feature, layer = def.layer;
-                        if (feature && layer) {
-                            var exist = cb(feature);
-                            if (exist) {
-                                this.layer.removeLayer(layer);
-                                this._layers.splice(fry, 1);
+            var layer_ = this.layer;
+            if (layer_) {
+                if (cb) {
+                    for (var fry = this._layers.length; fry--;) {
+                        var def = this._layers[fry];
+                        if (def) {
+                            var feature = def.feature, layer = def.layer;
+                            if (feature && layer) {
+                                var exist = cb(feature);
+                                if (exist) {
+                                    layer_.removeLayer(layer);
+                                    this._layers.splice(fry, 1);
+                                }
                             }
                         }
                     }
                 }
-            }
-            else {
-                this.layer.clearLayers();
-                this._layers = [];
+                else {
+                    layer_.clearLayers();
+                    this._layers = [];
+                }
             }
         };
         GeoJsonAdapter.prototype.setData = function (data) {
@@ -22852,8 +22861,10 @@ var NgwLeaflet = (function () {
             return this.getBounds();
         };
         GeoJsonAdapter.prototype.getBounds = function () {
-            var bounds = this.layer.getBounds();
-            return boundsToArray(bounds);
+            if (this.layer) {
+                var bounds = this.layer.getBounds();
+                return boundsToArray(bounds);
+            }
         };
         GeoJsonAdapter.prototype.setOpacity = function (value) {
             this.options.opacity = value;
@@ -23085,40 +23096,47 @@ var NgwLeaflet = (function () {
                 lopt = this._createPaintOptions(paint, type);
             }
             lopt.onEachFeature = function (feature, layer) {
-                var def = __assign({ target: _this, feature: feature, layer: layer }, createFeaturePositionOptions(feature));
+                _this._onEachFeature(feature, layer);
+            };
+            return lopt;
+        };
+        GeoJsonAdapter.prototype._onEachFeature = function (feature, layer) {
+            var _this = this;
+            var layer_ = this.layer;
+            if (layer_) {
+                var def_1 = __assign({ target: this, feature: feature, layer: layer }, createFeaturePositionOptions(feature));
                 // @ts-ignore
-                layer.options.pane = _this.pane;
-                _this._layers.push(def);
+                layer.options.pane = this.pane;
+                this._layers.push(def_1);
                 var ok = true;
-                if (_this._filterFun) {
-                    ok = _this._filterFun(def);
+                if (this._filterFun) {
+                    ok = this._filterFun(def_1);
                 }
                 if (ok) {
-                    var _a = _this.options, popup = _a.popup, popupOptions = _a.popupOptions, selectable = _a.selectable, interactive = _a.interactive, selectOnHover = _a.selectOnHover;
+                    var _a = this.options, popup = _a.popup, popupOptions = _a.popupOptions, selectable = _a.selectable, interactive = _a.interactive, selectOnHover = _a.selectOnHover;
                     // @ts-ignore
                     layer.options.interactive = defined(interactive) ? interactive : true;
-                    _this.layer.addLayer(layer);
+                    layer_.addLayer(layer);
                     if (selectable) {
                         if (selectOnHover) {
                             layer.on('mouseover', function () {
-                                _this._selectLayer(def, 'hover');
+                                _this._selectLayer(def_1, 'hover');
                             });
                             layer.on('mouseout', function () {
-                                _this._unSelectLayer(def);
+                                _this._unSelectLayer(def_1);
                             });
                         }
                         else {
-                            layer.on('click', function (e) { return _this._selectOnLayerClick(e); }, _this);
+                            layer.on('click', function (e) { return _this._selectOnLayerClick(e); }, this);
                         }
                     }
-                    _this._handleMouseEvents(layer);
+                    this._handleMouseEvents(layer);
                     if (popup) {
-                        _this._openPopup(__assign({ target: _this, layer: layer, feature: feature }, createFeaturePositionOptions(feature)), popupOptions, 'api');
+                        this._openPopup(__assign({ target: this, layer: layer, feature: feature }, createFeaturePositionOptions(feature)), popupOptions, 'api');
                     }
-                    _this._updateTooltip({ layer: layer, feature: feature });
+                    this._updateTooltip({ layer: layer, feature: feature });
                 }
-            };
-            return lopt;
+            }
         };
         GeoJsonAdapter.prototype._handleMouseEvents = function (layer) {
             var _this = this;
@@ -23530,7 +23548,7 @@ var NgwLeaflet = (function () {
             if (url) {
                 options = __assign({ transparent: true }, options);
                 var updateWmsParamsFromOpt_1 = options.updateWmsParams;
-                this.layer = new ImageLayer(url, __assign(__assign({ pane: this.pane, headers: options.headers, setViewDelay: options.setViewDelay }, options), options.params));
+                this.layer = new ImageLayer(url, __assign(__assign(__assign({ pane: this.pane, headers: options.headers, setViewDelay: options.setViewDelay }, options), options.params), options.nativeOptions));
                 if (updateWmsParamsFromOpt_1) {
                     var updateWmsParams_1 = this.layer.updateWmsParams;
                     this.layer.updateWmsParams = function (map) {
@@ -23665,26 +23683,18 @@ var NgwLeaflet = (function () {
             return _super !== null && _super.apply(this, arguments) || this;
         }
         WmsAdapter.prototype.addLayer = function (options) {
-            if (options) {
-                var url = options.url, opt = __rest(options, ["url"]);
-                if (url) {
-                    var layerOptions = {
-                        pane: this.pane,
-                        attribution: opt.attribution,
-                        minZoom: opt.minZoom,
-                        maxZoom: opt.maxZoom,
-                        layers: options.layers,
-                        format: options.format,
-                    };
-                    var layer = void 0;
-                    if (opt.headers) {
-                        layer = new WmsLayer(url, __assign(__assign({}, layerOptions), { headers: opt.headers }));
-                    }
-                    else {
-                        layer = new leafletSrc.exports.TileLayer.WMS(url, layerOptions);
-                    }
-                    return layer;
+            Object.assign(this.options, options);
+            var url = options.url, opt = __rest(options, ["url"]);
+            if (url) {
+                var layerOptions = __assign({ pane: this.pane, attribution: opt.attribution, minZoom: opt.minZoom, maxZoom: opt.maxZoom, layers: options.layers, format: options.format }, options.nativeOptions);
+                var layer = void 0;
+                if (opt.headers) {
+                    layer = new WmsLayer(url, __assign(__assign({}, layerOptions), { headers: opt.headers }));
+                }
+                else {
+                    layer = new leafletSrc.exports.TileLayer.WMS(url, layerOptions);
                 }
+                return layer;
             }
         };
         return WmsAdapter;
@@ -23696,7 +23706,7 @@ var NgwLeaflet = (function () {
             return _super !== null && _super.apply(this, arguments) || this;
         }
         OsmAdapter.prototype.addLayer = function (options) {
-            var url = options.url || 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png';
+            var url = 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png';
             return _super.prototype.addLayer.call(this, __assign(__assign({ name: 'OpenStreetMap', attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors' }, options), { url: url }));
         };
         return OsmAdapter;