[bugfix][server] WMS respect order of SLD grouped layers

elpaso · elpaso · commit d7ef689c00fb · 2018-02-02T11:07:30.000+01:00
diff --git a/src/server/services/wms/qgswmsrenderer.cpp b/src/server/services/wms/qgswmsrenderer.cpp
@@ -2606,8 +2606,10 @@ namespace QgsWms
             }
             else if ( mLayerGroups.contains( lname ) )
             {
-              for ( QgsMapLayer *layer : mLayerGroups[lname] )
+              // Reverse order for group members
+              for ( auto it = mLayerGroups[lname].rbegin(); it !=  mLayerGroups[lname].rend(); ++it )
               {
+                QgsMapLayer *layer = *it;
                 if ( !mRestrictedLayers.contains( layerNickname( *layer ) ) )
                 {
                   layer->readSld( namedElem, err );
@@ -2664,6 +2666,7 @@ namespace QgsWms
       }
       else if ( mLayerGroups.contains( nickname ) )
       {
+        // Reverse order for group members
         for ( auto it = mLayerGroups[nickname].rbegin(); it !=  mLayerGroups[nickname].rend(); ++it )
         {
           QgsMapLayer *layer = *it;

Original file line number	Diff line number	Diff line change
`@@ -2606,8 +2606,10 @@ namespace QgsWms`
`2606`	`2606`	`}`
`2607`	`2607`	`else if ( mLayerGroups.contains( lname ) )`
`2608`	`2608`	`{`
`2609`		`- for ( QgsMapLayer *layer : mLayerGroups[lname] )`
	`2609`	`+ // Reverse order for group members`
	`2610`	`+ for ( auto it = mLayerGroups[lname].rbegin(); it != mLayerGroups[lname].rend(); ++it )`
`2610`	`2611`	`{`
	`2612`	`+ QgsMapLayer layer = it;`
`2611`	`2613`	`if ( !mRestrictedLayers.contains( layerNickname( *layer ) ) )`
`2612`	`2614`	`{`
`2613`	`2615`	`layer->readSld( namedElem, err );`
`@@ -2664,6 +2666,7 @@ namespace QgsWms`
`2664`	`2666`	`}`
`2665`	`2667`	`else if ( mLayerGroups.contains( nickname ) )`
`2666`	`2668`	`{`
	`2669`	`+ // Reverse order for group members`
`2667`	`2670`	`for ( auto it = mLayerGroups[nickname].rbegin(); it != mLayerGroups[nickname].rend(); ++it )`
`2668`	`2671`	`{`
`2669`	`2672`	`QgsMapLayer layer = it;`