Merge pull request qgis#55380 from qgis/backport-55333-to-release-3_34

[Backport release-3_34] qgswfsparameters: Ensure to get the default value on wrong version
ptitjano · Dec 21, 2023 · c044bce · c044bce
2 parents e87fe42 + 990697f
commit c044bce
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/src/server/services/wfs/qgswfsparameters.cpp b/src/server/services/wfs/qgswfsparameters.cpp
@@ -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;
   }

diff --git a/tests/src/python/test_qgsserver_wfs.py b/tests/src/python/test_qgsserver_wfs.py
@@ -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"""