@nextgis/ngw-leaflet 1.11.3 → 1.11.10

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

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/ngw-leaflet; version: 1.11.3; author: NextGIS */
+/** Bundle of @nextgis/ngw-leaflet; version: 1.11.10; 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.11.3; author: NextGIS */
+/** Bundle of @nextgis/ngw-leaflet; version: 1.11.10; author: NextGIS */
 var NgwLeaflet = (function () {
     'use strict';
 
@@ -15723,9 +15723,6 @@ var NgwLeaflet = (function () {
         line: 'path',
         point: 'circle',
     };
-    /**
-     * @internal
-     */
     var typeAlias$1 = {
         Point: 'point',
         LineString: 'line',
@@ -19151,6 +19148,13 @@ var NgwLeaflet = (function () {
             }
         });
     }
+    function fetchNgwExtent(options) {
+        return options.connector.getResource(options.resourceId).then(function (resource) {
+            if (resource) {
+                return fetchNgwResourceExtent(resource, options.connector);
+            }
+        });
+    }
     /** @deprecated use {@link fetchNgwExtent} instead */
     function fetchNgwResourceExtent(item, connector) {
         if (item.webmap) {
@@ -19250,7 +19254,19 @@ var NgwLeaflet = (function () {
     }
     // 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;
@@ -19272,46 +19288,39 @@ var NgwLeaflet = (function () {
             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) {
@@ -19388,12 +19397,16 @@ 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 : true;
                 // Additional client-side filter check
-                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;
             });
         }
@@ -19547,7 +19560,7 @@ var NgwLeaflet = (function () {
                                         hasData = this.getLayers && this.getLayers().length;
                                         strategy = this.options.strategy;
                                         if ((strategy === null || strategy === void 0 ? void 0 : strategy.startsWith('BBOX')) || hasData) {
-                                            return [2 /*return*/, fetchNgwResourceExtent(item, connector)];
+                                            return [2 /*return*/, fetchNgwExtent({ connector: connector, resourceId: item.resource.id })];
                                         }
                                         else {
                                             if (_super.prototype.getBounds) {
@@ -22294,9 +22307,9 @@ var NgwLeaflet = (function () {
          *
          * @example
          * ```javascript
-         * // add raster layer resourceId is the style of 4004 layer
+         * // Add raster layer resourceId is the style of 4004 layer
          * ngwMap.addNgwLayer({ resource: 4005 });
-         * // add vector data from layer GEOJSON source
+         * // Add vector data from layer GEOJSON source
          * ngwMap.addNgwLayer({
          *   resource: 4038,
          *   adapter: 'GEOJSON',
@@ -22482,7 +22495,7 @@ var NgwLeaflet = (function () {
          *
          * @example
          * ```javascript
-         * const ngwLayer = ngwMap.addNgwLayer({ id: 'ngw_layer_name', resourceId: 4005 });
+         * const ngwLayer = ngwMap.addNgwLayer({ id: 'ngw_layer_name', resource: 4005 });
          * ngwMap.fitLayer(ngwLayer);
          * ngwMap.fitLayer('ngw_layer_name');
          * ```