[server] do not drop layers with duplicate names

Fix #33928
qgis · Jan 22, 2020 · b3be308 · b3be308
1 parent c4a2bb0
commit b3be308
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 18 deletions.
diff --git a/src/server/services/wms/qgswmsrendercontext.cpp b/src/server/services/wms/qgswmsrendercontext.cpp
@@ -296,7 +296,7 @@ void QgsWmsRenderContext::initNicknameLayers()
 {
   for ( QgsMapLayer *ml : mProject->mapLayers() )
   {
-    mNicknameLayers[ layerNickname( *ml ) ] = ml;
+    mNicknameLayers.insert( layerNickname( *ml ), ml );
   }
 
   // init groups
@@ -412,14 +412,15 @@ void QgsWmsRenderContext::searchLayersToRender()
 
   if ( mFlags & AddQueryLayers )
   {
-    const auto constLayers { flattenedQueryLayers() };
+    const QStringList queryLayerNames { flattenedQueryLayers() };
-    for ( const QString &layer : constLayers )
+    for ( const QString &layerName : queryLayerNames )
     {
-      if ( mNicknameLayers.contains( layer )
+      const QList<QgsMapLayer *> layers = mNicknameLayers.values( layerName );
-           && !mLayersToRender.contains( mNicknameLayers[layer] ) )
+      for ( QgsMapLayer *lyr : layers )
-      {
+        if ( !mLayersToRender.contains( lyr ) )
-        mLayersToRender.append( mNicknameLayers[layer] );
+        {
-      }
+          mLayersToRender.append( lyr );
+        }
     }
   }
 }
@@ -455,7 +456,7 @@ void QgsWmsRenderContext::searchLayersToRenderSld()
       if ( mNicknameLayers.contains( lname ) )
       {
         mSlds[lname] = namedElem;
-        mLayersToRender.append( mNicknameLayers[ lname ] );
+        mLayersToRender.append( mNicknameLayers.values( lname ) );
       }
       else if ( mLayerGroups.contains( lname ) )
       {
@@ -491,7 +492,7 @@ void QgsWmsRenderContext::searchLayersToRenderStyle()
         mStyles[nickname] = style;
       }
 
-      mLayersToRender.append( mNicknameLayers[ nickname ] );
+      mLayersToRender.append( mNicknameLayers.values( nickname ) );
     }
     else if ( mLayerGroups.contains( nickname ) )
     {
@@ -509,7 +510,7 @@ void QgsWmsRenderContext::searchLayersToRenderStyle()
 
       for ( const auto &name : layersFromGroup )
       {
-        mLayersToRender.append( mNicknameLayers[ name ] );
+        mLayersToRender.append( mNicknameLayers.values( name ) );
       }
     }
     else
@@ -531,13 +532,16 @@ bool QgsWmsRenderContext::layerScaleVisibility( const QString &name ) const
     return visible;
   }
 
-  const QgsMapLayer *layer = mNicknameLayers[ name ];
+  const QList<QgsMapLayer *>layers = mNicknameLayers.values( name );
-  bool scaleBasedVisibility = layer->hasScaleBasedVisibility();
+  for ( QgsMapLayer *layer : layers )
-  bool useScaleConstraint = ( scaleDenominator() > 0 && scaleBasedVisibility );
-
-  if ( !useScaleConstraint || layer->isInScaleRange( scaleDenominator() ) )
   {
-    visible = true;
+    bool scaleBasedVisibility = layer->hasScaleBasedVisibility();
+    bool useScaleConstraint = ( scaleDenominator() > 0 && scaleBasedVisibility );
+
+    if ( !useScaleConstraint || layer->isInScaleRange( scaleDenominator() ) )
+    {
+      visible = true;
+    }
   }
 
   return visible;

diff --git a/src/server/services/wms/qgswmsrendercontext.h b/src/server/services/wms/qgswmsrendercontext.h
@@ -259,7 +259,7 @@ namespace QgsWms
       double mScaleDenominator = -1.0;
 
       // nickname of all layers defined within the project
-      QMap<QString, QgsMapLayer *> mNicknameLayers;
+      QMultiMap<QString, QgsMapLayer *> mNicknameLayers;
 
       // map of layers to use for rendering
       QList<QgsMapLayer *> mLayersToRender;