@nextgis/ngw-map 1.11.8 → 1.11.9

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

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

package/lib/ngw-map.global.js

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/ngw-map; version: 1.11.8; author: NextGIS */
+/** Bundle of @nextgis/ngw-map; version: 1.11.9; author: NextGIS */
 var NgwMap = (function (exports) {
     'use strict';
 
@@ -5193,7 +5193,19 @@ var NgwMap = (function (exports) {
     }
     // NGW REST API is not able to filtering by combined queries
     // therefore the filter is divided into several requests
-    function createFeatureFieldFilterQueries(opt, _queries, _parentAllParams) {
+    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); }, []);
+            var offset = opt.offset !== undefined ? opt.offset : 0;
+            var limit = opt.limit !== undefined ? opt.limit : items.length;
+            if (opt.offset || opt.limit) {
+                return items.splice(offset, limit);
+            }
+            return items;
+        });
+    }
+    function getQueries(opt, _queries, _parentAllParams) {
         if (_queries === void 0) { _queries = []; }
         if (_parentAllParams === void 0) { _parentAllParams = []; }
         var filters = opt.filters;
@@ -5215,46 +5227,39 @@ var NgwMap = (function (exports) {
             return ["".concat(isFldStr).concat(field_, "__").concat(operation), v];
         };
         if (logic === 'any') {
-            filters_.forEach(function (f) {
+            for (var _i = 0, filters_1 = filters_; _i < filters_1.length; _i++) {
+                var f = filters_1[_i];
                 if (isPropertyFilter(f)) {
                     _queries.push(fetchNgwLayerItemsRequest(__assign(__assign({}, opt), { paramList: __spreadArray(__spreadArray([], _parentAllParams, true), [createParam(f)], false) })));
                 }
                 else {
-                    createFeatureFieldFilterQueries(__assign(__assign({}, opt), { filters: f }), _queries, __spreadArray([], _parentAllParams, true));
+                    getQueries(__assign(__assign({}, opt), { filters: f }), _queries, __spreadArray([], _parentAllParams, true));
                 }
-            });
+            }
         }
         else if (logic === 'all') {
-            var filters_2 = [];
+            var filters_3 = [];
             var propertiesFilterList = [];
-            for (var _i = 0, filters_1 = filters_; _i < filters_1.length; _i++) {
-                var f = filters_1[_i];
+            for (var _a = 0, filters_2 = filters_; _a < filters_2.length; _a++) {
+                var f = filters_2[_a];
                 if (isPropertyFilter(f)) {
-                    filters_2.push(createParam(f));
+                    filters_3.push(createParam(f));
                 }
                 else {
                     propertiesFilterList.push(f);
                 }
             }
             if (propertiesFilterList.length) {
-                for (var _a = 0, propertiesFilterList_1 = propertiesFilterList; _a < propertiesFilterList_1.length; _a++) {
-                    var x = propertiesFilterList_1[_a];
-                    createFeatureFieldFilterQueries(__assign(__assign({}, opt), { filters: x }), _queries, __spreadArray(__spreadArray([], _parentAllParams, true), filters_2, true));
+                for (var _b = 0, propertiesFilterList_1 = propertiesFilterList; _b < propertiesFilterList_1.length; _b++) {
+                    var x = propertiesFilterList_1[_b];
+                    getQueries(__assign(__assign({}, opt), { filters: x }), _queries, __spreadArray(__spreadArray([], _parentAllParams, true), filters_3, true));
                 }
             }
             else {
-                _queries.push(fetchNgwLayerItemsRequest(__assign(__assign({}, opt), { paramList: __spreadArray(__spreadArray([], _parentAllParams, true), filters_2, true) })));
+                _queries.push(fetchNgwLayerItemsRequest(__assign(__assign({}, opt), { paramList: __spreadArray(__spreadArray([], _parentAllParams, true), filters_3, true) })));
             }
         }
-        return CancelablePromise.all(_queries).then(function (itemsParts) {
-            var items = itemsParts.reduce(function (a, b) { return a.concat(b); }, []);
-            var offset = opt.offset !== undefined ? opt.offset : 0;
-            var limit = opt.limit !== undefined ? opt.limit : items.length;
-            if (opt.offset || opt.limit) {
-                return items.splice(offset, limit);
-            }
-            return items;
-        });
+        return _queries;
     }
     function createWktFromCoordArray(coord) {
         var polygon = coord.map(function (_a) {
@@ -5332,7 +5337,7 @@ var NgwMap = (function (exports) {
         if (filters) {
             return createFeatureFieldFilterQueries(__assign(__assign({}, options), { filters: filters })).then(function (data) {
                 // Additional client-side filter check
-                data.filter(function (y) {
+                data = data.filter(function (y) {
                     var fields = prepareNgwFieldsToPropertiesFilter(__assign({}, y.fields));
                     var result = propertiesFilter(fields, filters);
                     return result;