@nextgis/ngw-leaflet 1.13.6 → 1.14.0

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

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/ngw-leaflet; version: 1.13.6; author: NextGIS */
+/** Bundle of @nextgis/ngw-leaflet; version: 1.14.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.13.6; author: NextGIS */
+/** Bundle of @nextgis/ngw-leaflet; version: 1.14.0; author: NextGIS */
 var NgwLeaflet = (function () {
     'use strict';
 
@@ -15597,16 +15597,17 @@ var NgwLeaflet = (function () {
     function createPropertiesPaint(propertiesPaint) {
         var mask = {};
         var paintsFilters = [];
-        propertiesPaint.forEach(function (x) {
-            if (x) {
-                if (Array.isArray(x)) {
-                    paintsFilters.push(x);
+        for (var _i = 0, propertiesPaint_1 = propertiesPaint; _i < propertiesPaint_1.length; _i++) {
+            var p = propertiesPaint_1[_i];
+            if (p) {
+                if (Array.isArray(p)) {
+                    paintsFilters.push(p);
                 }
                 else {
-                    mask = x;
+                    mask = p;
                 }
             }
-        });
+        }
         return function (feature) {
             var paint = paintsFilters.find(function (x) { return featureFilter(feature, x[0]); });
             if (paint) {
@@ -15646,9 +15647,11 @@ var NgwLeaflet = (function () {
         else {
             var expressionCallback_1 = createExpressionCallback(paint);
             if (expressionCallback_1) {
-                return function (feature) {
+                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;
@@ -15952,7 +15955,7 @@ var NgwLeaflet = (function () {
     var ID$2 = 0;
     var OPTIONS$1 = {
         minZoom: 0,
-        maxZoom: 20,
+        maxZoom: 22,
         paint: {
             color: '#0000ff',
             opacity: 0.4,
@@ -19133,51 +19136,6 @@ var NgwLeaflet = (function () {
         return NgwConnector;
     }());
 
-    function createPopupContent(feature, item) {
-        // @ts-ignore
-        {
-            var element_1 = document.createElement('div');
-            if (item && item.feature_layer) {
-                item.feature_layer.fields.forEach(function (x) {
-                    if (x.grid_visibility) {
-                        var value = feature.properties && feature.properties[x.keyname];
-                        if (value) {
-                            var propElem = document.createElement('div');
-                            element_1.appendChild(propElem);
-                            propElem.innerHTML = "<span>".concat(x.display_name, "</span>: ").concat(value, "<span></span>");
-                        }
-                    }
-                });
-            }
-            else if (feature.properties) {
-                for (var p in feature.properties) {
-                    var propElem = document.createElement('div');
-                    element_1.appendChild(propElem);
-                    propElem.innerHTML = "<span>".concat(p, "</span>: ").concat(feature.properties[p], "<span></span>");
-                }
-            }
-            return element_1;
-        }
-    }
-
-    var filterOptionsKeys = [
-        'fields',
-        'intersects',
-        'limit',
-        'orderBy',
-        'strategy',
-    ];
-    function getLayerFilterOptions(options) {
-        var filterOptions = {};
-        filterOptionsKeys.forEach(function (x) {
-            var opt = options[x];
-            if (opt !== undefined) {
-                filterOptions[x] = opt;
-            }
-        });
-        return filterOptions;
-    }
-
     function getNgwWebmapExtent(webmap) {
         var bottom = webmap['extent_bottom'];
         var left = webmap['extent_left'];
@@ -19245,6 +19203,85 @@ var NgwLeaflet = (function () {
         }
     }
 
+    var NgwResource = /** @class */ (function () {
+        function NgwResource() {
+        }
+        /** @deprecated use {@link NgwResource.getBounds} instead */
+        NgwResource.prototype.getExtent = function () {
+            return __awaiter(this, void 0, void 0, function () {
+                return __generator(this, function (_a) {
+                    return [2 /*return*/, this.getBounds()];
+                });
+            });
+        };
+        NgwResource.prototype.getBounds = function (options) {
+            return __awaiter(this, void 0, void 0, function () {
+                var _a;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0:
+                            if (this._extent) {
+                                return [2 /*return*/, this._extent];
+                            }
+                            if (!this.item) return [3 /*break*/, 2];
+                            _a = this;
+                            return [4 /*yield*/, fetchNgwResourceExtent(this.item, this.connector, options)];
+                        case 1:
+                            _a._extent = _b.sent();
+                            return [2 /*return*/, this._extent];
+                        case 2: return [2 /*return*/];
+                    }
+                });
+            });
+        };
+        return NgwResource;
+    }());
+
+    function createPopupContent(feature, item) {
+        // @ts-ignore
+        {
+            var element_1 = document.createElement('div');
+            if (item && item.feature_layer) {
+                item.feature_layer.fields.forEach(function (x) {
+                    if (x.grid_visibility) {
+                        var value = feature.properties && feature.properties[x.keyname];
+                        if (value) {
+                            var propElem = document.createElement('div');
+                            element_1.appendChild(propElem);
+                            propElem.innerHTML = "<span>".concat(x.display_name, "</span>: ").concat(value, "<span></span>");
+                        }
+                    }
+                });
+            }
+            else if (feature.properties) {
+                for (var p in feature.properties) {
+                    var propElem = document.createElement('div');
+                    element_1.appendChild(propElem);
+                    propElem.innerHTML = "<span>".concat(p, "</span>: ").concat(feature.properties[p], "<span></span>");
+                }
+            }
+            return element_1;
+        }
+    }
+
+    var filterOptionsKeys = [
+        'fields',
+        'intersects',
+        'limit',
+        'orderBy',
+        'strategy',
+    ];
+    function getLayerFilterOptions(options) {
+        var filterOptions = {};
+        filterOptionsKeys.forEach(function (x) {
+            var opt = options[x];
+            if (opt !== undefined) {
+                filterOptions[x] = opt;
+            }
+        });
+        return filterOptions;
+    }
+
     function resourceIdFromLayerOptions(options, connector) {
         return __awaiter(this, void 0, void 0, function () {
             var resource, item, keyname, resourceId, resourceItem;
@@ -19882,6 +19919,7 @@ var NgwLeaflet = (function () {
         };
     }
     function ngwApiToAdapterOptions(_a) {
+        var _b;
         var options = _a.options, webMap = _a.webMap, baseUrl = _a.baseUrl;
         var adapter = options.adapter || 'IMAGE';
         var url;
@@ -19921,10 +19959,12 @@ var NgwLeaflet = (function () {
                         'resource=' +
                         resourceId +
                         '&simplification=' +
-                        (options.simplification || 0);
+                        ((_b = options.simplification) !== null && _b !== void 0 ? _b : 6);
                 // url = baseUrl + '/api/resource/' + options.resourceId + '/{z}/{x}/{y}.mvt';
                 return {
                     url: url,
+                    sourceLayer: 'ngw:' + resourceId,
+                    featureIdName: '$id',
                 };
             }
             if (adapter === 'TERRAIN') {
@@ -19987,7 +20027,6 @@ var NgwLeaflet = (function () {
                         return [2 /*return*/, /** @class */ (function (_super) {
                                 __extends(RasterAdapter, _super);
                                 function RasterAdapter(map, _options) {
-                                    var _a;
                                     var _this = _super.call(this, map, _options) || this;
                                     _this.map = map;
                                     // options = {};
@@ -19999,29 +20038,13 @@ var NgwLeaflet = (function () {
                                         baseUrl: connector.options.baseUrl || '',
                                     });
                                     if (opt) {
-                                        var layerAdapterOptions = __assign(__assign({}, opt), { setViewDelay: (_a = layerOptions.adapterOptions) === null || _a === void 0 ? void 0 : _a.setViewDelay, params: { resource: resourceId_1 }, 
-                                            // @deprecated
-                                            layers: String(resourceId_1), resourceId: resourceId_1 });
+                                        var layerAdapterOptions = __assign(__assign(__assign({}, opt), layerOptions.adapterOptions), { params: { resource: resourceId_1 }, layers: opt.layers || String(resourceId_1), resourceId: resourceId_1 });
                                         if (layerOptions.adapterOptions &&
                                             defined(layerOptions.adapterOptions.setViewDelay)) {
                                             layerAdapterOptions.setViewDelay =
                                                 layerOptions.adapterOptions.setViewDelay;
                                         }
                                         _this.options = __assign(__assign({}, _this.options), layerAdapterOptions);
-                                        // if (true) {
-                                        //   Object.defineProperty(this.options, 'layers', {
-                                        //     get: () => {
-                                        //       console.warn('Do not use `layers` in ImageAdapterOptions');
-                                        //       return String(resourceId);
-                                        //     },
-                                        //   });
-                                        //   Object.defineProperty(this.options, 'resourceId', {
-                                        //     get: () => {
-                                        //       console.warn('Do not use `resourceId` in ImageAdapterOptions');
-                                        //       return resourceId;
-                                        //     },
-                                        //   });
-                                        // }
                                     }
                                     return _this;
                                 }
@@ -20032,11 +20055,16 @@ var NgwLeaflet = (function () {
                                     return __awaiter(this, void 0, void 0, function () {
                                         var id;
                                         return __generator(this, function (_a) {
-                                            id = this.item && this.item.resource.parent.id;
-                                            if (defined(id)) {
-                                                return [2 /*return*/, [id]];
+                                            if (this.item) {
+                                                if (adapter === 'MVT') {
+                                                    return [2 /*return*/, [this.item.resource.id]];
+                                                }
+                                                id = this.item.resource.parent.id;
+                                                if (defined(id)) {
+                                                    return [2 /*return*/, [id]];
+                                                }
                                             }
-                                            return [2 /*return*/];
+                                            return [2 /*return*/, []];
                                         });
                                     });
                                 };
@@ -21442,40 +21470,6 @@ var NgwLeaflet = (function () {
         });
     }
 
-    var NgwResource = /** @class */ (function () {
-        function NgwResource() {
-        }
-        /** @deprecated use {@link NgwResource.getBounds} instead */
-        NgwResource.prototype.getExtent = function () {
-            return __awaiter(this, void 0, void 0, function () {
-                return __generator(this, function (_a) {
-                    return [2 /*return*/, this.getBounds()];
-                });
-            });
-        };
-        NgwResource.prototype.getBounds = function (options) {
-            return __awaiter(this, void 0, void 0, function () {
-                var _a;
-                return __generator(this, function (_b) {
-                    switch (_b.label) {
-                        case 0:
-                            if (this._extent) {
-                                return [2 /*return*/, this._extent];
-                            }
-                            if (!this.item) return [3 /*break*/, 2];
-                            _a = this;
-                            return [4 /*yield*/, fetchNgwResourceExtent(this.item, this.connector, options)];
-                        case 1:
-                            _a._extent = _b.sent();
-                            return [2 /*return*/, this._extent];
-                        case 2: return [2 /*return*/];
-                    }
-                });
-            });
-        };
-        return NgwResource;
-    }());
-
     var alias = {
         tms: 'TILE',
     };
@@ -21703,7 +21697,7 @@ var NgwLeaflet = (function () {
     }
     function createAsyncAdapter(options, webMap, connector) {
         return __awaiter(this, void 0, void 0, function () {
-            var adapter, item, adapterType, resourceId, resourceOptions, itemFromResOpt, cls, layerOptions, adapterOptions, parentItem, parentOptions, getClassAdapter, classAdapter;
+            var adapter, item, adapterType, resourceId, resourceOptions, itemFromResOpt, cls, layerOptions, adapterOptions, type, adapterOptions_, parentItem, parentOptions, getClassAdapter, classAdapter;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -21739,6 +21733,12 @@ var NgwLeaflet = (function () {
                         return [3 /*break*/, 11];
                     case 5:
                         if (!(cls === 'vector_layer')) return [3 /*break*/, 6];
+                        type = item.vector_layer &&
+                            vectorLayerGeomToPaintTypeAlias[item.vector_layer.geometry_type];
+                        adapterOptions_ = adapterOptions.layerOptions.adapterOptions || {};
+                        adapterOptions_.type = adapterOptions_.type || type;
+                        adapterOptions.layerOptions.adapterOptions = adapterOptions_;
+                        options.adapterOptions = adapterOptions;
                         if (adapterType !== undefined && adapterType !== 'GEOJSON') {
                             if (adapterType === 'MVT') {
                                 adapter = createRasterAdapter(adapterOptions);
@@ -22715,13 +22715,14 @@ var NgwLeaflet = (function () {
             var _this = this;
             if (!this.$$selectFromNgwRaster) {
                 this.$$selectFromNgwRaster = function (ev) {
-                    var count = _this.emitter.listenerCount('ngw:select');
+                    var count = _this._getSelectListenersCount();
                     if (count) {
                         _this._selectFromNgwRaster(ev);
                     }
                 };
                 this.$$selectFromNgwVector = function (ev) {
-                    if (_this.emitter.listenerCount('ngw:select')) {
+                    var count = _this._getSelectListenersCount();
+                    if (count) {
                         _this._selectFromNgwVector(ev);
                     }
                 };
@@ -22732,8 +22733,10 @@ var NgwLeaflet = (function () {
         NgwMap.prototype.disableSelection = function () {
             if (this.$$selectFromNgwRaster) {
                 this.emitter.removeListener('click', this.$$selectFromNgwRaster);
-                this.emitter.removeListener('click', this._selectFromNgwVector);
                 this.$$selectFromNgwRaster = undefined;
+            }
+            if (this.$$selectFromNgwVector) {
+                this.emitter.removeListener('layer:click', this.$$selectFromNgwVector);
                 this.$$selectFromNgwVector = undefined;
             }
         };
@@ -22889,7 +22892,11 @@ var NgwLeaflet = (function () {
         NgwMap.prototype._selectFromNgwVector = function (ev) {
             var _a;
             var layer = ev.layer;
-            // item property means layer is NgwResource
+            var selectable = layer.options.selectable && this.isLayerVisible(layer);
+            if (!selectable) {
+                return undefined;
+            }
+            // Item property means layer is NgwResource
             var id = layer.item && layer.item.resource.id;
             var feature = ev.feature;
             if (id !== undefined && feature) {
@@ -22919,10 +22926,10 @@ var NgwLeaflet = (function () {
         };
         NgwMap.prototype._selectFromNgwRaster = function (ev) {
             return __awaiter(this, void 0, void 0, function () {
-                var promises, layers, getIdsPromise, getIds, ids, pixelRadius, center, zoom, radius, selectPromise;
+                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 (_a) {
-                    switch (_a.label) {
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
                         case 0:
                             this._emitStatusEvent('ngw:preselect');
                             promises = [];
@@ -22933,25 +22940,27 @@ var NgwLeaflet = (function () {
                                 }
                                 return 1;
                             });
-                            layers.forEach(function (l) {
-                                var layer = l.layer;
-                                var identFunc = typeof layer.getIdentificationIds === 'function'
+                            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)) {
+                                if (identFunc && layer.options.selectable && this.isLayerVisible(layer)) {
                                     promises.push(identFunc.call(layer));
                                 }
-                            });
+                            }
                             getIdsPromise = Promise.all(promises);
                             return [4 /*yield*/, getIdsPromise];
                         case 1:
-                            getIds = _a.sent();
+                            getIds = _b.sent();
                             ids = [];
-                            getIds.forEach(function (x) {
+                            for (_a = 0, getIds_1 = getIds; _a < getIds_1.length; _a++) {
+                                x = getIds_1[_a];
                                 if (x) {
-                                    x.forEach(function (y) { return ids.push(y); });
+                                    ids.push.apply(ids, x);
                                 }
-                            });
+                            }
                             if (!ids.length) {
                                 this._emitStatusEvent('ngw:select', null);
                                 return [2 /*return*/];
@@ -22991,6 +23000,9 @@ var NgwLeaflet = (function () {
             };
             return __assign(__assign({}, identify), { getIdentifyItems: getIdentifyItems_ });
         };
+        NgwMap.prototype._getSelectListenersCount = function () {
+            return this.emitter.listenerCount('ngw:select');
+        };
         NgwMap.prototype._whiteLabel = function () {
             return __awaiter(this, void 0, void 0, function () {
                 var container, logo;
@@ -23978,7 +23990,6 @@ var NgwLeaflet = (function () {
                 opacity: 1,
                 isBack: false,
                 minZoom: 0,
-                maxZoom: 18,
                 pane: 'tilePane',
                 headers: null,
                 viewPortBuffer: 0,
@@ -24283,8 +24294,7 @@ var NgwLeaflet = (function () {
         }
         return WmsLayerBase;
     }(leafletSrc.exports.TileLayer.WMS));
-    var WmsLayer = makeRemote(WmsLayerBase);
-    // applyMixins(WmsLayer, [RemoteTileLayer]);
+    var WmsLayer = makeRemote(WmsLayerBase);
 
     var WmsAdapter = /** @class */ (function (_super) {
         __extends(WmsAdapter, _super);