@nextgis/ngw-leaflet 1.11.9 → 1.12.1

package/lib/ngw-leaflet.global.js

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/ngw-leaflet; version: 1.11.9; author: NextGIS */
+/** Bundle of @nextgis/ngw-leaflet; version: 1.12.1; author: NextGIS */
 var NgwLeaflet = (function () {
     'use strict';
 
@@ -15399,6 +15399,9 @@ var NgwLeaflet = (function () {
 
     function isObject$1(val) {
         return Object.prototype.toString.call(val) === '[object Object]';
+    }
+    function isArray(val) {
+        return Object.prototype.toString.call(val) === '[object Array]';
     }
 
     function fixUrlStr(url) {
@@ -16462,6 +16465,9 @@ var NgwLeaflet = (function () {
                 'movestart',
                 'move',
                 'moveend',
+                'mousemove',
+                'mouseout',
+                'mouseover',
             ];
             if (opt && opt.include) {
                 events = events.filter(function (x) { return opt.include.includes(x); });
@@ -16772,6 +16778,9 @@ var NgwLeaflet = (function () {
                             _c.sent();
                             _c.label = 11;
                         case 11:
+                            if (options.onAdded) {
+                                options.onAdded(_adapter);
+                            }
                             this._emitLayerEvent('layer:add', layerId, _adapter);
                             return [2 /*return*/, _adapter];
                         case 12: return [2 /*return*/, Promise.reject('No adapter')];
@@ -16912,8 +16921,15 @@ var NgwLeaflet = (function () {
         WebMapLayers.prototype.addTileLayer = function (url, options) {
             return this.addLayer('TILE', __assign(__assign({}, options), { url: url }));
         };
-        /** Shortcut for {@link WebMapLayers.addLayer} to create TileLayer adapter */
-        WebMapLayers.prototype.addImageLayer = function (url, options) {
+        WebMapLayers.prototype.addImageLayer = function (urlOrOptions, options) {
+            var url;
+            if (typeof urlOrOptions === 'string') {
+                url = urlOrOptions;
+            }
+            else {
+                url = urlOrOptions.url;
+                options = urlOrOptions;
+            }
             return this.addLayer('IMAGE', __assign(__assign({}, options), { url: url }));
         };
         /**
@@ -18241,6 +18257,11 @@ var NgwLeaflet = (function () {
                     xhr.abort();
                 });
             }
+            if (options.signal) {
+                options.signal.addEventListener('abort', function () {
+                    xhr.abort();
+                });
+            }
             xhr.send(data);
         };
     }
@@ -18382,7 +18403,12 @@ var NgwLeaflet = (function () {
                 forCache.id = resource;
             }
             else if (isObject(resource)) {
-                forCache.id = resource.id;
+                if (resource.id !== undefined) {
+                    forCache.id = resource.id;
+                }
+                else if (resource.keyname) {
+                    forCache.keyname = resource.keyname;
+                }
             }
             var makeRequest = function () {
                 if (typeof resource === 'string') {
@@ -18484,20 +18510,35 @@ var NgwLeaflet = (function () {
         };
         ResourcesControl.prototype.getChildrenOf = function (resource, requestOptions) {
             var _this = this;
-            return this.getId(resource).then(function (parent) {
-                return _this.connector
-                    .get('resource.collection', __assign({ cache: true }, requestOptions), {
-                    parent: parent,
-                })
-                    .then(function (items) {
-                    for (var _i = 0, items_1 = items; _i < items_1.length; _i++) {
-                        var i = items_1[_i];
-                        _this.cache.add('resource.item', CancelablePromise.resolve(i), {
-                            id: i.resource.id,
-                        });
+            return this.getIdOrFail(resource).then(function (parent) {
+                return _this._getChildrenOf(parent, requestOptions);
+            });
+        };
+        ResourcesControl.prototype._getChildrenOf = function (parent, requestOptions, _items) {
+            var _this = this;
+            if (_items === void 0) { _items = []; }
+            return this.connector
+                .get('resource.collection', __assign({ cache: true }, requestOptions), {
+                parent: parent,
+            })
+                .then(function (items) {
+                var recursivePromises = [];
+                for (var _i = 0, items_1 = items; _i < items_1.length; _i++) {
+                    var item = items_1[_i];
+                    _this.cache.add('resource.item', CancelablePromise.resolve(item), {
+                        id: item.resource.id,
+                    });
+                    _items.push(item);
+                    if ((requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.recursive) && item.resource.children) {
+                        recursivePromises.push(_this._getChildrenOf(item.resource.id, requestOptions, _items));
                     }
-                    return items;
-                });
+                }
+                if (recursivePromises.length) {
+                    return CancelablePromise.all(recursivePromises).then(function () {
+                        return _items;
+                    });
+                }
+                return _items;
             });
         };
         ResourcesControl.prototype.update = function (resource, data) {
@@ -19228,10 +19269,10 @@ var NgwLeaflet = (function () {
     function createGeoJsonFeature(item) {
         var geometry = item.geom;
         var feature = {
+            geometry: geometry,
             id: item.id,
             type: 'Feature',
             properties: item.fields,
-            geometry: geometry,
         };
         return feature;
     }
@@ -19257,7 +19298,19 @@ var NgwLeaflet = (function () {
     function createFeatureFieldFilterQueries(opt) {
         var queries = getQueries(opt);
         return CancelablePromise.all(queries).then(function (itemsParts) {
-            var items = itemsParts.reduce(function (a, b) { return a.concat(b); }, []);
+            // this list of ids used for optimization
+            var ids = [];
+            var items = [];
+            for (var _i = 0, itemsParts_1 = itemsParts; _i < itemsParts_1.length; _i++) {
+                var part = itemsParts_1[_i];
+                for (var _a = 0, part_1 = part; _a < part_1.length; _a++) {
+                    var item = part_1[_a];
+                    if (!ids.includes(item.id)) {
+                        items.push(item);
+                        ids.push(item.id);
+                    }
+                }
+            }
             var offset = opt.offset !== undefined ? opt.offset : 0;
             var limit = opt.limit !== undefined ? opt.limit : items.length;
             if (opt.offset || opt.limit) {
@@ -19266,27 +19319,27 @@ var NgwLeaflet = (function () {
             return items;
         });
     }
+    function createParam(pf) {
+        var field = pf[0], operation = pf[1], value = pf[2];
+        var isFldStr = field !== 'id' ? 'fld_' : '';
+        var vStart = '';
+        var vEnd = '';
+        var field_ = String(field)
+            .trim()
+            .replace(/^(%?)(.+?)(%?)$/, function (m, a, b, c) {
+            vStart = a;
+            vEnd = c;
+            return b;
+        });
+        var v = vStart + value + vEnd;
+        return ["".concat(isFldStr).concat(field_, "__").concat(operation), v];
+    }
     function getQueries(opt, _queries, _parentAllParams) {
         if (_queries === void 0) { _queries = []; }
         if (_parentAllParams === void 0) { _parentAllParams = []; }
         var filters = opt.filters;
         var logic = typeof filters[0] === 'string' ? filters[0] : 'all';
         var filters_ = filters.filter(function (x) { return Array.isArray(x); });
-        var createParam = function (pf) {
-            var field = pf[0], operation = pf[1], value = pf[2];
-            var isFldStr = field !== 'id' ? 'fld_' : '';
-            var vStart = '';
-            var vEnd = '';
-            var field_ = String(field)
-                .trim()
-                .replace(/^(%?)(.+?)(%?)$/, function (m, a, b, c) {
-                vStart = a;
-                vEnd = c;
-                return b;
-            });
-            var v = vStart + value + vEnd;
-            return ["".concat(isFldStr).concat(field_, "__").concat(operation), v];
-        };
         if (logic === 'any') {
             for (var _i = 0, filters_1 = filters_; _i < filters_1.length; _i++) {
                 var f = filters_1[_i];
@@ -19332,7 +19385,7 @@ var NgwLeaflet = (function () {
     }
     function fetchNgwLayerItemsRequest(options) {
         var params = __assign({}, FEATURE_REQUEST_PARAMS);
-        var connector = options.connector, limit = options.limit, offset = options.offset, intersects = options.intersects, orderBy = options.orderBy, resourceId = options.resourceId, paramList = options.paramList;
+        var limit = options.limit, offset = options.offset, orderBy = options.orderBy, paramList = options.paramList, connector = options.connector, intersects = options.intersects, resourceId = options.resourceId;
         if (limit) {
             if (limit !== Number.POSITIVE_INFINITY) {
                 params.limit = limit;
@@ -19345,7 +19398,6 @@ var NgwLeaflet = (function () {
         if (offset) {
             params.offset = offset;
         }
-        // TODO: fix type for options
         updateItemRequestParam(params, options);
         if (orderBy) {
             params.order_by = orderBy.join(',');
@@ -19367,6 +19419,7 @@ var NgwLeaflet = (function () {
     }
 
     function prepareNgwFieldsToPropertiesFilter(fields) {
+        console.log(fields);
         var f;
         var _loop_1 = function () {
             var field = fields[f];
@@ -19386,6 +19439,9 @@ var NgwLeaflet = (function () {
                     fields[f] = new (Date.bind.apply(Date, __spreadArray([void 0], dt_1, false)))().toISOString();
                 }
             }
+            else if (f === 'id' && typeof field === 'string') {
+                fields[f] = field.split(',').map(Number);
+            }
         };
         for (f in fields) {
             _loop_1();
@@ -19397,18 +19453,37 @@ var NgwLeaflet = (function () {
         var filters = options.filters;
         if (filters) {
             return createFeatureFieldFilterQueries(__assign(__assign({}, options), { filters: filters })).then(function (data) {
+                var _a;
+                var clientFilterValidate = (_a = options.clientFilterValidate) !== null && _a !== void 0 ? _a : isFilterWithAnyCase(filters);
                 // Additional client-side filter check
-                data = data.filter(function (y) {
-                    var fields = prepareNgwFieldsToPropertiesFilter(__assign({}, y.fields));
-                    var result = propertiesFilter(fields, filters);
-                    return result;
-                });
+                if (clientFilterValidate) {
+                    data = data.filter(function (y) {
+                        var fields = prepareNgwFieldsToPropertiesFilter(__assign(__assign({}, y.fields), { id: y.id }));
+                        var result = propertiesFilter(fields, filters);
+                        return result;
+                    });
+                }
                 return data;
             });
         }
         else {
             return fetchNgwLayerItemsRequest(options);
         }
+    }
+    function isFilterWithAnyCase(filters) {
+        if (filters[0] === 'any') {
+            return true;
+        }
+        for (var i = 1; i < filters.length; i++) {
+            var p = filters[i];
+            if (isArray(p)) {
+                var deep = isFilterWithAnyCase(p);
+                if (deep) {
+                    return true;
+                }
+            }
+        }
+        return false;
     }
 
     function fetchNgwLayerFeatures(options) {
@@ -19761,6 +19836,26 @@ var NgwLeaflet = (function () {
         });
     }
 
+    function getImageAdapterOptions(_a) {
+        var resourceId = _a.resourceId, baseUrl = _a.baseUrl, nd = _a.nd, headers = _a.headers;
+        var url = baseUrl + '/api/component/render/image';
+        var params = { resource: resourceId };
+        if (nd) {
+            params.nd = nd;
+        }
+        return {
+            url: url,
+            resourceId: resourceId,
+            headers: headers,
+            params: params,
+            updateWmsParams: function (params_) {
+                if (nd) {
+                    params_.nd = nd;
+                }
+                return updateImageParams(params_, resourceId);
+            },
+        };
+    }
     function ngwApiToAdapterOptions(_a) {
         var options = _a.options, webMap = _a.webMap, baseUrl = _a.baseUrl;
         var adapter = options.adapter || 'IMAGE';
@@ -19772,16 +19867,12 @@ var NgwLeaflet = (function () {
         if (typeof resourceId === 'number') {
             if (adapter === 'IMAGE') {
                 if (isImageAllowed) {
-                    url = baseUrl + '/api/component/render/image';
-                    return {
-                        url: url,
+                    return getImageAdapterOptions({
                         resourceId: resourceId,
                         headers: options.headers,
-                        params: { resource: resourceId, nd: nd },
-                        updateWmsParams: function (params) {
-                            return updateImageParams(__assign({ nd: nd }, params), resourceId);
-                        },
-                    };
+                        nd: nd,
+                        baseUrl: baseUrl,
+                    });
                 }
                 else {
                     adapter = 'TILE';
@@ -21196,6 +21287,7 @@ var NgwLeaflet = (function () {
         NgwWebmapLayerAdapter.prototype._setBasemaps = function (baseWebmap) {
             var _this = this;
             var webMap = this.options.webMap;
+            // to avoid set many basemaps on init
             var enabledAlreadySet = false;
             var _loop_1 = function (x) {
                 createOnFirstShowNgwAdapter({
@@ -21204,9 +21296,11 @@ var NgwLeaflet = (function () {
                     item: x,
                     adapterOptions: { crossOrigin: this_1.options.crossOrigin },
                 }).then(function (adapter) {
-                    // to avoid set many basemaps on init
                     var visibility = enabledAlreadySet ? false : x.enabled;
-                    webMap
+                    if (x.enabled) {
+                        enabledAlreadySet = true;
+                    }
+                    return webMap
                         .addBaseLayer(adapter, {
                         id: WEBMAP_BASELAYER_ID_PREFIX + x.resource_id,
                         name: x.display_name,
@@ -21216,9 +21310,6 @@ var NgwLeaflet = (function () {
                         .then(function (l) {
                         l.id && _this._webmapBaselayersIds.push(l.id);
                     });
-                    if (x.enabled) {
-                        enabledAlreadySet = true;
-                    }
                 });
             };
             var this_1 = this;
@@ -21700,7 +21791,7 @@ var NgwLeaflet = (function () {
     function updateImageParams(params, resourceId) {
         var bbox = params.bbox, width = params.width, height = params.height, nd = params.nd;
         return {
-            resource: resourceId,
+            resource: Array.isArray(resourceId) ? resourceId.join(',') : resourceId,
             extent: bbox,
             size: width + ',' + height,
             timestamp: Date.now(),
@@ -21942,7 +22033,6 @@ var NgwLeaflet = (function () {
 
     function getIdentifyItems(identify, multiple) {
         if (multiple === void 0) { multiple = false; }
-        var params;
         var resources = [];
         var paramsList = [];
         for (var l in identify) {
@@ -21963,14 +22053,9 @@ var NgwLeaflet = (function () {
             if ('features' in identifyItem) {
                 var layerFeatures = identifyItem.features;
                 var resourceId = Number(l);
-                var feature = layerFeatures[0];
-                if (feature) {
-                    params = {
-                        featureId: feature.id,
-                        resourceId: resourceId,
-                        feature: feature,
-                    };
-                    paramsList.push(params);
+                var featureParams = createParamsFromFeatures(layerFeatures, resourceId, multiple);
+                if (featureParams.length) {
+                    paramsList.push.apply(paramsList, featureParams);
                     if (!multiple) {
                         break;
                     }
@@ -21979,6 +22064,22 @@ var NgwLeaflet = (function () {
         }
         return paramsList;
     }
+    function createParamsFromFeatures(features, resourceId, multiple) {
+        var featureParams = [];
+        for (var _i = 0, features_1 = features; _i < features_1.length; _i++) {
+            var feature = features_1[_i];
+            var params = {
+                featureId: feature.id,
+                resourceId: resourceId,
+                feature: feature,
+            };
+            featureParams.push(params);
+            if (!multiple) {
+                break;
+            }
+        }
+        return featureParams;
+    }
     function fetchIdentifyGeoJson(options) {
         var connector = options.connector, identify = options.identify;
         for (var l in identify) {
@@ -22008,38 +22109,45 @@ var NgwLeaflet = (function () {
         }
         return CancelablePromise.resolve(undefined);
     }
-    function sendIdentifyRequest(ev, options) {
-        deprecatedMapClick(ev);
-        var _a = ev.lngLat, lng = _a[0], lat = _a[1];
+    function featureLayerIdentify(options) {
+        var g = options.geom;
         var geom = [];
-        if (options.geom) {
-            var polygon_1 = options.geom.type === 'Feature'
-                ? options.geom.geometry
-                : options.geom.type === 'Polygon'
-                    ? options.geom
-                    : false;
-            if (polygon_1) {
-                geom = polygon_1.coordinates[0];
+        if (Array.isArray(g)) {
+            geom = g;
+        }
+        else {
+            var polygon = g.type === 'Feature' ? g.geometry : g.type === 'Polygon' ? g : false;
+            if (polygon) {
+                geom = polygon.coordinates[0];
             }
         }
-        if (!geom.length) {
-            geom = getCirclePolygonCoordinates(lng, lat, options.radius);
+        if (geom) {
+            // create wkt string
+            var polygonStr = [];
+            for (var _i = 0, geom_1 = geom; _i < geom_1.length; _i++) {
+                var _a = geom_1[_i], lng = _a[0], lat = _a[1];
+                var _b = degrees2meters(lng, lat), x = _b[0], y = _b[1];
+                polygonStr.push(x + ' ' + y);
+            }
+            var wkt = "POLYGON((".concat(polygonStr.join(', '), "))");
+            var layers = options.layers;
+            var data = {
+                geom: wkt,
+                srs: 3857,
+                layers: layers,
+            };
+            return options.connector.post('feature_layer.identify', { data: data });
         }
-        // create wkt string
-        var polygon = [];
-        geom.forEach(function (_a) {
-            var lng = _a[0], lat = _a[1];
-            var _b = degrees2meters(lng, lat), x = _b[0], y = _b[1];
-            polygon.push(x + ' ' + y);
-        });
-        var wkt = "POLYGON((".concat(polygon.join(', '), "))");
-        var layers = options.layers;
-        var data = {
-            geom: wkt,
-            srs: 3857,
-            layers: layers,
-        };
-        return options.connector.post('feature_layer.identify', { data: data });
+        else {
+            throw new Error('Not valid geometry format to make intersection');
+        }
+    }
+    function sendIdentifyRequest(ev, options) {
+        var _a;
+        deprecatedMapClick(ev);
+        var _b = ev.lngLat, lng = _b[0], lat = _b[1];
+        var geom = (_a = options.geom) !== null && _a !== void 0 ? _a : getCirclePolygonCoordinates(lng, lat, options.radius);
+        return featureLayerIdentify(__assign(__assign({}, options), { geom: geom }));
     }
     function createIdentifyItem(opt) {
         return new IdentifyItem(opt);
@@ -22925,6 +23033,9 @@ var NgwLeaflet = (function () {
         link.title = title;
         link.setAttribute('role', 'button');
         link.setAttribute('aria-label', title);
+        if (options.addClass) {
+            link.classList.add(options.addClass);
+        }
         leafletSrc.exports.DomEvent.disableClickPropagation(link);
         leafletSrc.exports.DomEvent.on(link, 'click', leafletSrc.exports.DomEvent.stop);
         if (options.html instanceof HTMLElement) {
@@ -24196,11 +24307,16 @@ var NgwLeaflet = (function () {
             this._universalEvents = [
                 'move',
                 'zoom',
-                'moveend',
                 'zoomend',
                 'zoomstart',
+                'moveend',
                 'movestart',
             ];
+            this._positionEvents = [
+                'mousemove',
+                'mouseout',
+                'mouseover',
+            ];
         }
         LeafletMapAdapter.prototype.create = function (options) {
             var _this = this;
@@ -24453,9 +24569,22 @@ var NgwLeaflet = (function () {
                 map.on('click', function (evt) {
                     _this.onMapClick(evt);
                 });
-                this._universalEvents.forEach(function (e) {
+                var _loop_1 = function (e) {
                     map.on(e, function () { return _this.emitter.emit(e, _this); }, map);
-                });
+                };
+                for (var _i = 0, _a = this._universalEvents; _i < _a.length; _i++) {
+                    var e = _a[_i];
+                    _loop_1(e);
+                }
+                var _loop_2 = function (e) {
+                    map.on(e, function (evt) {
+                        return _this.emitter.emit(e, convertMapClickEvent(evt));
+                    }, map);
+                };
+                for (var _b = 0, _c = this._positionEvents; _b < _c.length; _b++) {
+                    var e = _c[_b];
+                    _loop_2(e);
+                }
             }
         };
         LeafletMapAdapter.layerAdapters = {