Fix OGC test getfeatureinfo:invalid-query_layers

qgis · Sep 29, 2017 · 54137b7 · 54137b7
1 parent e06ec71
commit 54137b7
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/src/server/services/wms/qgswmsrenderer.cpp b/src/server/services/wms/qgswmsrenderer.cpp
@@ -1255,10 +1255,13 @@ namespace QgsWms
 
     Q_FOREACH ( QString queryLayer, queryLayers )
     {
+      bool validLayer = false;
       Q_FOREACH ( QgsMapLayer *layer, layers )
       {
         if ( queryLayer == layerNickname( *layer ) )
         {
+          validLayer = true;
+
           QDomElement layerElement;
           if ( infoFormat == QgsWmsParameters::Format::GML )
           {
@@ -1316,6 +1319,12 @@ namespace QgsWms
           break;
         }
       }
+
+      if ( !validLayer )
+      {
+        throw QgsBadRequestException( QStringLiteral( "LayerNotDefined" ),
+                                      QStringLiteral( "Layer '%1' not found" ).arg( queryLayer ) );
+      }
     }
 
     if ( featuresRect )