@nextgis/leaflet-map-adapter 1.15.0 → 1.16.1

package/lib/leaflet-map-adapter.global.js

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/leaflet-map-adapter; version: 1.15.0; author: NextGIS */
+/** Bundle of @nextgis/leaflet-map-adapter; version: 1.16.1; author: NextGIS */
 var LeafletMapAdapter = (function () {
     'use strict';
 
@@ -14976,12 +14976,13 @@ var LeafletMapAdapter = (function () {
             this._removeMapListener();
         };
         GeoJsonAdapter.prototype.select = function (findFeatureFun) {
-            var _this = this;
+            this.unselect();
             if (findFeatureFun) {
                 var def = this._layers.filter(findFeatureFun);
-                def.forEach(function (x) {
-                    _this._selectLayer(x, 'api');
-                });
+                for (var _i = 0, def_1 = def; _i < def_1.length; _i++) {
+                    var x = def_1[_i];
+                    this._selectLayer(x, 'api');
+                }
             }
             else if (!this.selected) {
                 this.selected = true;
@@ -15394,13 +15395,13 @@ var LeafletMapAdapter = (function () {
             var _this = this;
             var layer_ = this.layer;
             if (layer_) {
-                var def_1 = __assign({ target: this, feature: feature, layer: layer }, createFeaturePositionOptions(feature));
+                var def_2 = __assign({ target: this, feature: feature, layer: layer }, createFeaturePositionOptions(feature));
                 // @ts-ignore
                 layer.options.pane = this.pane;
-                this._layers.push(def_1);
+                this._layers.push(def_2);
                 var ok = true;
                 if (this._filterFun) {
-                    ok = this._filterFun(def_1);
+                    ok = this._filterFun(def_2);
                 }
                 if (ok) {
                     var _a = this.options, popup_1 = _a.popup, popupOptions_1 = _a.popupOptions, selectable = _a.selectable, interactive = _a.interactive, selectOnHover = _a.selectOnHover;
@@ -15410,10 +15411,10 @@ var LeafletMapAdapter = (function () {
                     if (selectable) {
                         if (selectOnHover) {
                             layer.on('mouseover', function () {
-                                _this._selectLayer(def_1, 'hover');
+                                _this._selectLayer(def_2, 'hover');
                             });
                             layer.on('mouseout', function () {
-                                _this._unSelectLayer(def_1);
+                                _this._unSelectLayer(def_2);
                             });
                         }
                         else {
@@ -15480,10 +15481,12 @@ var LeafletMapAdapter = (function () {
         };
         GeoJsonAdapter.prototype._selectLayer = function (def, type, latlng) {
             var _this = this;
-            this.map._addUnselectCb(function () {
-                _this._unSelectLayer(def);
-            });
-            if (this.options && !this.options.multiselect) {
+            var multiselect = this.options.multiselect;
+            if (!multiselect) {
+                // To unselect layer on another layer click
+                this.map._addUnselectCb(function () {
+                    _this._unSelectLayer(def);
+                });
                 this._selectedLayers.forEach(function (x) { return _this._unSelectLayer(x); });
             }
             this._selectedLayers.push(def);
@@ -15560,14 +15563,26 @@ var LeafletMapAdapter = (function () {
             }
             return geoJsonOptions;
         };
-        GeoJsonAdapter.prototype._addMapListener = function () {
+        GeoJsonAdapter.prototype._addMapClickListener = function () {
             var map = this.map;
             if (map) {
-                var _a = this.options, labelField = _a.labelField, labelOnHover = _a.labelOnHover, unselectOnClick = _a.unselectOnClick;
+                var unselectOnClick = this.options.unselectOnClick;
                 var uoc = unselectOnClick !== null && unselectOnClick !== void 0 ? unselectOnClick : true;
                 if (uoc) {
                     map.on('click', this.$unselect);
                 }
+            }
+        };
+        GeoJsonAdapter.prototype._removeMapClickListener = function () {
+            this.map.off('zoomend', this.$updateTooltip);
+            this.map.off('moveend', this.$updateTooltip);
+            this.map.off('click', this.$unselect);
+        };
+        GeoJsonAdapter.prototype._addMapListener = function () {
+            var map = this.map;
+            if (map) {
+                var _a = this.options, labelField = _a.labelField, labelOnHover = _a.labelOnHover;
+                this._addMapClickListener();
                 if (labelField && !labelOnHover) {
                     map.on('zoomend', this.$updateTooltip);
                     map.on('moveend', this.$updateTooltip);
@@ -15575,9 +15590,9 @@ var LeafletMapAdapter = (function () {
             }
         };
         GeoJsonAdapter.prototype._removeMapListener = function () {
+            this._removeMapClickListener();
             this.map.off('zoomend', this.$updateTooltip);
             this.map.off('moveend', this.$updateTooltip);
-            this.map.off('click', this.$unselect);
         };
         return GeoJsonAdapter;
     }(BaseAdapter));