Merge pull request #33126 from signedav/rulelabelfix_bp

Display Rulelabel when requested in GetLegendGraphics
qgis · Dec 10, 2019 · 30376b1 · 30376b1
2 parents ffe31ee + eac999c
commit 30376b1
Show file tree

Hide file tree

Showing 23 changed files with 64 additions and 6 deletions.
diff --git a/src/server/services/wms/qgswmsgetlegendgraphics.cpp b/src/server/services/wms/qgswmsgetlegendgraphics.cpp
@@ -236,7 +236,6 @@ namespace QgsWms
 
         // layer titles - hidden or not
         QgsLegendRenderer::setNodeLegendStyle( nodeLayer, parameters.layerTitleAsBool() ? QgsLegendStyle::Subgroup : QgsLegendStyle::Hidden );
-
         // rule item titles
         if ( !parameters.ruleLabelAsBool() )
         {
@@ -246,7 +245,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
@@ -333,6 +333,7 @@ def test_getlegendgraphic(self):
             "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
@@ -93,6 +93,7 @@ def test_wms_getLegendGraphics_invalid_parameters(self):
             "REQUEST": "GetLegendGraphic",
             "LAYER": "Country,Hello,db_point",
             "LAYERTITLE": "FALSE",
+            "RULELABEL": "FALSE",
             "FORMAT": "image/png",
             "HEIGHT": "500",
             "WIDTH": "500",
@@ -174,11 +175,34 @@ def test_wms_getLegendGraphics_layertitle(self):
             '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 @@ def test_wms_getLegendGraphics_layertitle(self):
             # '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,16 +230,37 @@ def test_wms_getLegendGraphics_rulelabel(self):
             'LAYER': u'testlayer%20èé',
             'LAYERFONTBOLD': 'TRUE',
             'LAYERFONTSIZE': '30',
+            'ITEMFONTBOLD': 'TRUE',
+            'ITEMFONTSIZE': '20',
             '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_rulelabel_false", 250, QSize(15, 15))
+
+        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',
-            'RULELABEL': 'TRUE',
+            'LAYERFONTFAMILY': self.fontFamily,
+            'ITEMFONTFAMILY': self.fontFamily,
+            '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_test", 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',
@@ -228,11 +274,11 @@ def test_wms_getLegendGraphics_rulelabel(self):
             'ITEMFONTSIZE': '20',
             'LAYERFONTFAMILY': self.fontFamily,
             'ITEMFONTFAMILY': self.fontFamily,
-            'RULELABEL': 'FALSE',
+            '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_false", 250, QSize(15, 15))
+        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 @@ def test_wms_GetLegendGraphic_Basic(self):
             "REQUEST": "GetLegendGraphic",
             "LAYER": "Country,Hello",
             "LAYERTITLE": "FALSE",
+            "RULELABEL": "FALSE",
             "FORMAT": "image/png",
             "HEIGHT": "500",
             "WIDTH": "500",
@@ -291,6 +338,7 @@ def test_wms_GetLegendGraphic_Transparent(self):
             "REQUEST": "GetLegendGraphic",
             "LAYER": "Country,Hello",
             "LAYERTITLE": "FALSE",
+            "RULELABEL": "FALSE",
             "FORMAT": "image/png",
             "HEIGHT": "500",
             "WIDTH": "500",
@@ -309,6 +357,7 @@ def test_wms_GetLegendGraphic_Background(self):
             "REQUEST": "GetLegendGraphic",
             "LAYER": "Country,Hello",
             "LAYERTITLE": "FALSE",
+            "RULELABEL": "FALSE",
             "FORMAT": "image/png",
             "HEIGHT": "500",
             "WIDTH": "500",
@@ -326,6 +375,7 @@ def test_wms_GetLegendGraphic_Background(self):
             "REQUEST": "GetLegendGraphic",
             "LAYER": "Country,Hello",
             "LAYERTITLE": "FALSE",
+            "RULELABEL": "FALSE",
             "FORMAT": "image/png",
             "HEIGHT": "500",
             "WIDTH": "500",
@@ -344,6 +394,7 @@ def test_wms_GetLegendGraphic_BoxSpace(self):
             "REQUEST": "GetLegendGraphic",
             "LAYER": "Country,Hello",
             "LAYERTITLE": "FALSE",
+            "RULELABEL": "FALSE",
             "BOXSPACE": "100",
             "FORMAT": "image/png",
             "HEIGHT": "500",
@@ -362,6 +413,7 @@ def test_wms_GetLegendGraphic_SymbolSpace(self):
             "REQUEST": "GetLegendGraphic",
             "LAYER": "Country,Hello",
             "LAYERTITLE": "FALSE",
+            "RULELABEL": "FALSE",
             "SYMBOLSPACE": "100",
             "FORMAT": "image/png",
             "HEIGHT": "500",
@@ -380,6 +432,7 @@ def test_wms_GetLegendGraphic_IconLabelSpace(self):
             "REQUEST": "GetLegendGraphic",
             "LAYER": "Country,Hello",
             "LAYERTITLE": "FALSE",
+            "RULELABEL": "FALSE",
             "ICONLABELSPACE": "100",
             "FORMAT": "image/png",
             "HEIGHT": "500",
@@ -398,6 +451,7 @@ def test_wms_GetLegendGraphic_SymbolSize(self):
             "REQUEST": "GetLegendGraphic",
             "LAYER": "Country,Hello",
             "LAYERTITLE": "FALSE",
+            "RULELABEL": "FALSE",
             "SYMBOLWIDTH": "50",
             "SYMBOLHEIGHT": "30",
             "FORMAT": "image/png",
@@ -465,6 +519,7 @@ def test_wms_GetLegendGraphic_BBox(self):
             "REQUEST": "GetLegendGraphic",
             "LAYER": "Country,Hello,db_point",
             "LAYERTITLE": "FALSE",
+            "RULELABEL": "FALSE",
             "FORMAT": "image/png",
             "SRCHEIGHT": "500",
             "SRCWIDTH": "500",
@@ -483,6 +538,7 @@ def test_wms_GetLegendGraphic_BBox2(self):
             "REQUEST": "GetLegendGraphic",
             "LAYER": "Country,Hello,db_point",
             "LAYERTITLE": "FALSE",
+            "RULELABEL": "FALSE",
             "FORMAT": "image/png",
             "SRCHEIGHT": "500",
             "SRCWIDTH": "500",
@@ -501,6 +557,7 @@ def test_wms_GetLegendGraphic_BBox_Fallback(self):
             "REQUEST": "GetLegendGraphic",
             "LAYER": "Country,Hello,db_point",
             "LAYERTITLE": "FALSE",
+            "RULELABEL": "FALSE",
             "FORMAT": "image/png",
             "HEIGHT": "500",
             "WIDTH": "500",
@@ -519,6 +576,7 @@ def test_wms_GetLegendGraphic_BBox2_Fallback(self):
             "REQUEST": "GetLegendGraphic",
             "LAYER": "Country,Hello,db_point",
             "LAYERTITLE": "FALSE",
+            "RULELABEL": "FALSE",
             "FORMAT": "image/png",
             "HEIGHT": "500",
             "WIDTH": "500",

diff --git a/...trol_images/qgis_server/WMS_GetLegendGraphic_BBox/WMS_GetLegendGraphic_BBox.png b/...trol_images/qgis_server/WMS_GetLegendGraphic_BBox/WMS_GetLegendGraphic_BBox.png
diff --git a/...ol_images/qgis_server/WMS_GetLegendGraphic_BBox2/WMS_GetLegendGraphic_BBox2.png b/...ol_images/qgis_server/WMS_GetLegendGraphic_BBox2/WMS_GetLegendGraphic_BBox2.png
diff --git a/...qgis_server/WMS_GetLegendGraphic_Background/WMS_GetLegendGraphic_Background.png b/...qgis_server/WMS_GetLegendGraphic_Background/WMS_GetLegendGraphic_Background.png
diff --git a/...ver/WMS_GetLegendGraphic_Background_Hex/WMS_GetLegendGraphic_Background_Hex.png b/...ver/WMS_GetLegendGraphic_Background_Hex/WMS_GetLegendGraphic_Background_Hex.png
diff --git a/...ol_images/qgis_server/WMS_GetLegendGraphic_Basic/WMS_GetLegendGraphic_Basic.png b/...ol_images/qgis_server/WMS_GetLegendGraphic_Basic/WMS_GetLegendGraphic_Basic.png
diff --git a/...ges/qgis_server/WMS_GetLegendGraphic_BoxSpace/WMS_GetLegendGraphic_BoxSpace.png b/...ges/qgis_server/WMS_GetLegendGraphic_BoxSpace/WMS_GetLegendGraphic_BoxSpace.png
diff --git a/...ver/WMS_GetLegendGraphic_IconLabelSpace/WMS_GetLegendGraphic_IconLabelSpace.png b/...ver/WMS_GetLegendGraphic_IconLabelSpace/WMS_GetLegendGraphic_IconLabelSpace.png
diff --git a/...r/WMS_GetLegendGraphic_NoWidthNoHeight/WMS_GetLegendGraphic_NoWidthNoHeight.png b/...r/WMS_GetLegendGraphic_NoWidthNoHeight/WMS_GetLegendGraphic_NoWidthNoHeight.png
diff --git a/...endGraphic_Regression32020_type1/WMS_GetLegendGraphic_Regression32020_type1.png b/...endGraphic_Regression32020_type1/WMS_GetLegendGraphic_Regression32020_type1.png
diff --git a/...egression32020_type1_and_3/WMS_GetLegendGraphic_Regression32020_type1_and_3.png b/...egression32020_type1_and_3/WMS_GetLegendGraphic_Regression32020_type1_and_3.png
diff --git a/...endGraphic_Regression32020_type2/WMS_GetLegendGraphic_Regression32020_type2.png b/...endGraphic_Regression32020_type2/WMS_GetLegendGraphic_Regression32020_type2.png
diff --git a/..._Regression32020_type2_3857/WMS_GetLegendGraphic_Regression32020_type2_3857.png b/..._Regression32020_type2_3857/WMS_GetLegendGraphic_Regression32020_type2_3857.png
diff --git a/...egression32020_type2_and_3/WMS_GetLegendGraphic_Regression32020_type2_and_3.png b/...egression32020_type2_and_3/WMS_GetLegendGraphic_Regression32020_type2_and_3.png
diff --git a/...qgis_server/WMS_GetLegendGraphic_SymbolSize/WMS_GetLegendGraphic_SymbolSize.png b/...qgis_server/WMS_GetLegendGraphic_SymbolSize/WMS_GetLegendGraphic_SymbolSize.png
diff --git a/...is_server/WMS_GetLegendGraphic_SymbolSpace/WMS_GetLegendGraphic_SymbolSpace.png b/...is_server/WMS_GetLegendGraphic_SymbolSpace/WMS_GetLegendGraphic_SymbolSpace.png
diff --git a/...is_server/WMS_GetLegendGraphic_Transparent/WMS_GetLegendGraphic_Transparent.png b/...is_server/WMS_GetLegendGraphic_Transparent/WMS_GetLegendGraphic_Transparent.png
diff --git a/...rver/WMS_GetLegendGraphic_Transparent/WMS_GetLegendGraphic_Transparent_mask.png b/...rver/WMS_GetLegendGraphic_Transparent/WMS_GetLegendGraphic_Transparent_mask.png
diff --git a/...ol_images/qgis_server/WMS_GetLegendGraphic_rule0/WMS_GetLegendGraphic_rule0.png b/...ol_images/qgis_server/WMS_GetLegendGraphic_rule0/WMS_GetLegendGraphic_rule0.png
diff --git a/...ver/WMS_GetLegendGraphic_rulelabel_true/WMS_GetLegendGraphic_rulelabel_true.png b/...ver/WMS_GetLegendGraphic_rulelabel_true/WMS_GetLegendGraphic_rulelabel_true.png
diff --git a/...endGraphic_test_layertitle_false/WMS_GetLegendGraphic_test_layertitle_false.png b/...endGraphic_test_layertitle_false/WMS_GetLegendGraphic_test_layertitle_false.png