[Server] Enhance WCS mapLayerFromCoverage

qgis · Mar 20, 2017 · ece7ba7 · ece7ba7
1 parent d1e8c26
commit ece7ba7
Showing 1 changed file with 15 additions and 11 deletions.
diff --git a/src/server/qgswcsprojectparser.cpp b/src/server/qgswcsprojectparser.cpp
@@ -435,20 +435,24 @@ QList<QgsMapLayer*> QgsWCSProjectParser::mapLayerFromCoverage( const QString& cN
     QString type = elem.attribute( "type" );
     if ( type == "raster" )
     {
+      QString id = mProjectParser->layerId( elem );
+      if ( !wcsLayersId.contains( id ) )
+        continue;
+
+      QString coveName = mProjectParser->layerShortName( elem );
+      if ( coveName.isEmpty() )
+        coveName = mProjectParser->layerName( elem );
+      coveName = coveName.replace( " ", "_" );
+
+      if ( coveName != cName )
+        continue;
+
       QgsMapLayer *mLayer = mProjectParser->createLayerFromElement( elem, useCache );
       QgsRasterLayer* layer = qobject_cast<QgsRasterLayer*>( mLayer );
-      if ( !layer || !wcsLayersId.contains( layer->id() ) )
-        return layerList;
+      if ( !layer )
+        continue;
 
-      QString coveName = layer->name();
-      if ( !layer->shortName().isEmpty() )
-        coveName = layer->shortName();
-      coveName = coveName.replace( " ", "_" );
-      if ( cName == coveName )
-      {
-        layerList.push_back( mLayer );
-        return layerList;
-      }
+      layerList.push_back( mLayer );
     }
   }
   return layerList;