Merge pull request #6544 from manisandro/wms_filter_geom_crs_30

manisandro · web-flow · commit ec5a8a4d27fb · 2018-03-06T17:32:09.000+01:00
Ensure FILTER_GEOM is transformed to layer CRS in GetFeatureInfo
diff --git a/src/server/services/wms/qgswmsrenderer.cpp b/src/server/services/wms/qgswmsrenderer.cpp
@@ -1357,6 +1357,16 @@ namespace QgsWms
       return false;
     }
 
+    QgsFeatureRequest fReq;
+
+    // Transform filter geometry to layer CRS
+    std::unique_ptr<QgsGeometry> layerFilterGeom;
+    if ( filterGeom )
+    {
+      layerFilterGeom.reset( new QgsGeometry( *filterGeom ) );
+      layerFilterGeom->transform( QgsCoordinateTransform( mapSettings.destinationCrs(), layer->crs(), fReq.transformContext() ) );
+    }
+
     //we need a selection rect (0.01 of map width)
     QgsRectangle mapRect = mapSettings.extent();
     QgsRectangle layerRect = mapSettings.mapToLayerCoordinates( layer, mapRect );
@@ -1369,9 +1379,9 @@ namespace QgsWms
     {
       searchRect = featureInfoSearchRect( layer, mapSettings, renderContext, *infoPoint );
     }
-    else if ( filterGeom )
+    else if ( layerFilterGeom )
     {
-      searchRect = filterGeom->boundingBox();
+      searchRect = layerFilterGeom->boundingBox();
     }
     else if ( mParameters.contains( QStringLiteral( "BBOX" ) ) )
     {
@@ -1389,8 +1399,7 @@ namespace QgsWms
     bool segmentizeWktGeometry = QgsServerProjectUtils::wmsFeatureInfoSegmentizeWktGeometry( *mProject );
     const QSet<QString> &excludedAttributes = layer->excludeAttributesWms();
 
-    QgsFeatureRequest fReq;
-    bool hasGeometry = addWktGeometry || featureBBox || filterGeom;
+    bool hasGeometry = addWktGeometry || featureBBox || layerFilterGeom;
     fReq.setFlags( ( ( hasGeometry ) ? QgsFeatureRequest::NoFlags : QgsFeatureRequest::NoGeometry ) | QgsFeatureRequest::ExactIntersect );
 
     if ( ! searchRect.isEmpty() )
@@ -1402,9 +1411,10 @@ namespace QgsWms
       fReq.setFlags( fReq.flags() & ~ QgsFeatureRequest::ExactIntersect );
     }
 
-    if ( filterGeom )
+
+    if ( layerFilterGeom )
     {
-      fReq.setFilterExpression( QString( "intersects( $geometry, geom_from_wkt('%1') )" ).arg( filterGeom->asWkt() ) );
+      fReq.setFilterExpression( QString( "intersects( $geometry, geom_from_wkt('%1') )" ).arg( layerFilterGeom->asWkt() ) );
     }
 
 #ifdef HAVE_SERVER_PYTHON_PLUGINS
diff --git a/tests/src/python/test_qgsserver_wms.py b/tests/src/python/test_qgsserver_wms.py
@@ -193,11 +193,20 @@ def test_getfeatureinfo(self):
         self.wms_request_compare('GetFeatureInfo',
                                  '&layers=testlayer%20%C3%A8%C3%A9&' +
                                  'INFO_FORMAT=text%2Fxml&' +
-                                 'width=600&height=400&srs=EPSG%3A3857&' +
+                                 'width=600&height=400&srs=EPSG%3A4326&' +
                                  'query_layers=testlayer%20%C3%A8%C3%A9&' +
                                  'FEATURE_COUNT=10&FILTER_GEOM=POLYGON((8.2035381 44.901459,8.2035562 44.901459,8.2035562 44.901418,8.2035381 44.901418,8.2035381 44.901459))',
                                  'wms_getfeatureinfo_geometry_filter')
 
