Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Backport release-3_34] qgswfsparameters: Ensure to get the default value on wrong version #55380

Merged
merged 1 commit into from
Dec 21, 2023
Merged

[Backport release-3_34] qgswfsparameters: Ensure to get the default value on wrong version #55380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/server/services/wfs/qgswfsparameters.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,10 +368,10 @@ namespace QgsWfs
const QString vStr = version();
QgsProjectVersion version;

if ( vStr.isEmpty() )
version = QgsProjectVersion( 1, 1, 0 ); // default value
else if ( mVersions.contains( QgsProjectVersion( vStr ) ) )
if ( mVersions.contains( QgsProjectVersion( vStr ) ) )
version = QgsProjectVersion( vStr );
else
version = QgsProjectVersion( 1, 1, 0 ); // default value

return version;
}
Expand Down
10 changes: 10 additions & 0 deletions tests/src/python/test_qgsserver_wfs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -560,6 +560,16 @@ def test_get_feature_srsname_empty(self):
self.wfs_request_compare(
"GetFeature", '1.1.0', "TYPENAME=testlayer&FEATUREID=testlayer.0", 'wfs_getFeature_1_1_0_featureid_0_1_1_0_srsname')

def test_get_feature_wrong_version_nomber(self):
"""Test GetFeature with a wrong version number.
This should fall back to the default version: 1.1.0
"""
self.wfs_request_compare(
"GetFeature", '2.0.0', "SRSNAME=urn:ogc:def:crs:EPSG::4326&TYPENAME=testlayer&FEATUREID=testlayer.0", 'wfs_getFeature_1_1_0_featureid_0_1_1_0')

self.wfs_request_compare(
"GetFeature", '2.0.0', "TYPENAME=testlayer&FEATUREID=testlayer.0", 'wfs_getFeature_1_1_0_featureid_0_1_1_0_srsname')

def test_getFeature_EXP_FILTER_regression_20927(self):
"""Test expressions with EXP_FILTER"""

Expand Down
Loading