Merge pull request #8793 from elpaso/bugfix-20693-server-LAYERTITLESPACE

[server] Respect layer title space when rendering legends

Author: elpaso

src/core/qgslegendrenderer.cpp

@@ -543,6 +543,7 @@ QSizeF QgsLegendRenderer::drawLayerTitle( QgsLayerTreeLayer *nodeLayer, QPainter
     }
   }
   size.rheight() = y - point.y();
+  size.rheight() += mSettings.style( nodeLegendStyle( nodeLayer ) ).margin( QgsLegendStyle::Side::Bottom );
 
   return size;
 }

src/server/services/wms/qgswmsparameters.cpp

@@ -1109,12 +1109,13 @@ namespace QgsWms
     settings.setBoxSpace( boxSpaceAsDouble() );
     settings.setSymbolSize( QSizeF( symbolWidthAsDouble(), symbolHeightAsDouble() ) );
 
-    settings.rstyle( QgsLegendStyle::Subgroup ).setMargin( QgsLegendStyle::Top, layerSpaceAsDouble() );
-    settings.rstyle( QgsLegendStyle::Subgroup ).setFont( layerFont() );
+    settings.rstyle( QgsLegendStyle::Style::Subgroup ).setMargin( QgsLegendStyle::Side::Top, layerSpaceAsDouble() );
+    settings.rstyle( QgsLegendStyle::Style::Subgroup ).setMargin( QgsLegendStyle::Side::Bottom, layerTitleSpaceAsDouble() );
+    settings.rstyle( QgsLegendStyle::Style::Subgroup ).setFont( layerFont() );
 
-    settings.rstyle( QgsLegendStyle::SymbolLabel ).setFont( itemFont() );
-    settings.rstyle( QgsLegendStyle::Symbol ).setMargin( QgsLegendStyle::Top, symbolSpaceAsDouble() );
-    settings.rstyle( QgsLegendStyle::SymbolLabel ).setMargin( QgsLegendStyle::Left, iconLabelSpaceAsDouble() );
+    settings.rstyle( QgsLegendStyle::Style::SymbolLabel ).setFont( itemFont() );
+    settings.rstyle( QgsLegendStyle::Style::Symbol ).setMargin( QgsLegendStyle::Side::Top, symbolSpaceAsDouble() );
+    settings.rstyle( QgsLegendStyle::Style::SymbolLabel ).setMargin( QgsLegendStyle::Side::Left, iconLabelSpaceAsDouble() );
 
     return settings;
   }

tests/src/python/test_qgsserver.py

@@ -185,6 +185,10 @@ def _img_diff(self, image, control_image, max_diff, max_size_diff=QSize()):
         return control.compareImages(control_image, max_diff), control.report()
 
     def _img_diff_error(self, response, headers, image, max_diff=100, max_size_diff=QSize()):
+
+        reference_path = unitTestDataPath('control_images') + '/qgis_server/' + image + '/' + image + '.png'
+        self.store_reference(reference_path, response)
+
         self.assertEqual(
             headers.get("Content-Type"), "image/png",
             "Content type is wrong: %s\n%s" % (headers.get("Content-Type"), response))

tests/src/python/test_qgsserver_accesscontrol.py

@@ -217,6 +217,10 @@ def _img_diff(self, image, control_image, max_diff, max_size_diff=QSize()):
         return control.compareImages(control_image), control.report()
 
     def _img_diff_error(self, response, headers, image, max_diff=10, max_size_diff=QSize()):
+
+        reference_path = unitTestDataPath('control_images') + '/qgis_server_accesscontrol/' + image + '/' + image + '.png'
+        self.store_reference(reference_path, response)
+
         self.assertEqual(
             headers.get("Content-Type"), "image/png",
             "Content type is wrong: %s" % headers.get("Content-Type"))

tests/src/python/test_qgsserver_accesscontrol_wms_getlegendgraphic.py

@@ -24,6 +24,9 @@
 
 class TestQgsServerAccessControlWMSGetlegendgraphic(TestQgsServerAccessControl):
 
+    # Set to True to re-generate reference files for this class
+    #regenerate_reference = True
+
     def test_wms_getlegendgraphic_hello(self):
         query_string = "&".join(["%s=%s" % i for i in list({
             "MAP": urllib.parse.quote(self.projectPath),

tests/src/python/test_qgsserver_wms_getlegendgraphic.py

@@ -40,9 +40,11 @@
 
 
 class TestQgsServerWMSGetLegendGraphic(QgsServerTestBase):
-
     """QGIS Server WMS Tests for GetLegendGraphic request"""
 
+    # Set to True to re-generate reference files for this class
+    #regenerate_reference = True
+
     def test_getLegendGraphics(self):
         """Test that does not return an exception but an image"""
         parms = {
@@ -103,7 +105,31 @@ def test_wms_GetLegendGraphic_LayerSpace(self):
         }.items())])
 
         r, h = self._result(self._execute_request(qs))
-        self._img_diff_error(r, h, "WMS_GetLegendGraphic_LayerSpace")
+        self._img_diff_error(r, h, "WMS_GetLegendGraphic_LayerSpace", max_size_diff=QSize(1, 1))
+
+    def test_wms_GetLegendGraphic_LayerTitleSpace(self):
+        qs = "?" + "&".join(["%s=%s" % i for i in list({
+            "MAP": urllib.parse.quote(self.projectPath),
+            "SERVICE": "WMS",
+            "VERSION": "1.1.1",
+            "REQUEST": "GetLegendGraphic",
+            "LAYER": "Country,Hello",
+            "FORMAT": "image/png",
+            # "HEIGHT": "500",
+            # "WIDTH": "500",
+            "LAYERTITLESPACE": "20.0",
+            "LAYERFONTBOLD": "TRUE",
+            "LAYERFONTSIZE": "30",
+            "ITEMFONTBOLD": "TRUE",
+            "ITEMFONTSIZE": "20",
+            "LAYERFONTFAMILY": self.fontFamily,
+            "ITEMFONTFAMILY": self.fontFamily,
+            "LAYERTITLE": "TRUE",
+            "CRS": "EPSG:3857"
+        }.items())])
+
+        r, h = self._result(self._execute_request(qs))
+        self._img_diff_error(r, h, "WMS_GetLegendGraphic_LayerTitleSpace")
 
     def test_wms_GetLegendGraphic_ShowFeatureCount(self):
         qs = "?" + "&".join(["%s=%s" % i for i in list({