@nextgis/ngw-map 1.11.8 → 1.11.9

package/lib/ngw-map.cjs.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 */
 'use strict';
 
 Object.defineProperty(exports, '__esModule', { value: true });

package/lib/ngw-map.esm-browser.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 events = {exports: {}};
 
 var R = typeof Reflect === 'object' ? Reflect : null;
@@ -4688,7 +4688,19 @@ function updateItemRequestParam(params, options) {
 }
 // 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) {
+    const queries = getQueries(opt);
+    return CancelablePromise.all(queries).then((itemsParts) => {
+        const items = itemsParts.reduce((a, b) => a.concat(b), []);
+        const offset = opt.offset !== undefined ? opt.offset : 0;
+        const 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 = []) {
     const { filters } = opt;
     const logic = typeof filters[0] === 'string' ? filters[0] : 'all';
     const filters_ = filters.filter((x) => Array.isArray(x));
@@ -4708,7 +4720,7 @@ function createFeatureFieldFilterQueries(opt, _queries = [], _parentAllParams =
         return [`${isFldStr}${field_}__${operation}`, v];
     };
     if (logic === 'any') {
-        filters_.forEach((f) => {
+        for (const f of filters_) {
             if (isPropertyFilter(f)) {
                 _queries.push(fetchNgwLayerItemsRequest({
                     ...opt,
@@ -4716,12 +4728,12 @@ function createFeatureFieldFilterQueries(opt, _queries = [], _parentAllParams =
                 }));
             }
             else {
-                createFeatureFieldFilterQueries({
+                getQueries({
                     ...opt,
                     filters: f,
                 }, _queries, [..._parentAllParams]);
             }
-        });
+        }
     }
     else if (logic === 'all') {
         const filters = [];
@@ -4736,7 +4748,7 @@ function createFeatureFieldFilterQueries(opt, _queries = [], _parentAllParams =
         }
         if (propertiesFilterList.length) {
             for (const x of propertiesFilterList) {
-                createFeatureFieldFilterQueries({
+                getQueries({
                     ...opt,
                     filters: x,
                 }, _queries, [..._parentAllParams, ...filters]);
@@ -4749,15 +4761,7 @@ function createFeatureFieldFilterQueries(opt, _queries = [], _parentAllParams =
             }));
         }
     }
-    return CancelablePromise.all(_queries).then((itemsParts) => {
-        const items = itemsParts.reduce((a, b) => a.concat(b), []);
-        const offset = opt.offset !== undefined ? opt.offset : 0;
-        const 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) {
     const polygon = coord.map(([lng, lat]) => {
@@ -4839,7 +4843,7 @@ function fetchNgwLayerItems(options) {
             filters,
         }).then((data) => {
             // Additional client-side filter check
-            data.filter((y) => {
+            data = data.filter((y) => {
                 const fields = prepareNgwFieldsToPropertiesFilter({ ...y.fields });
                 const result = propertiesFilter(fields, filters);
                 return result;