Merge pull request #32596 from elpaso/server-oapif-fix-items-crs-3_10

Fix server OAPIF crs transformation on items
qgis · Nov 12, 2019 · 051f8c5 · 051f8c5
2 parents e61d985 + ff342fd
commit 051f8c5
Show file tree

Hide file tree

Showing 6 changed files with 2,017 additions and 3 deletions.
diff --git a/src/server/services/wfs3/qgswfs3handlers.cpp b/src/server/services/wfs3/qgswfs3handlers.cpp
@@ -1077,7 +1077,7 @@ void QgsWfs3CollectionsItemsHandler::handleRequest( const QgsServerApiContext &c
     QgsJsonExporter exporter { mapLayer };
     exporter.setAttributes( featureRequest.subsetOfAttributes() );
     exporter.setAttributeDisplayName( true );
-    exporter.setSourceCrs( mapLayer->crs() );
+    exporter.setTransformGeometries( false );
     QgsFeatureList featureList;
     QgsFeatureIterator features { mapLayer->getFeatures( featureRequest ) };
     QgsFeature feat;

diff --git a/tests/src/python/test_qgsserver_api.py b/tests/src/python/test_qgsserver_api.py
@@ -372,6 +372,22 @@ def test_wfs3_collection_items_crs(self):
         request = QgsBufferServerRequest('http://server.qgis.org/wfs3/collections/testlayer%20èé/items?crs={}'.format(encoded_crs))
         self.compareApi(request, project, 'test_wfs3_collections_items_testlayer_èé_crs_3857.json')
 
+    def test_wfs3_collection_items_as_areas_crs_4326(self):
+        """Test WFS3 API items with CRS"""
+        project = QgsProject()
+        project.read(unitTestDataPath('qgis_server') + '/test_project_wms_grouped_nested_layers.qgs')
+        encoded_crs = parse.quote('http://www.opengis.net/def/crs/EPSG/9.6.2/4326', safe='')
+        request = QgsBufferServerRequest('http://server.qgis.org/wfs3/collections/as-areas-short-name/items?crs={}'.format(encoded_crs))
+        self.compareApi(request, project, 'test_wfs3_collections_items_as-areas-short-name_4326.json')
+
+    def test_wfs3_collection_items_as_areas_crs_3857(self):
+        """Test WFS3 API items with CRS"""
+        project = QgsProject()
+        project.read(unitTestDataPath('qgis_server') + '/test_project_wms_grouped_nested_layers.qgs')
+        encoded_crs = parse.quote('http://www.opengis.net/def/crs/EPSG/9.6.2/3857', safe='')
+        request = QgsBufferServerRequest('http://server.qgis.org/wfs3/collections/as-areas-short-name/items?crs={}'.format(encoded_crs))
+        self.compareApi(request, project, 'test_wfs3_collections_items_as-areas-short-name_3857.json')
+
     def test_invalid_args(self):
         """Test wrong args"""
         project = QgsProject()

diff --git a/tests/testdata/qgis_server/api/test_wfs3_collection_testlayer_èé.json b/tests/testdata/qgis_server/api/test_wfs3_collection_testlayer_èé.json
@@ -46,6 +46,6 @@ Content-Type: application/json
       "type": "text/html"
     }
   ],
-  "timeStamp": "2019-10-16T13:53:56Z",
+  "timeStamp": "2019-11-02T15:56:20Z",
   "title": "A test vector layer èé"
 }