Merge pull request #6251 from elpaso/bugfix-17975-server-layer-groups-order

elpaso · web-flow · commit 7bf0a7f7145d · 2018-02-05T09:24:37.000+01:00
[bugfix][server] WMS respect order of grouped layers
diff --git a/src/server/services/wms/qgswmsrenderer.cpp b/src/server/services/wms/qgswmsrenderer.cpp
@@ -2612,7 +2612,7 @@ namespace QgsWms
                 {
                   layer->readSld( namedElem, err );
                   layer->setCustomProperty( "readSLD", true );
-                  layers.append( layer );
+                  layers.insert( 0, layer );
                 }
               }
             }
@@ -2676,7 +2676,7 @@ namespace QgsWms
                 throw QgsMapServiceException( QStringLiteral( "StyleNotDefined" ), QStringLiteral( "Style \"%1\" does not exist for layer \"%2\"" ).arg( style, layerNickname( *layer ) ) );
               }
             }
-            layers.append( layer );
+            layers.insert( 0, layer );
           }
         }
       }
diff --git a/tests/src/python/test_qgsserver_wms_getmap.py b/tests/src/python/test_qgsserver_wms_getmap.py
@@ -890,12 +890,15 @@ def test_wms_getmap_sld(self):
         self._img_diff_error(r, h, "WMS_GetMap_SLDRestored")
 
     def test_wms_getmap_group(self):
+        """A WMS shall render the requested layers by drawing the leftmost in the list 
+        bottommost, the next one over that, and so on."""
+
         qs = "?" + "&".join(["%s=%s" % i for i in list({
             "MAP": urllib.parse.quote(self.projectGroupsPath),
             "SERVICE": "WMS",
             "VERSION": "1.1.1",
             "REQUEST": "GetMap",
-            "LAYERS": "Country,Country_Labels,Country_Diagrams",
+            "LAYERS": "Country_Diagrams,Country_Labels,Country",
             "STYLES": "",
             "FORMAT": "image/png",
             "BBOX": "-16817707,-4710778,5696513,14587125",
@@ -921,6 +924,16 @@ def test_wms_getmap_group(self):
         }.items())])
 
         r_group, _ = self._result(self._execute_request(qs))
+
+        """ Debug check:
+        f = open('grouped.png', 'wb+')
+        f.write(r_group)
+        f.close()
+        f = open('individual.png', 'wb+')
+        f.write(r_individual)
+        f.close()
+        #"""
+
         self.assertEqual(r_individual, r_group, 'Individual layers query and group layers query results should be identical')
 
         qs = "?" + "&".join(["%s=%s" % i for i in list({

Original file line number	Diff line number	Diff line change
`@@ -2612,7 +2612,7 @@ namespace QgsWms`
`2612`	`2612`	`{`
`2613`	`2613`	`layer->readSld( namedElem, err );`
`2614`	`2614`	`layer->setCustomProperty( "readSLD", true );`
`2615`		`- layers.append( layer );`
	`2615`	`+ layers.insert( 0, layer );`
`2616`	`2616`	`}`
`2617`	`2617`	`}`
`2618`	`2618`	`}`
`@@ -2676,7 +2676,7 @@ namespace QgsWms`
`2676`	`2676`	`throw QgsMapServiceException( QStringLiteral( "StyleNotDefined" ), QStringLiteral( "Style \"%1\" does not exist for layer \"%2\"" ).arg( style, layerNickname( *layer ) ) );`
`2677`	`2677`	`}`
`2678`	`2678`	`}`
`2679`		`- layers.append( layer );`
	`2679`	`+ layers.insert( 0, layer );`
`2680`	`2680`	`}`
`2681`	`2681`	`}`
`2682`	`2682`	`}`