[BUGFIX][QGIS Server] Laye order from group in GetPrint

rldhont · rldhont · commit 8347a4beaf5a · 2015-10-26T17:37:03.000+01:00
Since QGIS 2.8, QGIS Server rendered layers form group in reverted order.
diff --git a/src/server/qgswmsconfigparser.cpp b/src/server/qgswmsconfigparser.cpp
@@ -132,24 +132,34 @@ QgsComposition* QgsWMSConfigParser::createPrintComposition( const QString& compo
     if ( !layers.isEmpty() )
     {
       QStringList layerSet;
-      QStringList wmsLayerList = layers.split( "," );
+      QStringList wmsLayerList = layers.split( ",", QString::SkipEmptyParts );
       QStringList wmsStyleList;
 
       if ( !styles.isEmpty() )
       {
-        wmsStyleList = styles.split( "," );
+        wmsStyleList = styles.split( ",", QString::SkipEmptyParts );
       }
 
       for ( int i = 0; i < wmsLayerList.size(); ++i )
       {
+        QString wmsLayer = wmsLayerList.at( i );
         QString styleName;
         if ( wmsStyleList.size() > i )
         {
           styleName = wmsStyleList.at( i );
         }
+        
+        bool allowCaching = true;
+        if ( wmsLayerList.count( wmsLayer ) > 1 )
+        {
+          allowCaching = false;
+        }
 
-        Q_FOREACH ( QgsMapLayer *layer, mapLayerFromStyle( wmsLayerList.at( i ), styleName ) )
+        QList<QgsMapLayer*> layerList = mapLayerFromStyle( wmsLayer, styleName, allowCaching );
+        int listIndex;
+        for ( listIndex = layerList.size() - 1; listIndex >= 0; listIndex-- )
         {
+          QgsMapLayer* layer = layerList.at( listIndex );
           if ( layer )
           {
             layerSet.push_back( layer->id() );

Original file line number	Diff line number	Diff line change
`@@ -132,24 +132,34 @@ QgsComposition* QgsWMSConfigParser::createPrintComposition( const QString& compo`
`132`	`132`	`if ( !layers.isEmpty() )`
`133`	`133`	`{`
`134`	`134`	`QStringList layerSet;`
`135`		`- QStringList wmsLayerList = layers.split( "," );`
	`135`	`+ QStringList wmsLayerList = layers.split( ",", QString::SkipEmptyParts );`
`136`	`136`	`QStringList wmsStyleList;`
`137`	`137`
`138`	`138`	`if ( !styles.isEmpty() )`
`139`	`139`	`{`
`140`		`- wmsStyleList = styles.split( "," );`
	`140`	`+ wmsStyleList = styles.split( ",", QString::SkipEmptyParts );`
`141`	`141`	`}`
`142`	`142`
`143`	`143`	`for ( int i = 0; i < wmsLayerList.size(); ++i )`
`144`	`144`	`{`
	`145`	`+ QString wmsLayer = wmsLayerList.at( i );`
`145`	`146`	`QString styleName;`
`146`	`147`	`if ( wmsStyleList.size() > i )`
`147`	`148`	`{`
`148`	`149`	`styleName = wmsStyleList.at( i );`
`149`	`150`	`}`
	`151`	`+`
	`152`	`+ bool allowCaching = true;`
	`153`	`+ if ( wmsLayerList.count( wmsLayer ) > 1 )`
	`154`	`+ {`
	`155`	`+ allowCaching = false;`
	`156`	`+ }`
`150`	`157`
`151`		`- Q_FOREACH ( QgsMapLayer *layer, mapLayerFromStyle( wmsLayerList.at( i ), styleName ) )`
	`158`	`+ QList<QgsMapLayer*> layerList = mapLayerFromStyle( wmsLayer, styleName, allowCaching );`
	`159`	`+ int listIndex;`
	`160`	`+ for ( listIndex = layerList.size() - 1; listIndex >= 0; listIndex-- )`
`152`	`161`	`{`
	`162`	`+ QgsMapLayer* layer = layerList.at( listIndex );`
`153`	`163`	`if ( layer )`
`154`	`164`	`{`
`155`	`165`	`layerSet.push_back( layer->id() );`