Merge pull request #35277 from rldhont/server-wms-getprint-group-layer

[Tests][Server] WMS GetPrint group
qgis · Apr 22, 2020 · a48474d · a48474d
2 parents 78639b8 + a06984c
commit a48474d
Show file tree

Hide file tree

Showing 7 changed files with 2,286 additions and 2,160 deletions.
diff --git a/src/server/services/wms/qgswmsrendercontext.cpp b/src/server/services/wms/qgswmsrendercontext.cpp
@@ -287,6 +287,19 @@ bool QgsWmsRenderContext::isValidLayer( const QString &nickname ) const
   return layer( nickname ) != nullptr;
 }
 
+QList<QgsMapLayer *> QgsWmsRenderContext::layersFromGroup( const QString &nickname ) const
+{
+  QList<QgsMapLayer *> layers;
+  if ( mLayerGroups.contains( nickname ) )
+  {
+    for ( QgsMapLayer *layer : mLayerGroups[nickname] )
+    {
+      layers.append( layer );
+    }
+  }
+  return layers;
+}
+
 bool QgsWmsRenderContext::isValidGroup( const QString &name ) const
 {
   return mLayerGroups.contains( name );

diff --git a/src/server/services/wms/qgswmsrendercontext.h b/src/server/services/wms/qgswmsrendercontext.h
@@ -178,6 +178,12 @@ namespace QgsWms
        */
       bool isValidLayer( const QString &nickname ) const;
 
+      /**
+       * Returns the group's layers list corresponding to the nickname, or
+       * an empty list if not found.
+       */
+      QList<QgsMapLayer *> layersFromGroup( const QString &nickname ) const;
+
       /**
        * Returns true if \a name is a group.
        */

diff --git a/src/server/services/wms/qgswmsrenderer.cpp b/src/server/services/wms/qgswmsrenderer.cpp
@@ -611,15 +611,38 @@ namespace QgsWms
           QList<QgsMapLayer *> layerSet;
           for ( auto layer : cMapParams.mLayers )
           {
-            QgsMapLayer *mlayer = mContext.layer( layer.mNickname );
-
-            if ( ! mlayer )
+            if ( mContext.isValidGroup( layer.mNickname ) )
             {
-              continue;
+              QList<QgsMapLayer *> layersFromGroup;
+
+              for ( QgsMapLayer *layer : mContext.layersFromGroup( layer.mNickname ) )
+              {
+
+                if ( ! layer )
+                {
+                  continue;
+                }
+
+                layersFromGroup.push_front( layer );
+              }
+
+              if ( !layersFromGroup.isEmpty() )
+              {
+                layerSet.append( layersFromGroup );
+              }
             }
+            else
+            {
+              QgsMapLayer *mlayer = mContext.layer( layer.mNickname );
 
-            setLayerStyle( mlayer, layer.mStyle );
-            layerSet << mlayer;
+              if ( ! mlayer )
+              {
+                continue;
+              }
+
+              setLayerStyle( mlayer, layer.mStyle );
+              layerSet << mlayer;
+            }
           }
 
           layerSet << externalLayers( cMapParams.mExternalLayers );

diff --git a/tests/src/python/test_qgsserver_wms_getprint.py b/tests/src/python/test_qgsserver_wms_getprint.py
@@ -355,6 +355,48 @@ def test_wms_getprint_style(self):
         r, h = self._result(self._execute_request(qs))
         self._img_diff_error(r, h, "WMS_GetPrint_StyleCustom")
 
+    def test_wms_getprint_group(self):
+        qs = "?" + "&".join(["%s=%s" % i for i in list({
+            "MAP": urllib.parse.quote(self.projectGroupsPath),
+            "SERVICE": "WMS",
+            "VERSION": "1.1.1",
+            "REQUEST": "GetPrint",
+            "TEMPLATE": "layoutA4",
+            "FORMAT": "png",
+            "map0:EXTENT": "-33626185.498,-13032965.185,33978427.737,16020257.031",
+            "map0:LAYERS": "Country_Diagrams,Country_Labels,Country",
+            "CRS": "EPSG:3857"
+        }.items())])
+
+        r_individual, _ = self._result(self._execute_request(qs))
+
+        qs = "?" + "&".join(["%s=%s" % i for i in list({
+            "MAP": urllib.parse.quote(self.projectGroupsPath),
+            "SERVICE": "WMS",
+            "VERSION": "1.1.1",
+            "REQUEST": "GetPrint",
+            "TEMPLATE": "layoutA4",
+            "FORMAT": "png",
+            "map0:EXTENT": "-33626185.498,-13032965.185,33978427.737,16020257.031",
+            "map0:LAYERS": "CountryGroup",
+            "CRS": "EPSG:3857"
+        }.items())])
+
+        r_group, h = 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')
+
+        self._img_diff_error(r_group, h, "WMS_GetPrint_Group")
+
     def test_wms_getprint_legend(self):
         qs = "?" + "&".join(["%s=%s" % i for i in list({
             "MAP": urllib.parse.quote(self.projectPath),

diff --git a/...s/testdata/control_images/qgis_server/WMS_GetPrint_Group/WMS_GetPrint_Group.png b/...s/testdata/control_images/qgis_server/WMS_GetPrint_Group/WMS_GetPrint_Group.png
diff --git a/...tdata/control_images/qgis_server/WMS_GetPrint_Group/WMS_GetPrint_Group_mask.png b/...tdata/control_images/qgis_server/WMS_GetPrint_Group/WMS_GetPrint_Group_mask.png