[BUFIX][Server] GetFeatureInfo on Raster Layer, fix valid identify

rldhont · rldhont · commit c3417bb46af5 · 2017-09-13T15:19:34.000+02:00
Needs to be manually apply to QGIS 3

Funded by Ifremer
diff --git a/src/server/qgswmsserver.cpp b/src/server/qgswmsserver.cpp
@@ -2535,19 +2535,23 @@ int QgsWMSServer::featureInfoFromRasterLayer( QgsRasterLayer* layer,
   {
     return 1;
   }
-  QMap<int, QVariant> attributes;
+  QgsRasterIdentifyResult identifyResult;
   // use context extent, width height (comes with request) to use WCS cache
   // We can only use context if raster is not reprojected, otherwise it is difficult
   // to guess correct source resolution
   if ( mMapRenderer->hasCrsTransformEnabled() && layer->dataProvider()->crs() != mMapRenderer->destinationCrs() )
   {
-    attributes = layer->dataProvider()->identify( *infoPoint, QgsRaster::IdentifyFormatValue ).results();
+    identifyResult = layer->dataProvider()->identify( *infoPoint, QgsRaster::IdentifyFormatValue );
   }
   else
   {
-    attributes = layer->dataProvider()->identify( *infoPoint, QgsRaster::IdentifyFormatValue, mMapRenderer->extent(), mMapRenderer->outputSize().width(), mMapRenderer->outputSize().height() ).results();
+    identifyResult = layer->dataProvider()->identify( *infoPoint, QgsRaster::IdentifyFormatValue, mMapRenderer->extent(), mMapRenderer->outputSize().width(), mMapRenderer->outputSize().height() );
   }
 
+  if ( !identifyResult.isValid() )
+    return 1;
+
+  QMap<int, QVariant> attributes = identifyResult.results();
   if ( infoFormat == "application/vnd.ogc.gml" )
   {
     QgsFeature feature;

Original file line number	Diff line number	Diff line change
`@@ -2535,19 +2535,23 @@ int QgsWMSServer::featureInfoFromRasterLayer( QgsRasterLayer* layer,`
`2535`	`2535`	`{`
`2536`	`2536`	`return 1;`
`2537`	`2537`	`}`
`2538`		`- QMap<int, QVariant> attributes;`
	`2538`	`+ QgsRasterIdentifyResult identifyResult;`
`2539`	`2539`	`// use context extent, width height (comes with request) to use WCS cache`
`2540`	`2540`	`// We can only use context if raster is not reprojected, otherwise it is difficult`
`2541`	`2541`	`// to guess correct source resolution`
`2542`	`2542`	`if ( mMapRenderer->hasCrsTransformEnabled() && layer->dataProvider()->crs() != mMapRenderer->destinationCrs() )`
`2543`	`2543`	`{`
`2544`		`- attributes = layer->dataProvider()->identify( *infoPoint, QgsRaster::IdentifyFormatValue ).results();`
	`2544`	`+ identifyResult = layer->dataProvider()->identify( *infoPoint, QgsRaster::IdentifyFormatValue );`
`2545`	`2545`	`}`
`2546`	`2546`	`else`
`2547`	`2547`	`{`
`2548`		`- attributes = layer->dataProvider()->identify( *infoPoint, QgsRaster::IdentifyFormatValue, mMapRenderer->extent(), mMapRenderer->outputSize().width(), mMapRenderer->outputSize().height() ).results();`
	`2548`	`+ identifyResult = layer->dataProvider()->identify( *infoPoint, QgsRaster::IdentifyFormatValue, mMapRenderer->extent(), mMapRenderer->outputSize().width(), mMapRenderer->outputSize().height() );`
`2549`	`2549`	`}`
`2550`	`2550`
	`2551`	`+ if ( !identifyResult.isValid() )`
	`2552`	`+ return 1;`
	`2553`	`+`
	`2554`	`+ QMap<int, QVariant> attributes = identifyResult.results();`
`2551`	`2555`	`if ( infoFormat == "application/vnd.ogc.gml" )`
`2552`	`2556`	`{`
`2553`	`2557`	`QgsFeature feature;`