@nextgis/ngw-leaflet 1.15.0 → 1.16.1

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

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/ngw-leaflet; version: 1.15.0; author: NextGIS */
+/** Bundle of @nextgis/ngw-leaflet; version: 1.16.1; author: NextGIS */
 /******************************************************************************
 Copyright (c) Microsoft Corporation.
 
@@ -15263,7 +15263,9 @@ function getBoundsFeature(b) {
 
 var d2r = Math.PI / 180; // degrees to radians
 var r2d = 180 / Math.PI; // radians to degrees
-function getCirclePolygonCoordinates(lng, lat, radius, points) {
+function getCirclePolygonCoordinates(lng, lat, 
+/** In kilometers */
+radius, points) {
     if (radius === void 0) { radius = 10; }
     if (points === void 0) { points = 6; }
     // find the radius in lat/lon
@@ -15313,6 +15315,14 @@ function isLngLatBoundsArray(array) {
         array.every(function (x) { return typeof x === 'number'; }));
 }
 
+function getIdentifyRadius(center, zoom, pixelRadius) {
+    pixelRadius = pixelRadius !== null && pixelRadius !== void 0 ? pixelRadius : 10;
+    var metresPerPixel = (40075016.686 * Math.abs(Math.cos((center[1] * 180) / Math.PI))) /
+        Math.pow(2, zoom + 8);
+    var radius = pixelRadius * metresPerPixel * 0.0005;
+    return radius;
+}
+
 /**
  * Copy the values of all of the enumerable own properties from one or more source objects to a
  * target object. Returns the target object.
@@ -15613,6 +15623,24 @@ function createPropertiesPaint(propertiesPaint) {
         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');
@@ -15642,20 +15670,7 @@ function preparePaint(paint, defaultPaint, getPaintFunctions) {
         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;
@@ -18717,6 +18732,9 @@ var NgwConnector = /** @class */ (function () {
             if (this.options.route) {
                 this.routeStr = this.options.route;
             }
+            if (this.options.requestTransform) {
+                this.requestTransform = this.options.requestTransform;
+            }
             this.resources = new ResourcesControl(this);
             addConnector(this);
         }
@@ -18724,6 +18742,9 @@ var NgwConnector = /** @class */ (function () {
     NgwConnector.create = function (options) {
         return new this(options);
     };
+    NgwConnector.prototype.setRequestTransform = function (requestTransform) {
+        this.requestTransform = requestTransform;
+    };
     /**
      * Fast way to specify the connection address to NextGIS Web.
      * The current connection will be severed.
@@ -18983,9 +19004,8 @@ var NgwConnector = /** @class */ (function () {
             if (params) {
                 url = template(url, params);
             }
-            // remove double slash
-            url = fixUrlStr(url);
-            return this._loadData(encodeURI(url), options);
+            url = encodeURI(fixUrlStr(url));
+            return this._loadData(url, options);
         }
         else {
             throw new Error('Empty `url` not allowed');
@@ -19078,6 +19098,11 @@ var NgwConnector = /** @class */ (function () {
                 // options.withCredentials = true;
                 options.headers = __assign(__assign({}, _this.getAuthorizationHeaders()), options.headers);
             }
+            if (_this.requestTransform) {
+                var _a = _this.requestTransform(url, options), transUrl = _a[0], transOptions = _a[1];
+                url = transUrl;
+                options = transOptions;
+            }
             loadData(url, resolve, options, reject, onCancel);
         })
             .then(function (resp) {
@@ -19102,6 +19127,7 @@ var NgwConnector = /** @class */ (function () {
             typeof options.signal.addEventListener === 'function') {
             options.signal.addEventListener('abort', function () {
                 request.cancel();
+                _this._cleanActiveRequests(request);
             });
         }
         this.activeRequests.push(request);
@@ -20692,10 +20718,12 @@ var NgwWebmapItem = /** @class */ (function (_super) {
         };
         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();
         }
@@ -20736,7 +20764,7 @@ var NgwWebmapItem = /** @class */ (function (_super) {
             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
@@ -20747,6 +20775,9 @@ var NgwWebmapItem = /** @class */ (function (_super) {
             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, {
@@ -20794,8 +20825,8 @@ var NgwWebmapItem = /** @class */ (function (_super) {
     };
     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;
@@ -21102,8 +21133,6 @@ var NgwWebmapLayerAdapter = /** @class */ (function () {
                             this._extent &&
                             extentConstrained) {
                             this.options.webMap.setView({ maxBounds: this._extent });
-                            // @ts-ignore
-                            window.webmap = this.options.webMap;
                         }
                         return [2 /*return*/, this.layer];
                 }
@@ -21276,6 +21305,7 @@ var NgwWebmapLayerAdapter = /** @class */ (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); });
                                 })];
@@ -21406,30 +21436,34 @@ var NgwWebmapLayerAdapter = /** @class */ (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; })];
@@ -22356,14 +22390,6 @@ function prepareWebMapOptions(options) {
     return options;
 }
 
-function getIdentifyRadius(center, zoom, pixelRadius) {
-    pixelRadius = pixelRadius !== null && pixelRadius !== void 0 ? pixelRadius : 10;
-    var metresPerPixel = (40075016.686 * Math.abs(Math.cos((center[1] * 180) / Math.PI))) /
-        Math.pow(2, zoom + 8);
-    var radius = pixelRadius * metresPerPixel * 0.0005;
-    return radius;
-}
-
 /**
  * Base class containing the logic of interaction WebMap with NextGIS services.
  *
@@ -22712,7 +22738,7 @@ var NgwMap = /** @class */ (function (_super) {
             this.$$selectFromNgwRaster = function (ev) {
                 var count = _this._getSelectListenersCount();
                 if (count) {
-                    _this._selectFromNgwRaster(ev);
+                    _this.selectFromNgwRaster(ev);
                 }
             };
             this.$$selectFromNgwVector = function (ev) {
@@ -22784,6 +22810,72 @@ var NgwMap = /** @class */ (function (_super) {
             }
         });
     };
+    NgwMap.prototype.selectFromNgwRaster = function (ev) {
+        return __awaiter(this, void 0, void 0, function () {
+            var promises, layers, _i, layers_1, l, layer, identFunc, getIdsPromise, getIds, ids, _a, getIds_1, x, pixelRadius, center, zoom, radius, selectPromise;
+            var _this = this;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        this._emitStatusEvent('ngw:preselect');
+                        promises = [];
+                        layers = Object.values(this._ngwLayers);
+                        layers.sort(function (a, b) {
+                            if (a.layer.order && b.layer.order) {
+                                return b.layer.order - a.layer.order;
+                            }
+                            return 1;
+                        });
+                        for (_i = 0, layers_1 = layers; _i < layers_1.length; _i++) {
+                            l = layers_1[_i];
+                            layer = l.layer;
+                            identFunc = typeof layer.getIdentificationIds === 'function'
+                                ? layer.getIdentificationIds
+                                : false;
+                            if (identFunc && layer.options.selectable && this.isLayerVisible(layer)) {
+                                promises.push(identFunc.call(layer));
+                            }
+                        }
+                        getIdsPromise = Promise.all(promises);
+                        return [4 /*yield*/, getIdsPromise];
+                    case 1:
+                        getIds = _b.sent();
+                        ids = [];
+                        for (_a = 0, getIds_1 = getIds; _a < getIds_1.length; _a++) {
+                            x = getIds_1[_a];
+                            if (x) {
+                                ids.push.apply(ids, x);
+                            }
+                        }
+                        if (!ids.length) {
+                            this._emitStatusEvent('ngw:select', null);
+                            return [2 /*return*/];
+                        }
+                        pixelRadius = this.options.pixelRadius || 10;
+                        center = this.getCenter();
+                        zoom = this.getZoom();
+                        zoom = zoom !== undefined ? zoom : 20;
+                        if (!center || !zoom) {
+                            this._emitStatusEvent('ngw:select', null);
+                            return [2 /*return*/];
+                        }
+                        radius = getIdentifyRadius(center, zoom, pixelRadius);
+                        selectPromise = sendIdentifyRequest(ev, {
+                            layers: ids,
+                            connector: this.connector,
+                            radius: radius,
+                        }).then(function (resp) {
+                            var identify = __assign(__assign({}, resp), { resources: ids, sourceType: 'raster', event: ev });
+                            var identifyEvent = _this._prepareToIdentify(identify);
+                            _this._emitStatusEvent('ngw:select', identify);
+                            return identifyEvent;
+                        });
+                        this._addPromise('select', selectPromise);
+                        return [2 /*return*/, selectPromise];
+                }
+            });
+        });
+    };
     NgwMap.prototype._addPromise = function (groupName, promise) {
         var group = this._promises[groupName];
         if (group && group.indexOf(promise) === -1) {
@@ -22919,70 +23011,6 @@ var NgwMap = /** @class */ (function (_super) {
             }
         }
     };
-    NgwMap.prototype._selectFromNgwRaster = function (ev) {
-        return __awaiter(this, void 0, void 0, function () {
-            var promises, layers, _i, layers_1, l, layer, identFunc, getIdsPromise, getIds, ids, _a, getIds_1, x, pixelRadius, center, zoom, radius, selectPromise;
-            var _this = this;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        this._emitStatusEvent('ngw:preselect');
-                        promises = [];
-                        layers = Object.values(this._ngwLayers);
-                        layers.sort(function (a, b) {
-                            if (a.layer.order && b.layer.order) {
-                                return b.layer.order - a.layer.order;
-                            }
-                            return 1;
-                        });
-                        for (_i = 0, layers_1 = layers; _i < layers_1.length; _i++) {
-                            l = layers_1[_i];
-                            layer = l.layer;
-                            identFunc = typeof layer.getIdentificationIds === 'function'
-                                ? layer.getIdentificationIds
-                                : false;
-                            if (identFunc && layer.options.selectable && this.isLayerVisible(layer)) {
-                                promises.push(identFunc.call(layer));
-                            }
-                        }
-                        getIdsPromise = Promise.all(promises);
-                        return [4 /*yield*/, getIdsPromise];
-                    case 1:
-                        getIds = _b.sent();
-                        ids = [];
-                        for (_a = 0, getIds_1 = getIds; _a < getIds_1.length; _a++) {
-                            x = getIds_1[_a];
-                            if (x) {
-                                ids.push.apply(ids, x);
-                            }
-                        }
-                        if (!ids.length) {
-                            this._emitStatusEvent('ngw:select', null);
-                            return [2 /*return*/];
-                        }
-                        pixelRadius = this.options.pixelRadius || 10;
-                        center = this.getCenter();
-                        zoom = this.getZoom();
-                        zoom = zoom !== undefined ? zoom : 20;
-                        if (!center || !zoom) {
-                            this._emitStatusEvent('ngw:select', null);
-                            return [2 /*return*/];
-                        }
-                        radius = getIdentifyRadius(center, zoom, pixelRadius);
-                        selectPromise = sendIdentifyRequest(ev, {
-                            layers: ids,
-                            connector: this.connector,
-                            radius: radius,
-                        }).then(function (resp) {
-                            _this._emitStatusEvent('ngw:select', _this._prepareToIdentify(__assign(__assign({}, resp), { resources: ids, sourceType: 'raster', event: ev })));
-                            return resp;
-                        });
-                        this._addPromise('select', selectPromise);
-                        return [2 /*return*/, selectPromise];
-                }
-            });
-        });
-    };
     NgwMap.prototype._prepareToIdentify = function (identify) {
         var _this = this;
         var getIdentifyItems_ = function () {
@@ -23295,12 +23323,13 @@ var GeoJsonAdapter = /** @class */ (function (_super) {
         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;
@@ -23713,13 +23742,13 @@ var GeoJsonAdapter = /** @class */ (function (_super) {
         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;
@@ -23729,10 +23758,10 @@ var GeoJsonAdapter = /** @class */ (function (_super) {
                 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 {
@@ -23799,10 +23828,12 @@ var GeoJsonAdapter = /** @class */ (function (_super) {
     };
     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);
@@ -23879,14 +23910,26 @@ var GeoJsonAdapter = /** @class */ (function (_super) {
         }
         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);
@@ -23894,9 +23937,9 @@ var GeoJsonAdapter = /** @class */ (function (_super) {
         }
     };
     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));