@nextgis/ngw-map 1.12.0 → 1.12.1

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

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/ngw-map; version: 1.12.0; author: NextGIS */
+/** Bundle of @nextgis/ngw-map; version: 1.12.1; author: NextGIS */
 import { EventEmitter } from 'events';
 import CancelablePromise from '@nextgis/cancelable-promise';
 import { deepmerge, isObject, defined, deprecatedWarn } from '@nextgis/utils';

package/lib/ngw-map.global.js

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/ngw-map; version: 1.12.0; author: NextGIS */
+/** Bundle of @nextgis/ngw-map; version: 1.12.1; author: NextGIS */
 var NgwMap = (function (exports) {
     'use strict';
 
@@ -1308,6 +1308,9 @@ var NgwMap = (function (exports) {
 
     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) {
@@ -2371,6 +2374,9 @@ var NgwMap = (function (exports) {
                 'movestart',
                 'move',
                 'moveend',
+                'mousemove',
+                'mouseout',
+                'mouseover',
             ];
             if (opt && opt.include) {
                 events = events.filter(function (x) { return opt.include.includes(x); });
@@ -4178,6 +4184,11 @@ var NgwMap = (function (exports) {
                     xhr.abort();
                 });
             }
+            if (options.signal) {
+                options.signal.addEventListener('abort', function () {
+                    xhr.abort();
+                });
+            }
             xhr.send(data);
         };
     }
@@ -4319,7 +4330,12 @@ var NgwMap = (function (exports) {
                 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') {
@@ -4421,20 +4437,35 @@ var NgwMap = (function (exports) {
         };
         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) {
@@ -5327,6 +5358,7 @@ var NgwMap = (function (exports) {
     }
 
     function prepareNgwFieldsToPropertiesFilter(fields) {
+        console.log(fields);
         var f;
         var _loop_1 = function () {
             var field = fields[f];
@@ -5346,6 +5378,9 @@ var NgwMap = (function (exports) {
                     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();
@@ -5358,7 +5393,7 @@ var NgwMap = (function (exports) {
         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) {
@@ -5373,6 +5408,21 @@ var NgwMap = (function (exports) {
         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) {
@@ -7922,7 +7972,6 @@ var NgwMap = (function (exports) {
 
     function getIdentifyItems(identify, multiple) {
         if (multiple === void 0) { multiple = false; }
-        var params;
         var resources = [];
         var paramsList = [];
         for (var l in identify) {
@@ -7943,14 +7992,9 @@ var NgwMap = (function (exports) {
             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;
                     }
@@ -7959,6 +8003,22 @@ var NgwMap = (function (exports) {
         }
         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) {