+        # Test feature info request with filter geometry in non-layer CRS
+        self.wms_request_compare('GetFeatureInfo',
+                                 '&layers=testlayer%20%C3%A8%C3%A9&' +
+                                 'INFO_FORMAT=text%2Fxml&' +
+                                 'width=600&height=400&srs=EPSG%3A3857&' +
+                                 'query_layers=testlayer%20%C3%A8%C3%A9&' +
+                                 'FEATURE_COUNT=10&FILTER_GEOM=POLYGON ((913213.6839952 5606021.5399693, 913215.6988780 5606021.5399693, 913215.6988780 5606015.09643322, 913213.6839952 5606015.0964332, 913213.6839952 5606021.5399693))',
+                                 'wms_getfeatureinfo_geometry_filter_3857')
+
         # Test feature info request with invalid query_layer
         self.wms_request_compare('GetFeatureInfo',
                                  '&layers=testlayer%20%C3%A8%C3%A9&' +
diff --git a/tests/testdata/qgis_server/wms_getfeatureinfo_geometry_filter.txt b/tests/testdata/qgis_server/wms_getfeatureinfo_geometry_filter.txt
@@ -7,7 +7,7 @@ Content-Type: text/xml; charset=utf-8
    <Attribute name="id" value="2"/>
    <Attribute name="name" value="two"/>
    <Attribute name="utf8nameè" value="two àò"/>
-   <BoundingBox CRS="EPSG:3857" minx="913214.6741" maxx="913214.6741" miny="5606017.8743" maxy="5606017.8743"/>
+   <BoundingBox CRS="EPSG:4326" minx="8.2035" maxx="8.2035" miny="44.9014" maxy="44.9014"/>
   </Feature>
  </Layer>
 </GetFeatureInfoResponse>
diff --git a/tests/testdata/qgis_server/wms_getfeatureinfo_geometry_filter_3857.txt b/tests/testdata/qgis_server/wms_getfeatureinfo_geometry_filter_3857.txt
@@ -0,0 +1,13 @@
+Content-Length: 261
+Content-Type: text/xml; charset=utf-8
+
+<GetFeatureInfoResponse>
+ <Layer name="testlayer èé">
+  <Feature id="1">
+   <Attribute name="id" value="2"/>
+   <Attribute name="name" value="two"/>
+   <Attribute name="utf8nameè" value="two àò"/>
+   <BoundingBox CRS="EPSG:3857" minx="913214.6741" maxx="913214.6741" miny="5606017.8743" maxy="5606017.8743"/>
+  </Feature>
+ </Layer>
+</GetFeatureInfoResponse>

Original file line number	Diff line number	Diff line change
`@@ -1357,6 +1357,16 @@ namespace QgsWms`
`1357`	`1357`	`return false;`
`1358`	`1358`	`}`
`1359`	`1359`
	`1360`	`+ QgsFeatureRequest fReq;`
	`1361`	`+`
	`1362`	`+ // Transform filter geometry to layer CRS`
	`1363`	`+ std::unique_ptr<QgsGeometry> layerFilterGeom;`
	`1364`	`+ if ( filterGeom )`
	`1365`	`+ {`
	`1366`	`+ layerFilterGeom.reset( new QgsGeometry( *filterGeom ) );`
	`1367`	`+ layerFilterGeom->transform( QgsCoordinateTransform( mapSettings.destinationCrs(), layer->crs(), fReq.transformContext() ) );`
	`1368`	`+ }`
	`1369`	`+`
`1360`	`1370`	`//we need a selection rect (0.01 of map width)`
`1361`	`1371`	`QgsRectangle mapRect = mapSettings.extent();`
`1362`	`1372`	`QgsRectangle layerRect = mapSettings.mapToLayerCoordinates( layer, mapRect );`
`@@ -1369,9 +1379,9 @@ namespace QgsWms`
`1369`	`1379`	`{`
`1370`	`1380`	`searchRect = featureInfoSearchRect( layer, mapSettings, renderContext, *infoPoint );`
`1371`	`1381`	`}`
`1372`		`- else if ( filterGeom )`
	`1382`	`+ else if ( layerFilterGeom )`
`1373`	`1383`	`{`
`1374`		`- searchRect = filterGeom->boundingBox();`
	`1384`	`+ searchRect = layerFilterGeom->boundingBox();`
`1375`	`1385`	`}`
`1376`	`1386`	`else if ( mParameters.contains( QStringLiteral( "BBOX" ) ) )`
`1377`	`1387`	`{`
`@@ -1389,8 +1399,7 @@ namespace QgsWms`
`1389`	`1399`	`bool segmentizeWktGeometry = QgsServerProjectUtils::wmsFeatureInfoSegmentizeWktGeometry( *mProject );`
`1390`	`1400`	`const QSet<QString> &excludedAttributes = layer->excludeAttributesWms();`
`1391`	`1401`
`1392`		`- QgsFeatureRequest fReq;`
`1393`		`- bool hasGeometry = addWktGeometry \|\| featureBBox \|\| filterGeom;`
	`1402`	`+ bool hasGeometry = addWktGeometry \|\| featureBBox \|\| layerFilterGeom;`
`1394`	`1403`	`fReq.setFlags( ( ( hasGeometry ) ? QgsFeatureRequest::NoFlags : QgsFeatureRequest::NoGeometry ) \| QgsFeatureRequest::ExactIntersect );`
`1395`	`1404`
`1396`	`1405`	`if ( ! searchRect.isEmpty() )`
`@@ -1402,9 +1411,10 @@ namespace QgsWms`
`1402`	`1411`	`fReq.setFlags( fReq.flags() & ~ QgsFeatureRequest::ExactIntersect );`
`1403`	`1412`	`}`
`1404`	`1413`
`1405`		`- if ( filterGeom )`
	`1414`	`+`
	`1415`	`+ if ( layerFilterGeom )`
`1406`	`1416`	`{`
`1407`		`- fReq.setFilterExpression( QString( "intersects( $geometry, geom_from_wkt('%1') )" ).arg( filterGeom->asWkt() ) );`
	`1417`	`+ fReq.setFilterExpression( QString( "intersects( $geometry, geom_from_wkt('%1') )" ).arg( layerFilterGeom->asWkt() ) );`
`1408`	`1418`	`}`
`1409`	`1419`
`1410`	`1420`	`#ifdef HAVE_SERVER_PYTHON_PLUGINS`