[BUGFIX][Server] GetFeaturInfo: do not identify raster data if point …

…not contains
qgis · Nov 3, 2017 · 61e421d72c1f4650ac56bb0838c3944865a3f919 · 61e421d
1 parent 66bcfbb
commit 61e421d72c1f4650ac56bb0838c3944865a3f919
Unified Split

Showing with 15 additions and 15 deletions.

+15 −15 src/server/qgswmsserver.cpp
diff --git a/src/server/qgswmsserver.cpp b/src/server/qgswmsserver.cpp
@@ -1825,26 +1825,26 @@ int QgsWMSServer::getFeatureInfo( QDomDocument& result, const QString& version )
       }
       else //raster layer
       {
+        QgsRasterLayer* rasterLayer = qobject_cast<QgsRasterLayer*>( currentLayer );
+        if ( !rasterLayer )
+        {
+          continue;
+        }
+        if ( !infoPoint.data() )
+        {
+          continue;
+        }
+        QgsPoint layerInfoPoint = mMapRenderer->mapToLayerCoordinates( currentLayer, *( infoPoint.data() ) );
+        if ( !rasterLayer->extent().contains( layerInfoPoint ) )
+        {
+          continue;
+        }
         if ( infoFormat.startsWith( "application/vnd.ogc.gml" ) )
         {
           layerElement = result.createElement( "gml:featureMember"/*wfs:FeatureMember*/ );
           getFeatureInfoElement.appendChild( layerElement );
         }
-
-        QgsRasterLayer* rasterLayer = qobject_cast<QgsRasterLayer*>( currentLayer );
-        if ( rasterLayer )
-        {
-          if ( !infoPoint.data() )
-          {
-            continue;
-          }
-          QgsPoint layerInfoPoint = mMapRenderer->mapToLayerCoordinates( currentLayer, *( infoPoint.data() ) );
-          if ( featureInfoFromRasterLayer( rasterLayer, &layerInfoPoint, result, layerElement, version, infoFormat ) != 0 )
-          {
-            continue;
-          }
-        }
-        else
+        if ( featureInfoFromRasterLayer( rasterLayer, &layerInfoPoint, result, layerElement, version, infoFormat ) != 0 )
         {
           continue;
         }