@nextgis/ngw-leaflet 1.12.0 → 1.13.2

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

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/ngw-leaflet; version: 1.12.0; author: NextGIS */
+/** Bundle of @nextgis/ngw-leaflet; version: 1.13.2; 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.12.0; author: NextGIS */
+/** Bundle of @nextgis/ngw-leaflet; version: 1.13.2; 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); });
@@ -18113,31 +18119,31 @@ var NgwLeaflet = (function () {
     /**
      * Thrown when...
      */
-    var NgwError = /** @class */ (function (_super) {
-        __extends(NgwError, _super);
-        function NgwError(er) {
+    var NetworkError = /** @class */ (function (_super) {
+        __extends(NetworkError, _super);
+        function NetworkError(url) {
             var _this = _super.call(this) || this;
-            _this.name = 'NgwError';
-            Object.assign(_this, er);
-            Object.setPrototypeOf(_this, NgwError.prototype);
+            _this.name = 'NetworkError';
+            Object.setPrototypeOf(_this, NetworkError.prototype);
+            _this.message = "Unable to request ".concat(url, ".\n    Possibly invalid NGW URL entered or CORS not configured to get request from ").concat(location.origin); // /control-panel/cors
             return _this;
         }
-        return NgwError;
+        return NetworkError;
     }(Error));
 
     /**
      * Thrown when...
      */
-    var NetworkError = /** @class */ (function (_super) {
-        __extends(NetworkError, _super);
-        function NetworkError(url) {
+    var NgwError = /** @class */ (function (_super) {
+        __extends(NgwError, _super);
+        function NgwError(er) {
             var _this = _super.call(this) || this;
-            _this.name = 'NetworkError';
-            Object.setPrototypeOf(_this, NetworkError.prototype);
-            _this.message = "Unable to request ".concat(url, ".\n    Possibly invalid NGW URL entered or CORS not configured to get request from ").concat(location.origin); // /control-panel/cors
+            _this.name = 'NgwError';
+            Object.assign(_this, er);
+            Object.setPrototypeOf(_this, NgwError.prototype);
             return _this;
         }
-        return NetworkError;
+        return NgwError;
     }(Error));
 
     function isObject(val) {
@@ -18392,7 +18398,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') {
@@ -18494,20 +18505,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) {
@@ -19032,7 +19058,7 @@ var NgwLeaflet = (function () {
         NgwConnector.prototype._loadData = function (url, options) {
             var _this = this;
             options.responseType = options.responseType || 'json';
-            return new CancelablePromise(function (resolve, reject, onCancel) {
+            var request = new CancelablePromise(function (resolve, reject, onCancel) {
                 if (_this.user) {
                     options = options || {};
                     // options.withCredentials = true;
@@ -19052,6 +19078,13 @@ var NgwLeaflet = (function () {
                     }
                 }
             });
+            if (options.signal &&
+                typeof options.signal.addEventListener === 'function') {
+                options.signal.addEventListener('abort', function () {
+                    request.cancel();
+                });
+            }
+            return request;
         };
         NgwConnector.prototype._handleHttpError = function (er) {
             if (er) {
@@ -19161,12 +19194,12 @@ var NgwLeaflet = (function () {
     function fetchNgwExtent(options) {
         return options.connector.getResource(options.resourceId).then(function (resource) {
             if (resource) {
-                return fetchNgwResourceExtent(resource, options.connector);
+                return fetchNgwResourceExtent(resource, options.connector, options);
             }
         });
     }
     /** @deprecated use {@link fetchNgwExtent} instead */
-    function fetchNgwResourceExtent(item, connector) {
+    function fetchNgwResourceExtent(item, connector, options) {
         if (item.webmap) {
             return CancelablePromise.resolve(getNgwWebmapExtent(item.webmap));
         }
@@ -19175,15 +19208,12 @@ var NgwLeaflet = (function () {
             if (resource.cls && resource.cls.indexOf('style') !== -1) {
                 return connector.getResource(resource.parent.id).then(function (res) {
                     if (res) {
-                        return fetchNgwLayerExtent({
-                            resourceId: res.resource.id,
-                            connector: connector,
-                        });
+                        return fetchNgwLayerExtent(__assign(__assign({}, options), { resourceId: res.resource.id, connector: connector }));
                     }
                 });
             }
             else {
-                return fetchNgwLayerExtent({ resourceId: resource.id, connector: connector });
+                return fetchNgwLayerExtent(__assign(__assign({}, options), { resourceId: resource.id, connector: connector }));
             }
         }
     }
@@ -19354,7 +19384,7 @@ var NgwLeaflet = (function () {
     }
     function fetchNgwLayerItemsRequest(options) {
         var params = __assign({}, FEATURE_REQUEST_PARAMS);
-        var limit = options.limit, offset = options.offset, orderBy = options.orderBy, paramList = options.paramList, connector = options.connector, intersects = options.intersects, resourceId = options.resourceId;
+        var limit = options.limit, cache = options.cache, signal = options.signal, 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;
@@ -19384,7 +19414,7 @@ var NgwLeaflet = (function () {
             params.paramList = paramList;
         }
         var reqParams = __assign({ id: resourceId }, params);
-        return connector.get('feature_layer.feature.collection', { cache: options.cache }, reqParams);
+        return connector.get('feature_layer.feature.collection', { cache: cache, signal: signal }, reqParams);
     }
 
     function prepareNgwFieldsToPropertiesFilter(fields) {
@@ -19407,6 +19437,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();
@@ -19419,7 +19452,7 @@ var NgwLeaflet = (function () {
         if (filters) {
             return createFeatureFieldFilterQueries(__assign(__assign({}, options), { filters: filters })).then(function (data) {
                 var _a;
-                var clientFilterValidate = (_a = options.clientFilterValidate) !== null && _a !== void 0 ? _a : true;
+                var clientFilterValidate = (_a = options.clientFilterValidate) !== null && _a !== void 0 ? _a : isFilterWithAnyCase(filters);
                 // Additional client-side filter check
                 if (clientFilterValidate) {
                     data = data.filter(function (y) {
@@ -19434,6 +19467,21 @@ var NgwLeaflet = (function () {
         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) {
@@ -21378,7 +21426,7 @@ var NgwLeaflet = (function () {
                 });
             });
         };
-        NgwResource.prototype.getBounds = function () {
+        NgwResource.prototype.getBounds = function (options) {
             return __awaiter(this, void 0, void 0, function () {
                 var _a;
                 return __generator(this, function (_b) {
@@ -21389,7 +21437,7 @@ var NgwLeaflet = (function () {
                             }
                             if (!this.item) return [3 /*break*/, 2];
                             _a = this;
-                            return [4 /*yield*/, fetchNgwResourceExtent(this.item, this.connector)];
+                            return [4 /*yield*/, fetchNgwResourceExtent(this.item, this.connector, options)];
                         case 1:
                             _a._extent = _b.sent();
                             return [2 /*return*/, this._extent];
@@ -21983,7 +22031,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) {
@@ -22004,14 +22051,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;
                     }
@@ -22020,8 +22062,24 @@ 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;
+        var connector = options.connector, identify = options.identify, requestOptions = options.requestOptions;
         for (var l in identify) {
             var id = Number(l);
             if (!isNaN(id)) {
@@ -22037,7 +22095,7 @@ var NgwLeaflet = (function () {
         }
         var params = getIdentifyItems(identify);
         if (params && params.length) {
-            return fetchNgwLayerFeature(__assign({ connector: connector }, params[0]));
+            return fetchNgwLayerFeature(__assign(__assign(__assign({}, requestOptions), { connector: connector }), params[0]));
         }
         return CancelablePromise.resolve(undefined);
     }
@@ -22050,21 +22108,25 @@ var NgwLeaflet = (function () {
         return CancelablePromise.resolve(undefined);
     }
     function featureLayerIdentify(options) {
-        var g = options.geom;
-        var geom = [];
-        if (Array.isArray(g)) {
-            geom = g;
+        var geom = options.geom, signal = options.signal, cache = options.cache;
+        var geom_ = [];
+        if (Array.isArray(geom)) {
+            geom_ = geom;
         }
         else {
-            var polygon = g.type === 'Feature' ? g.geometry : g.type === 'Polygon' ? g : false;
+            var polygon = geom.type === 'Feature'
+                ? geom.geometry
+                : geom.type === 'Polygon'
+                    ? geom
+                    : false;
             if (polygon) {
-                geom = polygon.coordinates[0];
+                geom_ = polygon.coordinates[0];
             }
         }
-        if (geom) {
+        if (geom_) {
             // create wkt string
             var polygonStr = [];
-            for (var _i = 0, geom_1 = geom; _i < geom_1.length; _i++) {
+            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);
@@ -22076,18 +22138,22 @@ var NgwLeaflet = (function () {
                 srs: 3857,
                 layers: layers,
             };
-            return options.connector.post('feature_layer.identify', { data: data });
+            return options.connector.post('feature_layer.identify', {
+                data: data,
+                signal: signal,
+                cache: cache,
+            });
         }
         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 }));
+        var _a = ev.lngLat, lng = _a[0], lat = _a[1];
+        var geom = options.geom, radius = options.radius, signal = options.signal, cache = options.cache;
+        var geom_ = geom !== null && geom !== void 0 ? geom : getCirclePolygonCoordinates(lng, lat, radius);
+        return featureLayerIdentify(__assign(__assign({}, options), { geom: geom_, signal: signal, cache: cache }));
     }
     function createIdentifyItem(opt) {
         return new IdentifyItem(opt);
@@ -24247,18 +24313,25 @@ 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;
             this.options = __assign({}, options);
             if (this.options.target) {
                 var _a = this.options, zoom = _a.zoom, center = _a.center, maxZoom = _a.maxZoom, minZoom = _a.minZoom, mb = _a.maxBounds, mapAdapterOptions = _a.mapAdapterOptions;
-                this.map = new leafletSrc.exports.Map(this.options.target, __assign({ attributionControl: false, zoomControl: false, maxBounds: mb ? arrayToBoundsExpression(mb) : undefined, maxZoom: maxZoom, minZoom: minZoom, center: center && [center[1], center[0]], zoom: zoom }, mapAdapterOptions));
+                this.map =
+                    this.options.map ||
+                        new leafletSrc.exports.Map(this.options.target, __assign({ attributionControl: false, zoomControl: false, maxBounds: mb ? arrayToBoundsExpression(mb) : undefined, maxZoom: maxZoom, minZoom: minZoom, center: center && [center[1], center[0]], zoom: zoom }, mapAdapterOptions));
                 // create default pane
                 var defPane = this.map.createPane('order-0');
                 this.map._addUnselectCb = function (def) {
@@ -24504,9 +24577,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 = {