@nextgis/ngw-leaflet 1.11.3 → 1.11.10

package/lib/ngw-leaflet.esm-browser.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 */
 function styleInject(css, ref) {
   if ( ref === void 0 ) ref = {};
   var insertAt = ref.insertAt;
@@ -15555,9 +15555,6 @@ const paintTypeAlias = {
     line: 'path',
     point: 'circle',
 };
-/**
- * @internal
- */
 const typeAlias$1 = {
     Point: 'point',
     LineString: 'line',
@@ -18622,6 +18619,13 @@ function fetchNgwLayerItemExtent({ resourceId, featureId, connector, cache = tru
         }
     });
 }
+function fetchNgwExtent(options) {
+    return options.connector.getResource(options.resourceId).then((resource) => {
+        if (resource) {
+            return fetchNgwResourceExtent(resource, options.connector);
+        }
+    });
+}
 /** @deprecated use {@link fetchNgwExtent} instead */
 function fetchNgwResourceExtent(item, connector) {
     if (item.webmap) {
@@ -18709,7 +18713,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));
@@ -18729,7 +18745,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,
@@ -18737,12 +18753,12 @@ function createFeatureFieldFilterQueries(opt, _queries = [], _parentAllParams =
                 }));
             }
             else {
-                createFeatureFieldFilterQueries({
+                getQueries({
                     ...opt,
                     filters: f,
                 }, _queries, [..._parentAllParams]);
             }
-        });
+        }
     }
     else if (logic === 'all') {
         const filters = [];
@@ -18757,7 +18773,7 @@ function createFeatureFieldFilterQueries(opt, _queries = [], _parentAllParams =
         }
         if (propertiesFilterList.length) {
             for (const x of propertiesFilterList) {
-                createFeatureFieldFilterQueries({
+                getQueries({
                     ...opt,
                     filters: x,
                 }, _queries, [..._parentAllParams, ...filters]);
@@ -18770,15 +18786,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]) => {
@@ -18859,12 +18867,16 @@ function fetchNgwLayerItems(options) {
             ...options,
             filters,
         }).then((data) => {
+            var _a;
+            const clientFilterValidate = (_a = options.clientFilterValidate) !== null && _a !== void 0 ? _a : true;
             // Additional client-side filter check
-            data.filter((y) => {
-                const fields = prepareNgwFieldsToPropertiesFilter({ ...y.fields });
-                const result = propertiesFilter(fields, filters);
-                return result;
-            });
+            if (clientFilterValidate) {
+                data = data.filter((y) => {
+                    const fields = prepareNgwFieldsToPropertiesFilter({ ...y.fields, id: y.id });
+                    const result = propertiesFilter(fields, filters);
+                    return result;
+                });
+            }
             return data;
         });
     }
@@ -19001,7 +19013,7 @@ async function createGeoJsonAdapter(props) {
             const hasData = this.getLayers && this.getLayers().length;
             const strategy = this.options.strategy;
             if ((strategy === null || strategy === void 0 ? void 0 : strategy.startsWith('BBOX')) || hasData) {
-                return fetchNgwResourceExtent(item, connector);
+                return fetchNgwExtent({ connector, resourceId: item.resource.id });
             }
             else {
                 if (super.getBounds) {
@@ -21423,9 +21435,9 @@ class NgwMap extends WebMap {
      *
      * @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',
@@ -21584,7 +21596,7 @@ class NgwMap extends WebMap {
      *
      * @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');
      * ```