#12555 WFS export by current viewport doesn't work as expected (#12557)

Binabh · web-flow · commit 3082f8070e34 · 2026-07-02T19:09:45.000+05:30
* fix: add viewport filter support to WFS export in startFeatureExportDownload

* Add support for reading .prj files and update shpToGeoJSON to handle projections

* Fix viewportFilter assignment in startFeatureExportDownload

* Fix axis extraction logic in getPrjAxisDirections function

* Revert axis swapping and removing readShapePrjFiles

* remove unused import and whitespace

* fix: update viewportFilter assignment in startFeatureExportDownload function
diff --git a/web/client/epics/__tests__/layerdownload-test.js b/web/client/epics/__tests__/layerdownload-test.js
@@ -98,6 +98,100 @@ describe('layerdownload Epics', () => {
             state
         );
     });
+    it('startFeatureExportDownload adds viewport filter to WFS export when cropDataSet is enabled', (done) => {
+        const epicResult = actions => {
+            expect(actions.length).toBe(1);
+            expect(actions[0].error.config.url).toExist();
+            expect(actions[0].error.config.url.indexOf("test-format") > 0).toBe(true);
+            expect(actions[0].error.config.data.indexOf("<ogc:Intersects>") > 0).toBe(true);
+            expect(actions[0].error.config.data.indexOf("<ogc:PropertyName>the_geom</ogc:PropertyName>") > 0).toBe(true);
+            expect(actions[0].error.config.data.indexOf('<gml:Polygon srsName="EPSG:3857">') > 0).toBe(true);
+            expect(actions[0].error.config.data.indexOf("<gml:posList>0 0 0 1 1 1 1 0 0 0</gml:posList>") > 0).toBe(true);
+            done();
+        };
+
+        mockAxios.onGet().reply(404);
+        const state = {
+            controls: {
+                queryPanel: { enabled: false },
+                layerdownload: { enabled: true }
+            },
+            featuregrid: {},
+            layers: {
+                flat: [{ id: 'test layer', name: 'test', layerFilter: { featureTypeName: 'test' } }],
+                selected: ['test layer']
+            },
+            map: {
+                present: {
+                    bbox: {
+                        bounds: { minx: 0, miny: 0, maxx: 1, maxy: 1 },
+                        crs: 'EPSG:3857'
+                    }
+                }
+            },
+            query: {
+                featureTypes: {
+                    test: {
+                        original: {
+                            featureTypes: [{
+                                properties: [{
+                                    name: 'the_geom',
+                                    type: 'gml:MultiPolygon'
+                                }]
+                            }]
+                        }
+                    }
+                }
+            }
+        };
+        testEpic(
+            startFeatureExportDownload,
+            1,
+            downloadFeatures('/wrong/path?', { featureTypeName: 'test' }, { selectedFormat: "test-format", cropDataSet: true}),
+            epicResult,
+            state
+        );
+    });
+    it('startFeatureExportDownload adds viewport BBOX filter when cropDataSet is enabled without describe metadata', (done) => {
+        const epicResult = actions => {
+            expect(actions.length).toBe(1);
+            expect(actions[0].error.config.url).toExist();
+            expect(actions[0].error.config.url.indexOf("test-format") > 0).toBe(true);
+            expect(actions[0].error.config.data.indexOf("<ogc:BBOX>") > 0).toBe(true);
+            expect(actions[0].error.config.data.indexOf('<gml:Envelope srsName="EPSG:3857">') > 0).toBe(true);
+            expect(actions[0].error.config.data.indexOf("<gml:lowerCorner>0 0</gml:lowerCorner>") > 0).toBe(true);
+            expect(actions[0].error.config.data.indexOf("<gml:upperCorner>1 1</gml:upperCorner>") > 0).toBe(true);
+        };
+
+        mockAxios.onGet().reply(404);
+        const state = {
+            controls: {
+                queryPanel: { enabled: false },
+                layerdownload: { enabled: true }
+            },
+            featuregrid: {},
+            layers: {
+                flat: [{ id: 'test layer', name: 'test', layerFilter: { featureTypeName: 'test' } }],
+                selected: ['test layer']
+            },
+            map: {
+                present: {
+                    bbox: {
+                        bounds: { minx: 0, miny: 0, maxx: 1, maxy: 1 },
+                        crs: 'EPSG:3857'
+                    }
+                }
+            }
+        };
+        testEpic(
+            startFeatureExportDownload,
+            1,
+            downloadFeatures('/wrong/path?', { featureTypeName: 'test' }, { selectedFormat: "test-format", cropDataSet: true}),
+            epicResult,
+            state,
+            done
+        );
+    });
     it('startFeatureExportDownload cql_filter support', (done) => {
         const epicResult = actions => {
             expect(actions.length).toBe(1);
diff --git a/web/client/epics/layerdownload.js b/web/client/epics/layerdownload.js
@@ -101,11 +101,11 @@ const hasOutputFormat = (data) => {
     return toPairs(pickedObj).map(([prop, value]) => ({ name: prop, label: value }));
 };
 
-const getWFSFeature = ({ url, filterObj = {}, layerFilter, layer, downloadOptions = {}, options } = {}) => {
+const getWFSFeature = ({ url, filterObj = {}, layerFilter, layer, viewportFilter, downloadOptions = {}, options } = {}) => {
     const { sortOptions, propertyNames } = options;
 
     const cqlFilter = getCQLFilterFromLayer(layer);
-    const data = mergeFiltersToOGC({ ogcVersion: '1.1.0', addXmlnsToRoot: true, xmlnsToAdd: ['xmlns:ogc="http://www.opengis.net/ogc"', 'xmlns:gml="http://www.opengis.net/gml"'] }, downloadOptions.downloadFilteredDataSet ? layerFilter : {}, downloadOptions.downloadFilteredDataSet ? filterObj : {}, cqlFilter);
+    const data = mergeFiltersToOGC({ ogcVersion: '1.1.0', addXmlnsToRoot: true, xmlnsToAdd: ['xmlns:ogc="http://www.opengis.net/ogc"', 'xmlns:gml="http://www.opengis.net/gml"'] }, downloadOptions.downloadFilteredDataSet ? layerFilter : {}, downloadOptions.downloadFilteredDataSet ? filterObj : {}, viewportFilter, cqlFilter);
 
     return getXMLFeature(url, getFilterFeature(query(
         filterObj.featureTypeName, [...(sortOptions ? [sortBy(sortOptions.sortBy, sortOptions.sortOrder)] : []), ...(propertyNames ? [propertyName(propertyNames)] : []), ...(data ? castArray(data) : [])],
@@ -123,11 +123,45 @@ const getFileName = action => {
     return name;
 };
 const getDefaultSortOptions = (attribute) => {
-    return attribute ? { sortBy: attribute, sortOrder: 'A'} : {};
+    return attribute ? { sortBy: attribute, sortOrder: 'A'} : null;
 };
 const getFirstAttribute = (state)=> {
     return state.query && state.query.featureTypes && state.query.featureTypes[state.query.typeName] && state.query.featureTypes[state.query.typeName].attributes && state.query.featureTypes[state.query.typeName].attributes[0] && state.query.featureTypes[state.query.typeName].attributes[0].attribute || null;
 };
+const getBboxExtent = (bounds = {}) => {
+    return Array.isArray(bounds)
+        ? bounds
+        : [bounds.minx, bounds.miny, bounds.maxx, bounds.maxy];
+};
+const getViewportFilter = (cropDataSet, mapBbox, geometryAttribute) => {
+    if (!cropDataSet || !mapBbox?.bounds) {
+        return null;
+    }
+    const projection = mapBbox.crs || 'EPSG:4326';
+    if (geometryAttribute) {
+        return {
+            spatialField: {
+                geometry: {
+                    ...bboxToFeatureGeometry(mapBbox.bounds),
+                    projection
+                },
+                attribute: geometryAttribute,
+                method: 'Rectangle',
+                operation: 'INTERSECTS'
+            }
+        };
+    }
+    return {
+        spatialField: {
+            geometry: {
+                extent: [getBboxExtent(mapBbox.bounds)],
+                projection
+            },
+            method: 'BBOX',
+            operation: 'BBOX'
+        }
+    };
+};
 
 const wpsExecuteErrorToMessage = e => {
     switch (e.code) {
@@ -255,11 +289,11 @@ export const startFeatureExportDownload = (action$, store) =>
 
         const mapBbox = mapBboxSelector(state);
         const currentLocale = currentLocaleSelector(state);
+        const geometryAttribute = extractGeometryAttributeName(layerDescribeSelector(state, layer.name));
         const propertyNames = action.downloadOptions.propertyName ? [
-            extractGeometryAttributeName(layerDescribeSelector(state, layer.name)),
+            ...(geometryAttribute ? [geometryAttribute] : []),
             ...action.downloadOptions.propertyName
         ] : null;
-
         const { layerFilter } = layer;
 
         const wfsFlow = () => getWFSFeature({
@@ -268,6 +302,7 @@ export const startFeatureExportDownload = (action$, store) =>
             filterObj: isNil(action.filterObj) ? {} : action.filterObj,
             layer,
             layerFilter,
+            viewportFilter: getViewportFilter(action.downloadOptions.cropDataSet, mapBbox, geometryAttribute),
             options: {
                 pagination: !virtualScroll && get(action, "downloadOptions.singlePage") ? action.filterObj && action.filterObj.pagination : null,
                 propertyNames
@@ -289,11 +324,12 @@ export const startFeatureExportDownload = (action$, store) =>
                     filterObj: action.filterObj,
                     layer,
                     layerFilter,
+                    viewportFilter: getViewportFilter(action.downloadOptions.cropDataSet, mapBbox, geometryAttribute),
                     options: {
                         pagination: !virtualScroll && get(action, "downloadOptions.singlePage") ? action.filterObj && action.filterObj.pagination : null,
                         sortOptions: getDefaultSortOptions(getFirstAttribute(store.getState())),
                         propertyNames: action.downloadOptions.propertyName ? [...action.downloadOptions.propertyName,
-                            extractGeometryAttributeName(layerDescribeSelector(state, layer.name))] : null
+                            ...(geometryAttribute ? [geometryAttribute] : [])] : null
                     }
                 }).do(({ data, headers }) => {
                     if (headers["content-type"] === "application/xml") { // TODO add expected mimetypes in the case you want application/dxf
