Opacity should also be considered for external layers

qgis · Mar 12, 2021 · 17044f4d3da12e9112d416d582af4f7aab40f940 · 17044f4
1 parent 6c6fd06
commit 17044f4d3da12e9112d416d582af4f7aab40f940
Unified Split

Showing with 8 additions and 8 deletions.

+3 −3 src/server/services/wms/qgswmsparameters.cpp

+5 −5 src/server/services/wms/qgswmsrenderer.cpp
diff --git a/src/server/services/wms/qgswmsparameters.cpp b/src/server/services/wms/qgswmsparameters.cpp
@@ -1576,6 +1576,9 @@ namespace QgsWms
       QgsWmsParametersLayer param;
       param.mNickname = layer;
 
+      if ( i < opacities.count() )
+        param.mOpacity = opacities[i];
+
       if ( isExternalLayer( layer ) )
       {
         const QgsWmsParametersExternalLayer extParam = externalLayerParameter( layer );
@@ -1587,9 +1590,6 @@ namespace QgsWms
         if ( i < styles.count() )
           param.mStyle = styles[i];
 
-        if ( i < opacities.count() )
-          param.mOpacity = opacities[i];
-
         if ( filters.contains( layer ) )
         {
           auto it = filters.find( layer );

diff --git a/src/server/services/wms/qgswmsrenderer.cpp b/src/server/services/wms/qgswmsrenderer.cpp
@@ -3285,6 +3285,11 @@ namespace QgsWms
         continue;
       }
 
+      if ( mContext.testFlag( QgsWmsRenderContext::UseOpacity ) )
+      {
+        setLayerOpacity( layer, param.mOpacity );
+      }
+
       if ( mContext.isExternalLayer( param.mNickname ) )
       {
         continue;
@@ -3299,11 +3304,6 @@ namespace QgsWms
         setLayerStyle( layer, mContext.style( *layer ) );
       }
 
-      if ( mContext.testFlag( QgsWmsRenderContext::UseOpacity ) )
-      {
-        setLayerOpacity( layer, param.mOpacity );
-      }
-
       if ( mContext.testFlag( QgsWmsRenderContext::UseFilter ) )
       {
         setLayerFilter( layer, param.mFilter );