diff --git a/src/server/services/wms/qgswmsgetlegendgraphics.cpp b/src/server/services/wms/qgswmsgetlegendgraphics.cpp index c6d5bf56c36..8de791e6a1f 100644 --- a/src/server/services/wms/qgswmsgetlegendgraphics.cpp +++ b/src/server/services/wms/qgswmsgetlegendgraphics.cpp @@ -275,7 +275,6 @@ namespace QgsWms // layer titles - hidden or not QgsLegendRenderer::setNodeLegendStyle( nodeLayer, parameters.layerTitleAsBool() ? QgsLegendStyle::Subgroup : QgsLegendStyle::Hidden ); - // rule item titles if ( !parameters.ruleLabelAsBool() ) { @@ -285,7 +284,7 @@ namespace QgsWms legendNode->setUserLabel( QStringLiteral( " " ) ); } } - else if ( !parameters.layerTitleAsBool() ) + else if ( !parameters.layerTitleAsBool() && model->layerLegendNodes( nodeLayer, true ).count() ) { for ( QgsLayerTreeModelLegendNode *legendNode : model->layerLegendNodes( nodeLayer ) ) { diff --git a/tests/src/python/test_qgsserver_cachemanager.py b/tests/src/python/test_qgsserver_cachemanager.py index 7d381e12d12..f8aba475867 100644 --- a/tests/src/python/test_qgsserver_cachemanager.py +++ b/tests/src/python/test_qgsserver_cachemanager.py @@ -333,6 +333,7 @@ class TestQgsServerCacheManager(QgsServerTestBase): "REQUEST": "GetLegendGraphic", "LAYER": "Country,Hello", "LAYERTITLE": "FALSE", + "RULELABEL": "FALSE", "FORMAT": "image/png", "HEIGHT": "500", "WIDTH": "500", diff --git a/tests/src/python/test_qgsserver_wms_getlegendgraphic.py b/tests/src/python/test_qgsserver_wms_getlegendgraphic.py index 453ba04f064..fd6e5216ede 100644 --- a/tests/src/python/test_qgsserver_wms_getlegendgraphic.py +++ b/tests/src/python/test_qgsserver_wms_getlegendgraphic.py @@ -93,6 +93,7 @@ class TestQgsServerWMSGetLegendGraphic(TestQgsServerWMSTestBase): "REQUEST": "GetLegendGraphic", "LAYER": "Country,Hello,db_point", "LAYERTITLE": "FALSE", + "RULELABEL": "FALSE", "FORMAT": "image/png", "HEIGHT": "500", "WIDTH": "500", @@ -174,11 +175,34 @@ class TestQgsServerWMSGetLegendGraphic(TestQgsServerWMSTestBase): 'ITEMFONTFAMILY': self.fontFamily, 'ITEMFONTSIZE': '20', 'LAYERTITLE': 'TRUE', + 'RULELABEL': 'TRUE' } qs = '?' + '&'.join([u"%s=%s" % (k, v) for k, v in parms.items()]) r, h = self._result(self._execute_request(qs)) self._img_diff_error(r, h, "WMS_GetLegendGraphic_test", 250, QSize(15, 15)) + # no set of LAYERTITLE and RULELABEL means they are true + parms = { + 'MAP': self.testdata_path + "test_project.qgs", + 'SERVICE': 'WMS', + 'VERSION': '1.3.0', + 'REQUEST': 'GetLegendGraphic', + 'FORMAT': 'image/png', + # 'WIDTH': '20', # optional + # 'HEIGHT': '20', # optional + 'LAYER': u'testlayer%20èé', + 'LAYERFONTBOLD': 'TRUE', + 'LAYERFONTSIZE': '30', + 'ITEMFONTBOLD': 'TRUE', + 'LAYERFONTFAMILY': self.fontFamily, + 'ITEMFONTFAMILY': self.fontFamily, + 'ITEMFONTSIZE': '20' + } + qs = '?' + '&'.join([u"%s=%s" % (k, v) for k, v in parms.items()]) + r, h = self._result(self._execute_request(qs)) + + self._img_diff_error(r, h, "WMS_GetLegendGraphic_test", 250, QSize(15, 15)) + parms = { 'MAP': self.testdata_path + "test_project.qgs", 'SERVICE': 'WMS', @@ -189,6 +213,7 @@ class TestQgsServerWMSGetLegendGraphic(TestQgsServerWMSTestBase): # 'HEIGHT': '20', # optional 'LAYER': u'testlayer%20èé', 'LAYERTITLE': 'FALSE', + 'RULELABEL': 'FALSE' } qs = '?' + '&'.join([u"%s=%s" % (k, v) for k, v in parms.items()]) r, h = self._result(self._execute_request(qs)) @@ -205,15 +230,15 @@ class TestQgsServerWMSGetLegendGraphic(TestQgsServerWMSTestBase): 'LAYER': u'testlayer%20èé', 'LAYERFONTBOLD': 'TRUE', 'LAYERFONTSIZE': '30', - 'LAYERFONTFAMILY': self.fontFamily, - 'ITEMFONTFAMILY': self.fontFamily, 'ITEMFONTBOLD': 'TRUE', 'ITEMFONTSIZE': '20', - 'RULELABEL': 'TRUE', + 'LAYERFONTFAMILY': self.fontFamily, + 'ITEMFONTFAMILY': self.fontFamily, + 'RULELABEL': 'FALSE' } qs = '?' + '&'.join([u"%s=%s" % (k, v) for k, v in parms.items()]) r, h = self._result(self._execute_request(qs)) - self._img_diff_error(r, h, "WMS_GetLegendGraphic_test", 250, QSize(15, 15)) + self._img_diff_error(r, h, "WMS_GetLegendGraphic_rulelabel_false", 250, QSize(15, 15)) parms = { 'MAP': self.testdata_path + "test_project.qgs", @@ -228,11 +253,32 @@ class TestQgsServerWMSGetLegendGraphic(TestQgsServerWMSTestBase): 'ITEMFONTSIZE': '20', 'LAYERFONTFAMILY': self.fontFamily, 'ITEMFONTFAMILY': self.fontFamily, - 'RULELABEL': 'FALSE', + 'LAYERTITLE': 'FALSE', + 'RULELABEL': 'TRUE' } qs = '?' + '&'.join([u"%s=%s" % (k, v) for k, v in parms.items()]) r, h = self._result(self._execute_request(qs)) - self._img_diff_error(r, h, "WMS_GetLegendGraphic_rulelabel_false", 250, QSize(15, 15)) + self._img_diff_error(r, h, "WMS_GetLegendGraphic_rulelabel_true", 250, QSize(15, 15)) + + # no set of RULELABEL means it is true + parms = { + 'MAP': self.testdata_path + "test_project.qgs", + 'SERVICE': 'WMS', + 'VERSION': '1.3.0', + 'REQUEST': 'GetLegendGraphic', + 'FORMAT': 'image/png', + 'LAYER': u'testlayer%20èé', + 'LAYERFONTBOLD': 'TRUE', + 'LAYERFONTSIZE': '30', + 'ITEMFONTBOLD': 'TRUE', + 'ITEMFONTSIZE': '20', + 'LAYERFONTFAMILY': self.fontFamily, + 'ITEMFONTFAMILY': self.fontFamily, + 'LAYERTITLE': 'FALSE' + } + qs = '?' + '&'.join([u"%s=%s" % (k, v) for k, v in parms.items()]) + r, h = self._result(self._execute_request(qs)) + self._img_diff_error(r, h, "WMS_GetLegendGraphic_rulelabel_true", 250, QSize(15, 15)) def test_wms_getLegendGraphics_rule(self): """Test that does not return an exception but an image""" @@ -274,6 +320,7 @@ class TestQgsServerWMSGetLegendGraphic(TestQgsServerWMSTestBase): "REQUEST": "GetLegendGraphic", "LAYER": "Country,Hello", "LAYERTITLE": "FALSE", + "RULELABEL": "FALSE", "FORMAT": "image/png", "HEIGHT": "500", "WIDTH": "500", @@ -291,6 +338,7 @@ class TestQgsServerWMSGetLegendGraphic(TestQgsServerWMSTestBase): "REQUEST": "GetLegendGraphic", "LAYER": "Country,Hello", "LAYERTITLE": "FALSE", + "RULELABEL": "FALSE", "FORMAT": "image/png", "HEIGHT": "500", "WIDTH": "500", @@ -309,6 +357,7 @@ class TestQgsServerWMSGetLegendGraphic(TestQgsServerWMSTestBase): "REQUEST": "GetLegendGraphic", "LAYER": "Country,Hello", "LAYERTITLE": "FALSE", + "RULELABEL": "FALSE", "FORMAT": "image/png", "HEIGHT": "500", "WIDTH": "500", @@ -326,6 +375,7 @@ class TestQgsServerWMSGetLegendGraphic(TestQgsServerWMSTestBase): "REQUEST": "GetLegendGraphic", "LAYER": "Country,Hello", "LAYERTITLE": "FALSE", + "RULELABEL": "FALSE", "FORMAT": "image/png", "HEIGHT": "500", "WIDTH": "500", @@ -344,6 +394,7 @@ class TestQgsServerWMSGetLegendGraphic(TestQgsServerWMSTestBase): "REQUEST": "GetLegendGraphic", "LAYER": "Country,Hello", "LAYERTITLE": "FALSE", + "RULELABEL": "FALSE", "BOXSPACE": "100", "FORMAT": "image/png", "HEIGHT": "500", @@ -362,6 +413,7 @@ class TestQgsServerWMSGetLegendGraphic(TestQgsServerWMSTestBase): "REQUEST": "GetLegendGraphic", "LAYER": "Country,Hello", "LAYERTITLE": "FALSE", + "RULELABEL": "FALSE", "SYMBOLSPACE": "100", "FORMAT": "image/png", "HEIGHT": "500", @@ -380,6 +432,7 @@ class TestQgsServerWMSGetLegendGraphic(TestQgsServerWMSTestBase): "REQUEST": "GetLegendGraphic", "LAYER": "Country,Hello", "LAYERTITLE": "FALSE", + "RULELABEL": "FALSE", "ICONLABELSPACE": "100", "FORMAT": "image/png", "HEIGHT": "500", @@ -398,6 +451,7 @@ class TestQgsServerWMSGetLegendGraphic(TestQgsServerWMSTestBase): "REQUEST": "GetLegendGraphic", "LAYER": "Country,Hello", "LAYERTITLE": "FALSE", + "RULELABEL": "FALSE", "SYMBOLWIDTH": "50", "SYMBOLHEIGHT": "30", "FORMAT": "image/png", @@ -465,6 +519,7 @@ class TestQgsServerWMSGetLegendGraphic(TestQgsServerWMSTestBase): "REQUEST": "GetLegendGraphic", "LAYER": "Country,Hello,db_point", "LAYERTITLE": "FALSE", + "RULELABEL": "FALSE", "FORMAT": "image/png", "SRCHEIGHT": "500", "SRCWIDTH": "500", @@ -483,6 +538,7 @@ class TestQgsServerWMSGetLegendGraphic(TestQgsServerWMSTestBase): "REQUEST": "GetLegendGraphic", "LAYER": "Country,Hello,db_point", "LAYERTITLE": "FALSE", + "RULELABEL": "FALSE", "FORMAT": "image/png", "SRCHEIGHT": "500", "SRCWIDTH": "500", @@ -501,6 +557,7 @@ class TestQgsServerWMSGetLegendGraphic(TestQgsServerWMSTestBase): "REQUEST": "GetLegendGraphic", "LAYER": "Country,Hello,db_point", "LAYERTITLE": "FALSE", + "RULELABEL": "FALSE", "FORMAT": "image/png", "HEIGHT": "500", "WIDTH": "500", @@ -519,6 +576,7 @@ class TestQgsServerWMSGetLegendGraphic(TestQgsServerWMSTestBase): "REQUEST": "GetLegendGraphic", "LAYER": "Country,Hello,db_point", "LAYERTITLE": "FALSE", + "RULELABEL": "FALSE", "FORMAT": "image/png", "HEIGHT": "500", "WIDTH": "500", diff --git a/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_BBox/WMS_GetLegendGraphic_BBox.png b/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_BBox/WMS_GetLegendGraphic_BBox.png index 0528e60ecca..d99bdb5efe3 100644 Binary files a/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_BBox/WMS_GetLegendGraphic_BBox.png and b/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_BBox/WMS_GetLegendGraphic_BBox.png differ diff --git a/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_BBox2/WMS_GetLegendGraphic_BBox2.png b/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_BBox2/WMS_GetLegendGraphic_BBox2.png index 60cee95ca96..5319c86e6ac 100644 Binary files a/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_BBox2/WMS_GetLegendGraphic_BBox2.png and b/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_BBox2/WMS_GetLegendGraphic_BBox2.png differ diff --git a/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_Background/WMS_GetLegendGraphic_Background.png b/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_Background/WMS_GetLegendGraphic_Background.png index 95547bad7e3..553223becce 100644 Binary files a/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_Background/WMS_GetLegendGraphic_Background.png and b/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_Background/WMS_GetLegendGraphic_Background.png differ diff --git a/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_Background_Hex/WMS_GetLegendGraphic_Background_Hex.png b/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_Background_Hex/WMS_GetLegendGraphic_Background_Hex.png index 95547bad7e3..553223becce 100644 Binary files a/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_Background_Hex/WMS_GetLegendGraphic_Background_Hex.png and b/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_Background_Hex/WMS_GetLegendGraphic_Background_Hex.png differ diff --git a/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_Basic/WMS_GetLegendGraphic_Basic.png b/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_Basic/WMS_GetLegendGraphic_Basic.png index 60cee95ca96..5319c86e6ac 100644 Binary files a/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_Basic/WMS_GetLegendGraphic_Basic.png and b/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_Basic/WMS_GetLegendGraphic_Basic.png differ diff --git a/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_BoxSpace/WMS_GetLegendGraphic_BoxSpace.png b/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_BoxSpace/WMS_GetLegendGraphic_BoxSpace.png index d5b039c84d2..668313e1e11 100644 Binary files a/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_BoxSpace/WMS_GetLegendGraphic_BoxSpace.png and b/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_BoxSpace/WMS_GetLegendGraphic_BoxSpace.png differ diff --git a/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_IconLabelSpace/WMS_GetLegendGraphic_IconLabelSpace.png b/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_IconLabelSpace/WMS_GetLegendGraphic_IconLabelSpace.png index b6748796ee0..3f289c9baf0 100644 Binary files a/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_IconLabelSpace/WMS_GetLegendGraphic_IconLabelSpace.png and b/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_IconLabelSpace/WMS_GetLegendGraphic_IconLabelSpace.png differ diff --git a/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_NoWidthNoHeight/WMS_GetLegendGraphic_NoWidthNoHeight.png b/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_NoWidthNoHeight/WMS_GetLegendGraphic_NoWidthNoHeight.png index dfbe0fa1646..dc4b21b0a09 100644 Binary files a/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_NoWidthNoHeight/WMS_GetLegendGraphic_NoWidthNoHeight.png and b/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_NoWidthNoHeight/WMS_GetLegendGraphic_NoWidthNoHeight.png differ diff --git a/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_Regression32020_type1/WMS_GetLegendGraphic_Regression32020_type1.png b/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_Regression32020_type1/WMS_GetLegendGraphic_Regression32020_type1.png index 6d8f2449fcc..9e0f46116a6 100644 Binary files a/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_Regression32020_type1/WMS_GetLegendGraphic_Regression32020_type1.png and b/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_Regression32020_type1/WMS_GetLegendGraphic_Regression32020_type1.png differ diff --git a/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_Regression32020_type1_and_3/WMS_GetLegendGraphic_Regression32020_type1_and_3.png b/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_Regression32020_type1_and_3/WMS_GetLegendGraphic_Regression32020_type1_and_3.png index b3d72726d9f..77be829f234 100644 Binary files a/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_Regression32020_type1_and_3/WMS_GetLegendGraphic_Regression32020_type1_and_3.png and b/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_Regression32020_type1_and_3/WMS_GetLegendGraphic_Regression32020_type1_and_3.png differ diff --git a/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_Regression32020_type2/WMS_GetLegendGraphic_Regression32020_type2.png b/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_Regression32020_type2/WMS_GetLegendGraphic_Regression32020_type2.png index e2d5d3ef530..790a2744a93 100644 Binary files a/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_Regression32020_type2/WMS_GetLegendGraphic_Regression32020_type2.png and b/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_Regression32020_type2/WMS_GetLegendGraphic_Regression32020_type2.png differ diff --git a/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_Regression32020_type2_3857/WMS_GetLegendGraphic_Regression32020_type2_3857.png b/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_Regression32020_type2_3857/WMS_GetLegendGraphic_Regression32020_type2_3857.png index e2d5d3ef530..790a2744a93 100644 Binary files a/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_Regression32020_type2_3857/WMS_GetLegendGraphic_Regression32020_type2_3857.png and b/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_Regression32020_type2_3857/WMS_GetLegendGraphic_Regression32020_type2_3857.png differ diff --git a/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_Regression32020_type2_and_3/WMS_GetLegendGraphic_Regression32020_type2_and_3.png b/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_Regression32020_type2_and_3/WMS_GetLegendGraphic_Regression32020_type2_and_3.png index dce98c9b1ff..1eb76a90be7 100644 Binary files a/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_Regression32020_type2_and_3/WMS_GetLegendGraphic_Regression32020_type2_and_3.png and b/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_Regression32020_type2_and_3/WMS_GetLegendGraphic_Regression32020_type2_and_3.png differ diff --git a/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_SymbolSize/WMS_GetLegendGraphic_SymbolSize.png b/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_SymbolSize/WMS_GetLegendGraphic_SymbolSize.png index 9a5059fe825..a0c41a7f539 100644 Binary files a/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_SymbolSize/WMS_GetLegendGraphic_SymbolSize.png and b/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_SymbolSize/WMS_GetLegendGraphic_SymbolSize.png differ diff --git a/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_SymbolSpace/WMS_GetLegendGraphic_SymbolSpace.png b/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_SymbolSpace/WMS_GetLegendGraphic_SymbolSpace.png index b3c0d84524c..49b108ea859 100644 Binary files a/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_SymbolSpace/WMS_GetLegendGraphic_SymbolSpace.png and b/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_SymbolSpace/WMS_GetLegendGraphic_SymbolSpace.png differ diff --git a/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_Transparent/WMS_GetLegendGraphic_Transparent.png b/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_Transparent/WMS_GetLegendGraphic_Transparent.png index 07ab3c79864..7ed17278c7a 100644 Binary files a/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_Transparent/WMS_GetLegendGraphic_Transparent.png and b/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_Transparent/WMS_GetLegendGraphic_Transparent.png differ diff --git a/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_Transparent/WMS_GetLegendGraphic_Transparent_mask.png b/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_Transparent/WMS_GetLegendGraphic_Transparent_mask.png index 53d0900a1d8..467325387c9 100644 Binary files a/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_Transparent/WMS_GetLegendGraphic_Transparent_mask.png and b/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_Transparent/WMS_GetLegendGraphic_Transparent_mask.png differ diff --git a/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_rule0/WMS_GetLegendGraphic_rule0.png b/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_rule0/WMS_GetLegendGraphic_rule0.png index ef08dbe9f1e..5d252720ab4 100644 Binary files a/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_rule0/WMS_GetLegendGraphic_rule0.png and b/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_rule0/WMS_GetLegendGraphic_rule0.png differ diff --git a/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_rulelabel_true/WMS_GetLegendGraphic_rulelabel_true.png b/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_rulelabel_true/WMS_GetLegendGraphic_rulelabel_true.png new file mode 100644 index 00000000000..de9634142cc Binary files /dev/null and b/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_rulelabel_true/WMS_GetLegendGraphic_rulelabel_true.png differ diff --git a/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_test_layertitle_false/WMS_GetLegendGraphic_test_layertitle_false.png b/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_test_layertitle_false/WMS_GetLegendGraphic_test_layertitle_false.png index da0b745c511..6d7baf19c96 100644 Binary files a/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_test_layertitle_false/WMS_GetLegendGraphic_test_layertitle_false.png and b/tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_test_layertitle_false/WMS_GetLegendGraphic_test_layertitle_false.png differ