@nextgis/ngw-leaflet 1.15.1 → 1.16.0

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

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/ngw-leaflet; version: 1.15.1; author: NextGIS */
+/** Bundle of @nextgis/ngw-leaflet; version: 1.16.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.15.1; author: NextGIS */
+/** Bundle of @nextgis/ngw-leaflet; version: 1.16.0; author: NextGIS */
 var NgwLeaflet = (function () {
     'use strict';
 
@@ -15616,6 +15616,24 @@ var NgwLeaflet = (function () {
             return mask;
         };
     }
+    function expressionCallback(paint, defaultPaint, getPaintFunctions) {
+        var expressionCallback = createExpressionCallback(paint);
+        if (expressionCallback) {
+            var expressionPaintCb = function (feature) {
+                return preparePaint(expressionCallback(feature), defaultPaint, getPaintFunctions);
+            };
+            expressionPaintCb.paint = paint;
+            return expressionPaintCb;
+        }
+        var newPaint = __assign({}, defaultPaint);
+        newPaint = __assign(__assign({}, newPaint), paint);
+        newPaint.fill = newPaint.fill !== undefined ? newPaint.fill : true;
+        newPaint.stroke =
+            newPaint.stroke !== undefined
+                ? newPaint.stroke
+                : !newPaint.fill || !!(newPaint.strokeColor || newPaint.strokeOpacity);
+        return newPaint;
+    }
     function preparePaint(paint, defaultPaint, getPaintFunctions) {
         if (!paint) {
             throw new Error('paint is empty');
@@ -15645,20 +15663,7 @@ var NgwLeaflet = (function () {
             return paint;
         }
         else {
-            var expressionCallback_1 = createExpressionCallback(paint);
-            if (expressionCallback_1) {
-                var expressionPaintCb = function (feature) {
-                    return preparePaint(expressionCallback_1(feature), defaultPaint, getPaintFunctions);
-                };
-                expressionPaintCb.paint = paint;
-                return expressionPaintCb;
-            }
-            newPaint = __assign(__assign({}, newPaint), paint);
-            newPaint.fill = newPaint.fill !== undefined ? newPaint.fill : true;
-            newPaint.stroke =
-                newPaint.stroke !== undefined
-                    ? newPaint.stroke
-                    : !newPaint.fill || !!(newPaint.strokeColor || newPaint.strokeOpacity);
+            newPaint = expressionCallback(paint, defaultPaint, getPaintFunctions);
         }
         if (isPaintCallback(newPaint)) {
             return newPaint;
@@ -20706,10 +20711,12 @@ var NgwLeaflet = (function () {
             };
             if (item.item_type === 'group' || item.item_type === 'root') {
                 if (item.children && item.children.length) {
-                    this.getChildren(item).forEach(function (x) {
-                        var children = new NgwWebmapItem(_this.webMap, x, _this.options, _this.connector, _this);
-                        _this.tree.addChild(children);
-                    });
+                    var children = this.getChildren(item);
+                    for (var _i = 0, children_1 = children; _i < children_1.length; _i++) {
+                        var x = children_1[_i];
+                        var children_2 = new this.constructor(this.webMap, x, this.options, this.connector, this);
+                        this.tree.addChild(children_2);
+                    }
                 }
                 return Promise.resolve();
             }
@@ -20750,7 +20757,7 @@ var NgwLeaflet = (function () {
                 headers: this.options.headers,
                 crossOrigin: this.options.crossOrigin,
                 setViewDelay: this.options.setViewDelay,
-                params: { resource: this.item.resourceId },
+                params: { resource: this.item.resourceId, item: this.item },
             };
             if (this.options.order) {
                 var subOrder = this.options.drawOrderEnabled && 'draw_order_position' in item
@@ -20761,6 +20768,9 @@ var NgwLeaflet = (function () {
                 var subLevel = String(subOrder).padStart(4, '0');
                 options.order = Number((this.options.order | 0) + '.' + subLevel);
             }
+            if (this.options.popupOptions) {
+                options.popupOptions = this.options.popupOptions;
+            }
             if (item.item_type === 'layer') {
                 var _a = this._getZoomRange(item), maxZoom = _a.maxZoom, minZoom = _a.minZoom;
                 objectAssign(options, {
@@ -20808,8 +20818,8 @@ var NgwLeaflet = (function () {
         };
         NgwWebmapItem.prototype._sumUp = function (children, totalValue) {
             if (totalValue === void 0) { totalValue = 0; }
-            for (var _i = 0, children_1 = children; _i < children_1.length; _i++) {
-                var child = children_1[_i];
+            for (var _i = 0, children_3 = children; _i < children_3.length; _i++) {
+                var child = children_3[_i];
                 if (child.item_type === 'layer') {
                     totalValue += 1;
                     child.draw_order_position = child.draw_order_position || totalValue;
@@ -21116,8 +21126,6 @@ var NgwLeaflet = (function () {
                                 this._extent &&
                                 extentConstrained) {
                                 this.options.webMap.setView({ maxBounds: this._extent });
-                                // @ts-ignore
-                                window.webmap = this.options.webMap;
                             }
                             return [2 /*return*/, this.layer];
                     }
@@ -21290,6 +21298,7 @@ var NgwLeaflet = (function () {
                                         options.minZoom = _this.options.minZoom;
                                         options.maxZoom = _this.options.maxZoom;
                                         options.drawOrderEnabled = webmap_1.draw_order_enabled;
+                                        options.popupOptions = _this.options.popupOptions;
                                         var layer = new _this.NgwWebmapItem(_this.options.webMap, webmap_1.root_item, options, _this.options.connector);
                                         layer.emitter.on('init', function () { return resolve(layer); });
                                     })];
@@ -21420,30 +21429,34 @@ var NgwLeaflet = (function () {
         };
         NgwWebmapLayerAdapter.prototype._getWebMapIds = function () {
             return __awaiter(this, void 0, void 0, function () {
-                var webMapItem, layers, promises_1, ids;
-                var _this = this;
+                var webMapItem, layers, promises, _loop_2, this_2, _i, layers_1, x, ids;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
                             webMapItem = this.layer;
                             if (!(webMapItem && webMapItem.item.item_type === 'root')) return [3 /*break*/, 2];
                             layers = webMapItem.tree.getDescendants();
-                            promises_1 = [];
-                            layers.forEach(function (x) {
+                            promises = [];
+                            _loop_2 = function (x) {
                                 var item = x.item;
                                 if (item.item_type === 'layer') {
                                     var id = item.layer_style_id;
-                                    var promise = _this.options.connector.getResource(id).then(function (y) {
+                                    var promise = this_2.options.connector.getResource(id).then(function (y) {
                                         if (y) {
                                             var parentId = Number(y.resource.parent.id);
                                             item.parentId = parentId;
                                             return parentId;
                                         }
                                     });
-                                    promises_1.push(promise);
+                                    promises.push(promise);
                                 }
-                            });
-                            return [4 /*yield*/, Promise.all(promises_1)];
+                            };
+                            this_2 = this;
+                            for (_i = 0, layers_1 = layers; _i < layers_1.length; _i++) {
+                                x = layers_1[_i];
+                                _loop_2(x);
+                            }
+                            return [4 /*yield*/, Promise.all(promises)];
                         case 1:
                             ids = _a.sent();
                             return [2 /*return*/, ids.filter(function (x) { return x !== undefined; })];
@@ -23309,12 +23322,13 @@ var NgwLeaflet = (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;
@@ -23727,13 +23741,13 @@ var NgwLeaflet = (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;
@@ -23743,10 +23757,10 @@ var NgwLeaflet = (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 {
@@ -23813,10 +23827,12 @@ var NgwLeaflet = (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);
@@ -23893,14 +23909,26 @@ var NgwLeaflet = (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);
@@ -23908,9 +23936,9 @@ var NgwLeaflet = (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));