From 74a79311bb23a7dbe4102cf38ba8bc2b9754bf1b Mon Sep 17 00:00:00 2001 From: David Signer Date: Thu, 24 Oct 2019 09:28:08 +0200 Subject: [PATCH 1/3] avoid to unembed rules, if it's the layer itself because otherwise it's not possible to deactivate LAYERTITLE but keep RULELABEL --- src/server/services/wms/qgswmsgetlegendgraphics.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/server/services/wms/qgswmsgetlegendgraphics.cpp b/src/server/services/wms/qgswmsgetlegendgraphics.cpp index 17d2631094d..006a735bb06 100644 --- 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 ) ) { From 71581a40468f882fad7815e241c8a16b1cde5ce2 Mon Sep 17 00:00:00 2001 From: David Signer Date: Thu, 24 Oct 2019 13:05:44 +0200 Subject: [PATCH 2/3] Tests with RULELABEL and LAYERTITLE And fix related tests --- .../src/python/test_qgsserver_cachemanager.py | 1 + .../test_qgsserver_wms_getlegendgraphic.py | 69 ++++++++++++++++-- .../WMS_GetLegendGraphic_BBox.png | Bin 849 -> 867 bytes .../WMS_GetLegendGraphic_BBox2.png | Bin 625 -> 633 bytes .../WMS_GetLegendGraphic_Background.png | Bin 611 -> 622 bytes .../WMS_GetLegendGraphic_Background_Hex.png | Bin 611 -> 622 bytes .../WMS_GetLegendGraphic_Basic.png | Bin 625 -> 633 bytes .../WMS_GetLegendGraphic_BoxSpace.png | Bin 3975 -> 3969 bytes .../WMS_GetLegendGraphic_IconLabelSpace.png | Bin 837 -> 834 bytes .../WMS_GetLegendGraphic_NoWidthNoHeight.png | Bin 2770 -> 2208 bytes ...GetLegendGraphic_Regression32020_type1.png | Bin 1922 -> 1664 bytes ...endGraphic_Regression32020_type1_and_3.png | Bin 2377 -> 2075 bytes ...GetLegendGraphic_Regression32020_type2.png | Bin 2014 -> 1750 bytes ...gendGraphic_Regression32020_type2_3857.png | Bin 2014 -> 1750 bytes ...endGraphic_Regression32020_type2_and_3.png | Bin 2371 -> 2117 bytes .../WMS_GetLegendGraphic_SymbolSize.png | Bin 1291 -> 1301 bytes .../WMS_GetLegendGraphic_SymbolSpace.png | Bin 1005 -> 1036 bytes .../WMS_GetLegendGraphic_Transparent.png | Bin 685 -> 527 bytes .../WMS_GetLegendGraphic_Transparent_mask.png | Bin 190 -> 192 bytes .../WMS_GetLegendGraphic_rule0.png | Bin 302 -> 302 bytes .../WMS_GetLegendGraphic_rulelabel_true.png | Bin 0 -> 4411 bytes ...GetLegendGraphic_test_layertitle_false.png | Bin 381 -> 388 bytes 22 files changed, 64 insertions(+), 6 deletions(-) create mode 100644 tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_rulelabel_true/WMS_GetLegendGraphic_rulelabel_true.png 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 df640e94e76..c8dbb1771b0 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(QgsServerTestBase): "REQUEST": "GetLegendGraphic", "LAYER": "Country,Hello,db_point", "LAYERTITLE": "FALSE", + "RULELABEL": "FALSE", "FORMAT": "image/png", "HEIGHT": "500", "WIDTH": "500", @@ -174,11 +175,34 @@ class TestQgsServerWMSGetLegendGraphic(QgsServerTestBase): '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(QgsServerTestBase): # '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(QgsServerTestBase): '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(QgsServerTestBase): '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(QgsServerTestBase): "REQUEST": "GetLegendGraphic", "LAYER": "Country,Hello", "LAYERTITLE": "FALSE", + "RULELABEL": "FALSE", "FORMAT": "image/png", "HEIGHT": "500", "WIDTH": "500", @@ -291,6 +338,7 @@ class TestQgsServerWMSGetLegendGraphic(QgsServerTestBase): "REQUEST": "GetLegendGraphic", "LAYER": "Country,Hello", "LAYERTITLE": "FALSE", + "RULELABEL": "FALSE", "FORMAT": "image/png", "HEIGHT": "500", "WIDTH": "500", @@ -309,6 +357,7 @@ class TestQgsServerWMSGetLegendGraphic(QgsServerTestBase): "REQUEST": "GetLegendGraphic", "LAYER": "Country,Hello", "LAYERTITLE": "FALSE", + "RULELABEL": "FALSE", "FORMAT": "image/png", "HEIGHT": "500", "WIDTH": "500", @@ -344,6 +393,7 @@ class TestQgsServerWMSGetLegendGraphic(QgsServerTestBase): "REQUEST": "GetLegendGraphic", "LAYER": "Country,Hello", "LAYERTITLE": "FALSE", + "RULELABEL": "FALSE", "BOXSPACE": "100", "FORMAT": "image/png", "HEIGHT": "500", @@ -362,6 +412,7 @@ class TestQgsServerWMSGetLegendGraphic(QgsServerTestBase): "REQUEST": "GetLegendGraphic", "LAYER": "Country,Hello", "LAYERTITLE": "FALSE", + "RULELABEL": "FALSE", "SYMBOLSPACE": "100", "FORMAT": "image/png", "HEIGHT": "500", @@ -380,6 +431,7 @@ class TestQgsServerWMSGetLegendGraphic(QgsServerTestBase): "REQUEST": "GetLegendGraphic", "LAYER": "Country,Hello", "LAYERTITLE": "FALSE", + "RULELABEL": "FALSE", "ICONLABELSPACE": "100", "FORMAT": "image/png", "HEIGHT": "500", @@ -398,6 +450,7 @@ class TestQgsServerWMSGetLegendGraphic(QgsServerTestBase): "REQUEST": "GetLegendGraphic", "LAYER": "Country,Hello", "LAYERTITLE": "FALSE", + "RULELABEL": "FALSE", "SYMBOLWIDTH": "50", "SYMBOLHEIGHT": "30", "FORMAT": "image/png", @@ -465,6 +518,7 @@ class TestQgsServerWMSGetLegendGraphic(QgsServerTestBase): "REQUEST": "GetLegendGraphic", "LAYER": "Country,Hello,db_point", "LAYERTITLE": "FALSE", + "RULELABEL": "FALSE", "FORMAT": "image/png", "SRCHEIGHT": "500", "SRCWIDTH": "500", @@ -483,6 +537,7 @@ class TestQgsServerWMSGetLegendGraphic(QgsServerTestBase): "REQUEST": "GetLegendGraphic", "LAYER": "Country,Hello,db_point", "LAYERTITLE": "FALSE", + "RULELABEL": "FALSE", "FORMAT": "image/png", "SRCHEIGHT": "500", "SRCWIDTH": "500", @@ -501,6 +556,7 @@ class TestQgsServerWMSGetLegendGraphic(QgsServerTestBase): "REQUEST": "GetLegendGraphic", "LAYER": "Country,Hello,db_point", "LAYERTITLE": "FALSE", + "RULELABEL": "FALSE", "FORMAT": "image/png", "HEIGHT": "500", "WIDTH": "500", @@ -519,6 +575,7 @@ class TestQgsServerWMSGetLegendGraphic(QgsServerTestBase): "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 0528e60ecca23325d6123db94b76783d9829306e..d99bdb5efe3c37bf4ecfe3484a1c088e73fbf23f 100644 GIT binary patch literal 867 zcmV-p1DyPcP)P>&o z`v*rn-{T9gu&4bYY;Uv(wG8H%3P-H!-B=yZqYP@cGoW?yi8xD=EtSdj7N1nVy+B zOw-xEzN^Q=Jjd-`$*ksleP`~Bk6UFT`|NVL+^3b5y&!~8JMVolHDwiu*u*f5tSEn6 zR5eXiRqIHErbr~xeX6S>ihD1v3g0e`j96$Q{yr58g@OM5D%d*Smvhw!)%DBnC{;&PczNiTnHNmP! zlm4PNF)<+sg8A7)p-?K7A|0h;N~hEJZ{0oZ?KW?EP`TIkvMm;inKen0)WL^uN3WYV zExh|E%QERGTQ;oSBuSc^n=2Fw!C){RkJp7sRkd=t>~_1e*=#f#Wmy(7%HH3d!@)E+ zH~am5hlAjS>TxZgCRo%2i<)57qe*`qFK<;|m)@J7UEJ9=FiOXiOeUvdlaKI>APAx; zHn0tbO~-pW0)c=9rk0kL$IqW2gff}T^768QNlkXZ9*i+Al}hGchUkx%{Y;5OLJ$O^ z?eky7<8k0a0itJfX!@Vs&;MM^&(1Im!!V?ybWDqji^=3L#uf9XK;Xpe?6cO^Rtrqq z+ewTcnm1J{=QcMtNlo^CpEOOw7+0&+TCD~jW&61$^J;eW%NoaVLxUHcPA6oPz4uAg zwCZ>1t5Dk#MfkE=k81%n!J;Nu)C7x~VCn2Fp-_n9-nv`~MNwo~HuK2BHfZj~BNmu? zdwb{SCnZT*T3X63e2^952cX|3mh9ti$T tDE?iOrwM-6IN*$6)d_;=jnQ)ptRK)WnI%x|F+~6X002ovPDHLkV1mltp{oD@ literal 849 zcmV-X1FrmuP)LyhH%VR6jk&em%ILNh=MGh?6{dsU7D1>A zvwG`612hF zaA>cWO%qg7`!tze9nL7auKQW`pN$Mf(X=<0 zp@UWW`ufg~jR`;G{Tnw#adL9f6Ngw|5VEoA?r4=3iXHY956evQ0A`~bexOHY` zMv^4_)uYj9I-Pb;$>nm7?mjrzdkUZOSbRA2dMJ@dxTI*BHrf-r7r%{9S$_XX*L9ma z!zakAG)*fOi{)~8aBwi0Odce~G_7j2>i7FgrBXZ|Xa5@l_t)Ahh^DDPAP^3R?F^l5 zbTJbO6rn&73RD|W;Ja;gM|@jZ!Czgi?_yDSo`0E`d#cP!lBB9?2ixJAGIDw}5{bB{ zghHWbubv}>^7;Jw`nvtKFl+KSR1~FBso?(`(=@RtsZ>gmBu~CRNhXtxAIpe*W`=`L z(C;ri@K>iOilQj@l-1Q$p1-arB0eP&IbJBd7#J9EPubn&73B#&MHDXzf?$)<+V_fO zS&E{_vRtdxn(o~4i9f$k__DFdaon}cRfb_2?A+R;Vp^8`Q~NH}c2u?LU9OETWpIS?z;;;vPP;#l0F?3Z@x{eCP1Dxa)=JACb;It! z0Z>@(XitxO3PLCriy?$mRsCA7)G;WIYV>3dhr^v5V}A^5Q1{X9rsH~(G25#l+|KJE b6F<~1p>T{eR4zl_00000NkvXXu0mjfL(q-q 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 60cee95ca96ca7d49f719c471974bf741bc0c45b..5319c86e6acdf2408d7152e287e35a3e34aaaf51 100644 GIT binary patch literal 633 zcmV-<0*3vGP)LyhC%J_7Qm*6&#*#|x(t@-@cWI$?>FOxB z^=8q<|G?!I-2~~N=u%vy%k3SmVsR)z@fI=AO)|7eW3Tz;=3?kQ$(wQ!-tSoYzWEHv zoA(V9MG@pI_NDk_h_Pe_N z=EFNll1NSS`CR)gJ!?EAH$DD#W}0ROCIC3*ikhI3oA@IxilQir7=|G=WtHo?qtU2R zsi>+t91b}Sb-Bad;~d8|8jW_lZCO?j1jtc&eD0_T7d7FcCS25nD`v5mBM%VqpM!0i9VYFQRJ2mp%3VyRR@{`nfyjr5j9(mFL|jHwnV)>GV#k)gm?Rb~~26cXjog+;npC+4udVqYisU z@O|GfjO})-C`!Fv&x`5%*8*z7MNPP< z30EFX@#}aH`~sMg&mM+uicvA9Ua!~be01HHo6TmuwnKtFpDb&))Y}=D6h%2de-8kQ z#p2@A7cWTg*)Nl>c?Yu$aBK#f<3u~`eWqr!xnA2OXU@MVih|q}06imM%cJQJeT1it TRB8jC00000NkvXXu0mjf#9J{( literal 625 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 TRB8jC00000NkvXXu0mjf#9J{( literal 625 zcmV-%0*?KOP)Lyhr@c0CB}e)rR#Hr5fyBVTeu0FrusWK! zakJ6I|G?!I-AoLFMi=5@SZ-%HjN}H=XuQSPgw1q-mdeq$ecg2MO*!8eybkYoByZmL zlfc{er2@tnvXOYxfIo2xDNZ59DWo`s6sM5l6jGc*ic?5sh$8*{k?Xn-??3Q^fPMD6 zw*C73TTRm_DbwlH`l&swJz=Lj`f}>JE$*-&X{lz7K>ZIXd(Tzpyzq)4gkpK^MyiziSj?o_GSiv;c&QEEZAqa zZM)a&(NjjF(aFinC^}}RD9Wqx_)eqIprmXz8&SM>b@hy$a&+_wA#}~b`@Lo(gdE3N zuh)iQRIAk+rhL8p7KEs9cu=WSWLZubyx$#!0Z;-_41%zIp$u(iP9eo9q&S6ChA8Bx zZ5;mq7_-lwBq0-})9JKYAHwj(YPDJ}{e))^)w=1x9z*Y$#vfd>n>`Q3M(9XIFR-1%#l=e^YF`oDkvVdVG!S({$>{`$ahK!0&Pfi|}ulrI|U;ksp>-xRlK3tqGt`{R=$7S)f zglEH)n4%rNF6Zy}<^J`5o*z8;ucpr8McfkeW9jGT+3vd9 zaM}AfgZIwb-`{TkudA-Fug}iTPESwI&3(JoJ$6q;VQuYSj&f!{U0G(G*VooYFTVKV z>FMdu&(Ggq_4SqKdgcYm4dEs;eay_w%gf8#`*+p++;ne5Z&xSR>zrVMy|5x*44$xoE&&_>U%m50$c7FM~Z#V1HHuJaj zSG`_)e*5}%e`q|Ia@p`e5FbB(cv#-Kw0Iu*(r0I``#ocHcRJ2+JlAY?ZeHHs zf4|SA7*#%>`x5A^mX{I_cAS0wd4B!R((nD^^_9O$toFVWHad{~d7n_h9kIn1YwYHo zW#uuLLPYKV{wLFEE1N&LCcmC(Jli8-$C9ulxk2?VFpgHQ-)C#_qbNT=zx;i_;&+?8 zoITsOZL2F;&A5CzFv^QwURvtj|IbvaciZ;u`)~hxm{50#oAHIjgHTvgorKH5(i esr|RV{Bv|Slub1>NCx()89ZJ6T-G@yGywoq`wF}O literal 3975 zcmeAS@N?(olHy`uVBq!ia0y~yV0s0_zc`qHBJVFh$pTWG1s;*bK>5!g%&7m@_8$WS zzon;(V@SoEw|6&o&ncBU@Nwqdj3#%X&9mn&v2$|ccHZEXE2^|a;LW-Xooi(xIK%JO zPds3%X|v8SAu)IIp}VdZoD4izxXtgr^X#}e_vX%DyKc@+ov#1+=O0FX|DUz#b?<*m zpG(`!$l!4NRHQxwLxIUBR)&s=`V0;|HH-{NPq-Nbl;as1Bz`h6962G*py0NTfx&Q8 z$!NHYCWg^WGFmc>7KhlYiD!3!m5GT>^|v>V`R%Lr?%)4o#q9dMAAg*jK3y+1szzkP zoG07{)0g|t-}nF6kN5BY<$esDU-Q3TTtDuF_=6ijx%J$u^W$vmQ$Jd2AD((LrKq4_ z!>(PsHa*hMd2r$hcfqZ=zdxTZcJIG-{kplCnVe09fehdIDrJRZ#ry@g&aGY7cl>em z_Pn=m-keF>yg82j1+jV6o4H|U%*Zb{je?7M6=liz&^5NEZT2;vv|Ni`(9L*bH z^@(-H>ASnj@BjOL`}gnP(b3V?*4EkC*~jHde|~!U_3KyRJG>EQKtmmAAEg% zy?)%Diod_U0^Jc2_lebF*2Ro1J9qBfy?ghM6|2M7@5+<1Xj}L?u5t0L+qbPJT8it% z6mYOvuz_maib5%dj>2z1!w$Fe$M37z`D4zzxV6UZ{N;Jo9F4+aYgun9QyF#!&9f;o_x}M)P1h?_pQO@2b4ger#AWIvuD@d z?|-6X6k3XJm_m@d#s(F9IWix4>WtShO ztcq?(o{RXWc{V?-OfCk@_q;hCi8P&gPg!$3{NbKK;LZ zsZw!6s&ah8;+?g>zvY-&Pkb%rzIbA`bYrqa)h|Yds67_Eqpg+ER@`XQb+o-c+K(Bb eowphP8GroRP_|@WVJ)y{&EVZOHj9DC)Jf&UNfL(r6+T+2eb|hyB)LoiFRovx?U;9)7)W|F_?gx4(S9_r>?t>%GNW zu5mH^tA4lt9s|Q4(JWR6HcIjP^V6kzkL|TCza5xj|2J*xuSaLK?|*;m&L~mT7WMY+ z+t9in{aO5Pm*4-t=U#@%3Q>mYwkXY|$M)1L6}aVpzPBPOd+pZ87T+#2@E8}b{iWLX zxVN|WIG`6KVs z^Y#U3`TF`s=I}F|n~`rE7ZVfWCCb$rv@&F6$htCbhJ=E93po-c-o1Ob?RM_(R5dlV zoPB{z4U4zhJ%5|F`R4T0Pd{rmM!Y$#!EpFxQxxNY`lkGJh7^PUd0ThxtSl)>vELiD zcHNpaH_kIMIIrEdZQHeL^GbJbf4f|q>wI}x-kGy!Z}u}8JmJ}DWouh{H(Fi2|LyYr z{(6r|N9y<(QhrCYt9ZWpTDAN#XH!C2n%d>93_RP;WPg47AX`NJ=*EdJU%rgdoBpzh zfh}U&b(XC`p8lo5Pc333D)oBE!M zp|1R3?AdjTZMO5fD;Cc)V(@-`HLI*_8&LbxNK;3F0tRLVX&YCj2A)67j14?jxEgru Z8SnQm@BJk#Sq;n-44$rjF6*2UngB>yZ4&?h literal 837 zcmeAS@N?(olHy`uVBq!ia0y~yVC(_1?Kqf#{d@R4t?JFErWNG8Awb7gT65rjWt(TUrUi{$NxkcUo8@chAQge|~9?-yXeIY$DTyD5oV;f`a`vhJ8A_TwG0N?bd6zHtBrMWGK?G3|cJI z_VC=fb8p_PdH;L%?Ad*j-xe_(^WSDa$GY!whRL+)({H~mlQ}+f9czM4VJUw@h6@*d z%=vxgj&;>Se=5GD?v{6Lw%GReiy}As-jgRio8K~?*xll>cKv$sID77<1vhi%&6^jt z`s$U-;aXF7?z9BUKe4V04-cOjv@~dC(8?=WTVLN5V)$eFCW7hycYc2U-FMghG%_|e zR*RQrd@^n6R=H1QyYI@KG&-8JF-EUHMWi8Sr&18Zhx(7AJPjEq_j|s5_ioZQB<2<#+kn<!#l`*4 zF8BAZ?^<-ChOgnysc$Da0!2(`pN(7pyz<_mLr%-G86~`Dy1%-8^1DLMsbJyHpFg)c zDPDfc&@(@0{kzPiiyB`YKecH`4~GKpEk*|uC03kx%ai&!$3OZnbP0l+XkKKtq7I 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 dfbe0fa164669a85c4d2f9ff0ca8c2a9906fbae8..dc4b21b0a095d01ff761575a90b1267e3810fce0 100644 GIT binary patch literal 2208 zcma)8X*8Sb7XGM4s-iJhsHrM0t|2wmY0RfpVrWWG&L!r$)w-xLXq!Zvx}hzqF{L=D zV;J zE$=S~5mza7v4*W1bZDr(dLmi-5a-Zylxb~{!-TwLJtbL>;An(KG8W@v_MqON)AOr`9lMG;C;_kGE}TJtdsvzV$yqNdfGiSl-*}2ld>{XA0$Fv znrmo4ZBo_USzRYnVFg3y*Y}FEpv%$HB(hBY;KmfieYt<$HuTwR$Bu9+O=zO z@$vWPTQ+LGS5y50;8yiB6%!%V-tCIw;sPoyQS93;E}y=At6?k+4Glef2+%Oe=cw0~ z57=}2ajjlDvLa-7XT;i&tBZ>Tlx&5^VkJnDWGhNaiew6tN~K;^9DW}@UgFTNIBiul+T*`h>O>DVK$uyV zjvFGVp;TM7!to7lnXSPb<6zm0l&}hnnnY}DY#us3YHPBRhjDdv#bUAc_WkU+59}>@ zd3g_QTu@M{jVg^!7Y2SWDUp$t9pB)B<-aUYy>!e8yfA!E)*zTE0dJf&OifMIkw|dPwzjtTe7-OQ@-@5>SDwIKzX`T* z=5AZeZefSdw}S(-h*eRFP2Bgr037bshYyDX0|S{_ZbwH)v$L}hVc|4|D_AeD3S9Zz z+#H9)Y5ya8c&|}QhM_0QxEsWcYn=!=_G<0*Mt9 zb1rEmsi^U!_W~Ll8%^_ckjN(;K7SH+AFS2W`*Cjy3M{o{=7yxCq(~%^HtcX`Vc19S z=gT$#@Ltj8|Fiz5_v^M_{t~wXseKZTmxO+xKfbFZ=vM4@)0Lusyq(&(zL0jrU)EXn~xjWCG?4`pa0k#xY>RQ27`gzifc_IXV1*c zbar;`?(Vv-2qKgCZg*T9PVS(>|DBYo3oM=kfYpV;_P(Uk8~|9HWXsglh%dl%DZMeV zu@_7u-!?VP(oW}L)iq_$?412x`u(h%?Bczg`fz#RM94>MWG`3_dHI=+%$0gXs$KC* zyW&%)PU-9GD~JhC3*qbP>i)Ck>FG%~OK1w{e^qon&B(xDy2~F#GZ4sGS}LrruC`HS zalWfb+|ZB;H&GzWO`ECvp=f>m{e}ow&R{BqQi~qh)R$X3+=(>3z(K0BjS*>LhT!VwxM@HZcDZMQTd?OQ+^Yqxm?cbc8;SD$6hhQM=3%4S@{a4%tfW=eF zCpn^k-VcVeP9*%U2MvVN($Z4yR=xeXG2O0MuvvKkr6FZ^{dzZNZJ5Dez#zoS`f`gJ ze_MX}S~R;(uc+Uz%fRFn*Q%S57 z!9xbf!sYI?U)rV8d%0XL#?etsR5UUoLJ}$jA>uvYT{4w8Pw;gYE>Q8)9Yo=dlWzY= z(=SBfb5bJA#l<%+niIhWPWe|0uw|eSNJ~qT$>all+Su6Gr%x_MIbS9xaab%0jsCk# zN_>1gNN~5bUX!H5#+wA9jXIjZ9f{gI<{z5JoP0zNJxI*Eq%D)e4)cHq%AHT%h-@lm zWp(>2lfaE9w&s@Ft4!$r6!H#KYB60>TU%QIWwN^OsLS8TSKV*oH6|eeP3(ZeV8^SK p0yX-Xp*=KzW1E_$M4?z*}kz>7RG}768r!F2%4H0+ySdM zI1PC@!EfioBRE+2{7md0f&1&fC&$$T?Lz?I$D115unvB`{L0Jf?w~0B9{T*`1v^FV zVNRQhctX+}nHcF7qry5F8?%B1D+m$xBW28EStd%>ocs6*15Kwq{Q^4)vws=NTY1L4 zyo2cD5P|dXE9*rOW-eAj~74tEs3z`ja)tWm!)fQX2Qa8-Kr=+O{*(_u^hMeSnY9SR{jnu(&Rp+46oIGjB_`RN#B5yO=esCJ0h+w=w$CE{~)b9>n`DeZ_V zpCKdj%gNSq8Qwwf;o49rR7E8)b!_g$o(4OhWlTwBc;+iv zN5^~Y>C>kb6%}kYJ0>P3G^JTRQJX*@yhu*AkvpZguu7Nm_4Zy~T6#bmf*0Es^qOA! zqc&Gq&(zcui^cM04-XGBeh*XC^zi9cL42agCHD942D~;lHhjl8@rf-+`)dDLW2tbw z@b2N>&mpwx?MqPT2MUGn!gVF3DK-I&BKFRV_b=kkC#p|q4u*kb|)q#5)%^(GDF^GXSchbspN?;R_~jpwL6(F8uLv8Vj+rtD4?n1WG+&7xnrfEcN(eu@w6qi% z8A%S`w8smtzI6BU@vl$QF2g@w(3%^0cl-rE?wf93LJAd5yzZb5ppK6Jm@oG0T@Zf^AE=Ibgd zjtvnR!7-z5X+gPse0=%&`LeRIRNG=CZRpggQy|R9vS3%&nZ~H&KkK%}(6c4?8zL6E zE{KVxf&jF&nE=j;;vfyp@_U+^xBw$#V=9$uY-IH6)hh=_$7lipBw5h%unio}545zj zM4vdz`J}wO9Hg7h;r4Xx&-!UUsN{+Hh3?$g*jVtiUY?$BDHIR{S$X+p%tsK^tgMMX z%3UWXr-Oq7>7*D&#nDYBgy#KPA|8cCcc|vrQhmohs{a<)@&HN=++1+J&o*Ck)EgsnE8{3A9mCkOchMG}Hi zE)rb0BVFKK;9*BbMpVl~w|oSeJSGkfEagru{maU-vZm5WiSjqi z=xgO`X=&n6U@i~^09%^Vmk-rB@Z;;_6HW_GiT8BlUtdd0 z%iQilYdJ1XPV|zqIEdZ@qBiQxONOiD3Hp!k&;(*af&!uvJ#2rDgR-aL`QRnPdH7o` zW|h?PiDPB^Cr=3=>FkKwN!i|byxDL-tYTPSY-?|CZ)+H|ET$6NkHHe^I}@%ycQ?R-&{da2-wCgxM6?|A*@W)QxM zT3Y|x8ZY{1mi6@XEG)R=yRJ6u`-6sqx3aUd!(!F-7N%O_3=Iuq@MMU#_QB}maYNqI z0^Be%IU}RE-xJhACs~Im+_M+}gTWvW2ygcGc5s>9bJX?%N_FnrqdAYm-Vn;+SCsQH zpoWGhMM8^38}WCZ>jFuC-i zug_XKK99_7Y57w@p@d3Z0xiQ<=HJcri*s|LA|k8HRpY}bi}h|My5ri}2I$_uMB_Q0 zxaH3`9fgPk0%e3wFP+DQyg*?;``x>D+1c4Fmc!q=y2lv7t-)GjpnHQ+ghV2F)fPd+ z+TGoSBM{*2qMI-kC#hsXAd%T{sdpc(93If?XHKuF(Wp3wbqo0^#JY;T+c^9gnRfaa zCdyhau<&a?^`0;5LlTL!)1@yYQZMi#vn(e^TA&HGJrQ}&37cO~zyo~z_|Yk3F@Lo7 zF+%JjHb7%kZ9FXb)hjt+-VY8w2*ep+VPiKTApv~Akq#29W-)QRdw66-J2kXi4D@!* zm>76*#MyvKC*SM+stbzNLs%*@)8E*hiG zq$MY>PsLpo6%#WyHvZzOJqOMNBE3 z$M^L1>g(%+NxyMcGbn6lHnsT^7~a?9<>hsBbW~OUai91;MC0J#NLTX(6D{`HGmYRC zXA27pBr>Pl{q;~9mxh_#pG#_`pTDsQ>DHys6Q5)JD z=A5~kXDxSXlAFv;q}LuX6J0XdA11Oo-3tHP?M>>qOv#SHEOipVCKWI>v@j^qbAI|C DGu3>V 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 6d8f2449fcc3e70438b8da6c502bfc506c610fda..9e0f46116a6aeb6bbce6156c1256af910fe03ea7 100644 GIT binary patch literal 1664 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 G(*FShl^ni>Ir_$6cbD*5D=n7IfWlmSpl)TC# z)EqOXOnc?6EJPpIa9C6WNQUQJ$Jnx-WxJ zSo*!nf+yFX#pOY>)KCFf=m}i~*dnRvfdWz2+ReX%&noagXJDe80grPwa?G5$ka^&F zg)35U3HKvXe-NP%}`xPxblDKy26-lma{vcm8Z)0O~@Zdq!UoiEw zvwpXGwU_4SH*afX8*+(r((O%=1@}87B|{tL5*xdcv(JG}rwuF@M59bMZKT%SX|C-0Q&mV@9DO?kt~lEJFHyu50k@{P5%Oy^3eRBCl) zJf>~5rlw|gb{6Ess@*FrL}M^DL{sZuyic9#ZH^Lkbavi92T#e6lau>2JNsi{q%lf_ zYNMd?+&w%z0ASD2KnMVGfY<5h=;-Nj+I*!w=w5~A63KyqwSovTnT#h8z;`7q{3!#t zdwN2E_Yx|))T>%pM`^>8NHu;uGo62&K7HE9$A?O7vJ@jT4E@r2ToQ&Pgi!!0c=;^N{UvQA-PMsx!O z1%>A3=9k&}dI$u_R{20E@h-F7tEad5b>=mAjQq|08mzTc8kziIZ4E;=AoB~otNrz`)UP`1B87j(}~mxw+LL z)1B<@{(fKUZ>^WbjG#Zx2E!5h`eT}ttM4Z8%e>ote}O_+yrUMSx8 zPWbpLZ)+=6g_)n1_m}~D8081g&&|#K{5hhHQpRR4NF=xl->Io7SvfgXge?@nBrJ{I z+^uSeM2?M(iN#_WKvPq*+&&EkgON`cdWFIPUm|hn!-tdh_JO{>^&b!GX8oA#WlAKG zDolc(pS)BQ?{8K*-vDvSrJ&NcH?C4Bqj&2N4m5U2Ny**2hWY)E{0;-bv9W?n=sI-9 zVPz{c+S|)(?CDj-%MWA$u=Jl$Q2G5$FKUM88X6i1)!s(N##pt!3yph~0E2#GA=Iv8a#M9s3`-slN-gz#Y)Ya<#Ov@yFxu78Wx0y0Q(&-}rp1U@bB41mr1-_b2=zK1Pq8sG99=3f40PGC3_%1Xu;JtC zx|f&Nm+{X0{?K9*bWw<{OUK4Wat2lg0K1R;%^vBumX`(0CVu9bGiR7xlXRVxg$a)1 z?L?ta7@@8TEH8{$8t1d5E(bJN-Q5nlIF8_e1`ceVc&-){(%;`-jAIe{rdJX{EmsR! z&XqG^=6aKoj p2OYSw6)!#PsI!v!-ySiLE`!Y}FmZYRx&oZ`0M5nRxfUBt{~IFW=MDe> literal 2377 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 literal 2014 zcmZuycTm&W7XASu0fPw)NQtaD0*ABzY` zU(^JR4{>25WJAb;uo#MnRHaHJ3DVy0`R{vo=G-%L&&-`uzVAD^uFe-^WmIJV0FbrE zox_9P1GMuHaq#wy`?VN!(pPcbF<_kkUlTLhwcY~&sk`>)FmBf?SIX0Hm$wnURXobj zy%XVt(mIP=>AI~ecs=EN<@2Vb@-s(7fn=(rr@mfs+QifK0cs}I9>bw{@9COo==FIN zq+Yqz*WK(C5=>yU#B?OY3AXmAe!f)V0Ll5q!tSV`a)EEf_1WHeKM)fNL5iZ-OrE5L zuY$OYST>-0z!nL}h`B=2v4Dd3Z*bs$pWXzhmzI_)BM`*rv4Sgw@aHs|q?DBJi>vs;*AH(vi=-?=V-X=i8O4rlOMYd8k%G>M%JZM8ek7v!tUV zJ~8q8?CdOmfh!>)fj}UrN4Xph%D}+D$jHUPK^=nCF4_`_j-HM))Ya8Jb&7Wh0`TBD zJz-H%7a;!1^thF=j0~}?yH47Nq@^*CcHZ*pYGl^mWhNnT?AF%S`Sa)L*g^*f2l;#^ zqE0cMAEBatc}J}iI_QD{kmWemh#Q$EAi_V%VwxVE@x3(3yTo?BR$ zvG_1LDx8TG1kdw}yv@hlcQlIJEB~i^Zxii@1l= zoSB({AT$5?J$Wm-+ErOzUcK0XNF+Xc`V>efd6Re2(*gd_&D`ATcb~#;4HGTfJf7-DYZ&T$W^syJFaE^h_5b%4%IDLLT7}^88A)l0m!S*L~ zDv5LtNEKJe=Nq6=r7*Sk~^3jP@z`?9j4rlvMIKA!abTbNlzCkV(dUnojSB^noQ-?dTxwcV@PrOKu- zYBMnM78M*E91!qncUxFdQQ>XqfyH+Buj6)s0mP)~332VES2b4E(1v zsec;xlcrw9uYr~E(ym|kYVjB^yA~T8JMV?3&@9c(M~9x^8efw5Z-rnE8Iwlok8HZOplR7~;afV_3#lf1c!)n6c_UY@3zP7ulFHN4x>96zE zrx;!RR$y{^bD3wt{)g!53cu4!+zF^OIn+ve`3T?eg0wo)g3 zcymV794YfOG>$vm*N3ySvm+43@|BE~p?2V)TLLOGkDHnn_e}Rc7j19rXlgh1kvk?z+_nPKCK=n-8iGXAC_AgDK@RFWfoC z>F;;bRXBP$r)TN|MH6(2Hx4( zIX_uwS0e@#v7B67JarZ3gFA4Vj3nU+-ZEYPXs?Nh2?(*EpjuRw7WxoQI=g#$IsDk2 zj+g~!b`$hq&&bFK<=Hr%&|-!{6)*#?#mB#5Fvg;Zgl7N{5ExkIG(X*w!>We{%OHn& zyt2~LQ1IVdCKeXTAm){oy$FQw^PCD$sfa2MPaRT4AQWY?S>(pHHZGT|Q-D@Q85ymC z66mD;ZdtE{%?xNKoq);8q6`f|R9?Jz5nH{!F~sL6Iyr@FX16 z`*GUqp-T{`cJd9^ag)7Xb@#|O+$#|txgP-c zPV@fC)S3Ox=j)3;HcM94)+@p;uvbY*NoUVy@-{yHk=f9oS77&UWP}#jdpo;?tk+oo m;+u08Qz<(g`(p(HJFsv%w24Da`UEa)!2Z1RxmK*-jsF05-@0A^ 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 e2d5d3ef5303fc41f14fdd3392a512fc15d69781..790a2744a9370bf931babe166357d379732a5abe 100644 GIT binary patch literal 1750 zcmV;{1}XW8P)jG{o$r{T{U(|$+_IpMQf|o1}ke5bHpDE{~-!3l9%!&+X2sW z|6rGK39Ks;?sPtXFwS#+`~IFUKc45D!;c^cA^4Rb1$qKM8^SQ&Aq?Xk!Z6+;4C5Wb zFy0{y;~l~<-XRR*9l|i)Aq?XkKN^M*PE1TZefrdYDONzR|Dt+s@7}#b5F|T0TcJ=Wl}av`+tbr?`SRt^(9l&e?76}*F)>!Fb;ph! zadB~SxxB5d?c&9Y0D!Y+&jJ8=JRYCVFD@=tC={-d%cPM=Boc|Fsi{e?*WbEzD=RB& zYHDiJrcD5VjEoEb0F6dFeE2YpM!Rs~LV0<)PN!R1T54@=9U2;| zIePTy@#DvZLgAS+XSQ$O4k6@lI5jmjpFe+gi~JUuOm^bL2?!yEVJM2~bh^^g(uRfx z2;s|@FZb@<3n3H=g$9G+_3PKs(a}PoP$(4AXf&x*YBHG;5)!;AubA&|T1KO>v$HcR zE6X`DI5;R0iPF;2?%liRsLyv%DwWr+T`MRkU@#aalL-KjnVD%eo3&c)%*@Qzty?u3 zO?rBIb8|BQ!0~D}n}dRaR#-;wc-^#66kS|gbj-}TEq(d&1pqKKG$ay<8X6h~2M1jv zm*L8lD+q!V6&1NI#mdS`KA+FwZ~y>wI$fnwef;>*HIZNNR{H$>d;~#;hlec|3!BX@ zEG!fV1T8Hs5W@8I^v=%CW5Ev;7D($eBOQe0eISXk&Wm`o-!nM?#hezIEtKwv5yK!~R$yh9kqJA`4pLm0+8 zgkiix7{)uloM8`-hkCufwn8wsFz35^d`w*T-+yh~xY2j1)xv{ejYgAX`{Pe?neXaC z)4+!hAJ)2I0Kjj66h>O-yE-Xo%`KTVHz9xH$7b3x+`fH#Y-}t%JY28WZ{EB)G&Iy= zvD~vX#4=;+bW(Sm{kN85FJdRiip%+1XS1cGhbwmB8@^75!uDgYoYEiE!KQm@y0 zG#r>UOeT{_r2nL*P$(rOB@&5*#bQN9Mw(2f($dn|+1d8?b_#{U;c&{!%b!1gZZ?~b z963@_Qo`kO*=)A!FOW$|Nx8YX004u*003Yx7#>pxrotYHkB_HPsdBk|*REZ`!NFuQ znNFw2#Ki31zaIclS66rU?%m|%WD<$g*VhLCFc=K)-@lKIjdc~V+wFCAbrOkW-8#=# znKfh>08m+3DHe+-Cnx!QzT2s&sHnGZ-x`fZE|=Tb*a-gZxw*2iuuxrHeg6FUoSYnQ zDc06y2|*CKTs}TNPN&n|PCb11Fh4&(Gc!{rlVKPJ0I=KbHk-{EFf%h#QBl#{+? zW3^g4IyyY22xNtOdwZv+r@OnmuU@_CXpV=3gz$Jg*A}c!r)z9%G#ZT=85szI005pm zd6Ju(>-a?4+S(!_A{>z?Po7jL6wjVL0|3};wo|80c}yBe!vcXoAP~3>qA1Ga@tlW= ziHRbS$aRP7>gsaz<=p-RA(P2|BT;C_-z;iQAqtT!!>bv@e s4I2^@6MffNMTqVp-XRR*onOxIKQM=Y%Xh}UjQ{`u07*qoM6N<$f);i~^8f$< literal 2014 zcmZuycTm&W7XASu0fPw)NQtaD0*ABzY` zU(^JR4{>25WJAb;uo#MnRHaHJ3DVy0`R{vo=G-%L&&-`uzVAD^uFe-^WmIJV0FbrE zox_9P1GMuHaq#wy`?VN!(pPcbF<_kkUlTLhwcY~&sk`>)FmBf?SIX0Hm$wnURXobj zy%XVt(mIP=>AI~ecs=EN<@2Vb@-s(7fn=(rr@mfs+QifK0cs}I9>bw{@9COo==FIN zq+Yqz*WK(C5=>yU#B?OY3AXmAe!f)V0Ll5q!tSV`a)EEf_1WHeKM)fNL5iZ-OrE5L zuY$OYST>-0z!nL}h`B=2v4Dd3Z*bs$pWXzhmzI_)BM`*rv4Sgw@aHs|q?DBJi>vs;*AH(vi=-?=V-X=i8O4rlOMYd8k%G>M%JZM8ek7v!tUV zJ~8q8?CdOmfh!>)fj}UrN4Xph%D}+D$jHUPK^=nCF4_`_j-HM))Ya8Jb&7Wh0`TBD zJz-H%7a;!1^thF=j0~}?yH47Nq@^*CcHZ*pYGl^mWhNnT?AF%S`Sa)L*g^*f2l;#^ zqE0cMAEBatc}J}iI_QD{kmWemh#Q$EAi_V%VwxVE@x3(3yTo?BR$ zvG_1LDx8TG1kdw}yv@hlcQlIJEB~i^Zxii@1l= zoSB({AT$5?J$Wm-+ErOzUcK0XNF+Xc`V>efd6Re2(*gd_&D`ATcb~#;4HGTfJf7-DYZ&T$W^syJFaE^h_5b%4%IDLLT7}^88A)l0m!S*L~ zDv5LtNEKJe=Nq6=r7*Sk~^3jP@z`?9j4rlvMIKA!abTbNlzCkV(dUnojSB^noQ-?dTxwcV@PrOKu- zYBMnM78M*E91!qncUxFdQQ>XqfyH+Buj6)s0mP)~332VES2b4E(1v zsec;xlcrw9uYr~E(ym|kYVjB^yA~T8JMV?3&@9c(M~9x^8efw5Z-rnE8Iwlok8HZOplR7~;afV_3#lf1c!)n6c_UY@3zP7ulFHN4x>96zE zrx;!RR$y{^bD3wt{)g!53cu4!+zF^OIn+ve`3T?eg0wo)g3 zcymV794YfOG>$vm*N3ySvm+43@|BE~p?2V)TLLOGkDHnn_e}Rc7j19rXlgh1kvk?z+_nPKCK=n-8iGXAC_AgDK@RFWfoC z>F;;bRXBP$r)TN|MH6(2Hx4( zIX_uwS0e@#v7B67JarZ3gFA4Vj3nU+-ZEYPXs?Nh2?(*EpjuRw7WxoQI=g#$IsDk2 zj+g~!b`$hq&&bFK<=Hr%&|-!{6)*#?#mB#5Fvg;Zgl7N{5ExkIG(X*w!>We{%OHn& zyt2~LQ1IVdCKeXTAm){oy$FQw^PCD$sfa2MPaRT4AQWY?S>(pHHZGT|Q-D@Q85ymC z66mD;ZdtE{%?xNKoq);8q6`f|R9?Jz5nH{!F~sL6Iyr@FX16 z`*GUqp-T{`cJd9^ag)7Xb@#|O+$#|txgP-c zPV@fC)S3Ox=j)3;HcM94)+@p;uvbY*NoUVy@-{yHk=f9oS77&UWP}#jdpo;?tk+oo m;+u08Qz<(g`(p(HJFsv%w24Da`UEa)!2Z1RxmK*-jsF05-@0A^ 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 dce98c9b1ff0bf1b76a7896b6939fb19e86728f7..1eb76a90be75aef1885b5b0fcfbe035bd619febb 100644 GIT binary patch literal 2117 zcmaJ@c{tQ-8~#<2gAnPnWUq`RO|lzG#>^-?Ul@};VR9&C8FTEi3{51*h$$5sjxA#u zBS$pGGMZzjNO4)Fu{4ck9NYIhe|*>V{q?=q^}P4>F3)?tf85V~KbcMr$m604q5uFK zw?)BSKy(7bOXM&(W2sL~LHH#CH5?Tey{5O!3OI1eEKVGE-&1 zfMpoDUG4dO1DPiwn{alPh?2g(Vt_@z=uexuUvMI6foLVix}~jV%+2Zz=7`&(!V$SA z-6^srGJHwrjK-p|`RC&9TBeTHOb8S~>S`dlN~*WKfcbcuQN>dw|$e0)5GLebFB*xTC+)ZgCS=99@} z6-)fm@^Y%5$%PA!uLcW|=<6vjm*$v6CX;zWh<2Yd^x?yYhTCkIg@ulej*10teRIW2 zIOT+b0&ekRiQ{uiE2;eAVi*jjdy2rhkHccQjo5K;x$G}T?{w4tclC|6&&}a%vW2y^ zHB7m-vQiX?;LX|qK+1cFt}ctsR#8?qB4Wr1(P^z2#*a-BUBI4|L4U&CSfvr6BdBWn`XSn;#h&+1=e;ou+GQY6kfGo1B&a zIs}z&+BY$nF%JaSW18wK=k4un^pQn94~|0sE-sGC5!e1LqehyhL}>sHn24 z>XJ$?o6Q~=V2Gc~Mcuu7S4t?X&I?Ek&|bchK|kAOE!Si55pQ0$le*_z^pBQv~5 z^gh+BI!;IOSO07ZpZS%Z|E>cHGc}d}}+uslqp9pEQILj5Hd1EBqi6rf6pQi`uqCcIzM4A5+6MhP3z3e%-q}Ax_&0_COv9T zZb7cgy#_Pc`k-pN2i#UvQ1F$r#0w&VgM+=io;5c|qfi-eb>7B?Y$kkia;IfY$05o*1GQ#s!zf=Ie}FpEiH}5 z<4=knebS5Z@BklIebQ@cYHDL+Q|tZCMf)jOMLH13i(wAPiv^{guV24XsRlrz-MJ$G z9El7lkFra<$lKbI6cYn~m_;N;M@DMoqMV(b-LyCUDzyd@fByV=Oj0>DHMOO+H7Y9V zFc7FexyXLLx4X--5f`?Ojip^top^h6M|%$b@DRXYFz}WMI9zL8-CwgBqG>;Qb4VJ- zp<);t8rpI2af&q<+E`XrCMzqerKL6IVlsZ~m*f|vrKN*|gKyqI2t+b0HjhLi6&9L6 zp^2&@K!-1MX#?llvAYW+FlHl6z^u^5*82Jrm(nzJrpCsM%+2HY3j+%aL37_)Kt89u zhh9#8iaKLxXn2nXGcr1rtO|7S7umx@L)kMTL?(Z8(+EK}jSPy35zP1h4gl}G6E>GU zS+5@%u!0&U?=&$~#k<6XyVi{$kT>n^U-0SJkdTYyeovUtMJV)#j%`WsaYZrm?_H`Gi>{}jXYTR*8*t-!% z&-hJk?8n18WqVkO19Oh|+J$nhtg^E5nu9~Pc$cHhT6d13S;;D>ODQQSQbGd*17V-2 z942(vfajrGz$^U%vc%ZfSjY-`e6AuBS>^&>i;IiX(bhIIGcyYRl1=)QxthK*^kF#I zz^tUEp#fAN8Gh3wEh;2Hrj|}uY{;w_=jPbMB+|RSMNrYzX+W;-avhlU6~80 z{M!MFtW=pWbX3T!GbDes!B>&&s=JR|=R^k)au8KJ8@}m=yn=#)qGz%Fn*yZ5|y^^6TXioiF#}wvC|Ls1%R!M1H9&{Z}NWtDa#8x literal 2371 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 U?LhrsU^&O&>FVdQ&MBb@0HBIqp#T5? literal 1291 zcmeAS@N?(olHy`uVBq!ia0vp^$AS0<2NRII?w$G)NO2Z;L>2?(KZ7u%{$JaF3=AxL zJzX3_D(1Ysu|InbtIY9_&v)KY&5VjlQpj{}m*}{l>)aY*@K^dyh)m0yrtXmG=enZ9 z#k-rEqyIHtIOx{hA)>h5U==EgvgubiqF1$m6Eq>dHi1vj z+?vze-0^jvuO2#dNaHbMsBOiEgpUQ^7GJmXkv}H!dq?H+n>qVxLR|yrtoGMGcgB5v z(jMQd>Z?})fzD~+&m};Y*@7}e*eG9znjbD z>n^?Aviok{TC<6}dkam?t#|L(VezQKA=KO3`!@f6{jQ|!?A14O`u=Tyu=C)5#{XAd zmPD<+_Hxdlh!@{~tLL?aZr!!(R*o4zA77EW;kR|MyUYIl`T216rd6vh?`-?eA1?+< zAz9&i1quUMBc0SC!H~sn!UK+|3@6_d0Bb+{QUasS#RTamApLGyEQ8J zhV;(urEZsAf0ehb`*eE!{wSN7WisU1}^l|OlwRiXb@4Ec*&6_uWeq26( zw@%Wwf1}CG8FOk=^FRu^7DdFx>2)o-n`dA3=gE%cTK{Gq47D}4x3@R84V<>>k^b|v zbEZ)w^uUl#$B$Ei(guKN9$Snd@1L8vBD0a$GOWwhnmFv;pn`5Iv9#^CAd K=d#Wzp$P!EtC6Pw 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 b3c0d84524c75a780d9d32aff01ec531540b7647..49b108ea8590f987f5a36eb1321db7ce66fe9fa4 100644 GIT binary patch literal 1036 zcmeAS@N?(olHy`uVBq!ia0vp^h71ghb2ylQtpD8i&jTsW0*}aIp!|OjX8h8%sgr?$ zd7r0?V@SoEw>S1@tE9>_d@L_AR+)ZvgMC7;w1w)?rj`kRn3r*G+^G~%*%W)rdCSHP z8}}cpR}kRm=2l!g^@OP#hd9SW7RMt~8?I*Uk-e5|zByS{?A=@2-J9K)Rm>~8@%~Kv z&yV{y1kQWDFh%!{NrKO;2vnGAa`eCbm6s)U72p5H%@VW!EnWVu=Hu7tTcg&lc=_ea zmapY+Cx1JB)K~uBj|G=so;fJuv_n>Z>$KTNeNV2nIRDw^{9+BQtXbiI>;8ZEP*7UB z^=6KojLZ?kU3X5`9)E0+xBWH{+|4sTZDbL8?7g3`HyCE0Ns3>6wa%;l?~9Yo55IoZ zI4vfYR{q`nyqLK7^MqS>@A}Hs&0F^J=+UE3pQi4On}735+16d#wwbX9b0nsxtG8^} zvnOV4SoGR!XO`WZwI$Ge_SwmkC&#T1|6`=Bt^G%~L+$_ZTW`y{o1Hkky}hS;vHttP zx=eayPj;i)v{6X25D2sR_Tu8ji&w9Pe%!o%{rdOs-}_se9xJJ-srmo!@WBUjA1(8G zy4k(|-kn>ww6dgn-3tGN?f;)y7(A(F`tzS#f*;SnyGM$zJv}|$fBrYA-e1R#xoP@D zPW$`kbpH9ahf{BR?!N0csl{jSo%eeDiqfvvBSl;V=W9KVTF|)^2t(a2|0uONUB~}$ z_M>$9-b<3pj?MV??c2M1f6aXNzxrBL|L5oRFV!#VufBeL_Ilj>GObw~^5@T=U;qE` z<3zKg+dk~cTCeu~-Cp+ZyT#ue+%D$C!J2nv|I?ox|0^bC78e&ANce26wOjADm@z+S l#-BHNtBlsMrkea^KI^u63cvfkW?=Sa@O1TaS?83{1OVNvDd9Jlk&o|ksaOXrV~bo#sFV)yecZSK{~ z*#6%3hQ|5N2GVEu<{jAYxo}B9kcQ?I5ic&))=5rh1yujNUtG8U|Ha?(e3O^_dh`Cy zj*nNj$D7YSJ88<}$B*B|pFLkSKWur;pU->i_Q%f?a@rxMUm|XORdZ{0;k@US^V|bN zCVg5Y)$8{A_wUoEPtWyB&(GKI>yGjMQ=hI35?`qShN6tETcIxxKP0v4n{`^$)_U+qSf5)qN7L}Ei)z#h0+UgaYXC|es zt^HI}v1RSrwE~A8JxW@9@kQD0rJDa&FIv6n@=F<6S>E=;uhvIKMa|lEA@Jk%&)HQ8;nc{M}n)URK^Ds1+h@-^F9 qwmbHZr_)EKy^qo|jL!=^&9~pbddgnb%6MS@W$<+Mb6Mw<&;$Uj<;7C~ 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 07ab3c79864ca70a00cc2f5d63deaaff511fe403..462a5788f3c27648f0496baf4a3e0e30499705be 100644 GIT binary patch literal 527 zcmV+q0`UEbP)r2edr@Kr%OrJJg-E%EG4ltn@NUa(G#XJ9b-UeGtCff*M>wTYsZyy(DYMyZBAWD2lNxGLLrrR^ zNzLN@?&tH}>G!XUGcFv)^t&hWm+QKAnr_44Z8)seY6l1VzVB-{9eG}%P_WbVSG8I# z7K=d;XgBFu)x8*>2Q1c+^XK50CA)o+10*A-`<&&%a9;<(vtDz19l{Z0s;PJ6#!5yuz|28n2j zfkNr`&BZa#-3+#lohcq-*4 RlyCq5002ovPDHLkV1h^$^CkcQ literal 685 zcmV;e0#f~nP)VdyQgm2c+*4wQ!fTg> zF8u&u1v^w=bP7sCA!zB~Df$P(t{tOG1^v2h1VsxGdnj-b4H*}-*72DxU4(Y#@mXg~ zdS2J@JI{MWe4YUWK@bE%5ClOGgnyi5b8YdEraz?^1l(F&lhyCrz1Av#_NcRp&9#%K zBFQ7=m1}eSY4+CM-k#g;wH7hvaQGFU6`ft+4s%>wB2-mXxmYa9l}d$$*w8`Cs9<#KtWP$+1uvl9(hR7FZ868=;w6`+(J4~N6k5xyTH+-oA-Ya-lhBHU|s zXO;HH_80T=yE|=}$UdSfepw#xb9U)ZXd3foIm9mf`KGaTZqwL0kjZ4uFE1~x>AKEW zxQElB5Mr?y*R1X75Wp({NT<^)@pv53Xq0OaH#mg@00<$U>-G9hqtWQQ6+#GU8iv7q zf4euJA*E931YZ)HUa!}#R;w*H*AVu@>8El5z`Tp=e*^H0XV5Nu6-Ye>GAdsaizi*+ z>lpx_MxC_#SD68pC~%)|hhXwz$Dv_QTtnlcX=>og)f+dH$z&6jwUN)~AF<9(^sJ() z#2*NRF8$iYb<4uTTCEmjot%UHA{6eii`M*YDoiHKlv~ z0rQ)l>zGf6vIHpdn7{I2WRwpxg$IMd2Zqr(Mr6t4YjQ>@-e|gW!U_%O?XxI14-? zi-9^mgD|81U)z5`LG}_)Usv|W+-z)I+A)a-EP+D4o-U3d8Ta0vXB1>m;9*#J{omYl pzVZtV!M^i%>nbRc05WN_|ftbQ%&bslIigQu&X%Q~loCIEAsF^K>G literal 190 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 ajDlxnkh^!JoCZ7%q0rMZ)~wKY1phyD`qHle literal 0 HcmV?d00001 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 da0b745c5116beeb31276320596ba780b5e5be12..6d7baf19c96810fb2899b3a88f684e47181b7373 100644 GIT binary patch literal 388 zcmeAS@N?(olHy`uVBq!ia0vp^hCr;z!2~3QtHbsJDb50q$YP-Ue-LK;(zU6Rfq~J? z)5S3)qBZ%?|Nr)f6_|aP-!kYVT=6~97-%lY?snHjMxs=>5VydI^2^uP$FF?Bm*UVj zTh6xXiR^=g>lPn6cyivPi7ut)hLdjXum163q5Fc(aZ6@2s9c{P|6guy?dcBz8Q-7% zWqzp^o$kFY{!Yahx2ug?2VGTz2d3brAP1X?X51)yYE;gz|7p-AoKed@9ULM z6(-$1a^l2~@9*tR4*vfy`R}i@_!5>0&(vI9U44Cf^WWDia__7Ep=_cur7KU#($=>6 z-(E_)}8&$en2zs-@7|u^IKAOJXHGLzxU$PvNvyEEx)6w;&P##U!L!+ zea{;{Ha51z)OS-?hXualyENz1^Yij$d}bwo&-D2C^n5An>ged0IP>B1>GvnH-naep z>iKhb(d84Sg~jcudH5uCv9z9+!r8z7@Bdd1zqjA&)B7_QxkC!M4%Z7E>=xIz`Fr=s zl9rh>W+**AAuU-5Y8BR{R6mMK4 R5C#lS22WQ%mvv4FO#t@+slfmM From a74035cd4e06d5dd05d2f0571e59045e4d725114 Mon Sep 17 00:00:00 2001 From: David Signer Date: Wed, 6 Nov 2019 10:41:02 +0100 Subject: [PATCH 3/3] set RULELABEL to false to have the expected behavior --- .../test_qgsserver_wms_getlegendgraphic.py | 1 + .../WMS_GetLegendGraphic_Transparent.png | Bin 527 -> 670 bytes 2 files changed, 1 insertion(+) diff --git a/tests/src/python/test_qgsserver_wms_getlegendgraphic.py b/tests/src/python/test_qgsserver_wms_getlegendgraphic.py index c8dbb1771b0..82b801c7d3e 100644 --- a/tests/src/python/test_qgsserver_wms_getlegendgraphic.py +++ b/tests/src/python/test_qgsserver_wms_getlegendgraphic.py @@ -375,6 +375,7 @@ class TestQgsServerWMSGetLegendGraphic(QgsServerTestBase): "REQUEST": "GetLegendGraphic", "LAYER": "Country,Hello", "LAYERTITLE": "FALSE", + "RULELABEL": "FALSE", "FORMAT": "image/png", "HEIGHT": "500", "WIDTH": "500", 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 462a5788f3c27648f0496baf4a3e0e30499705be..7ed17278c7ad41b3e387bd93bca9025b1df8a5da 100644 GIT binary patch delta 657 zcmV;C0&e|}1fB(u8Gi-<004r@^T_}J00v@9M??Vs0RI60puMM)00009a7bBm000g1 z000g10WbYM{r~^~2XskIMF-;x2M!JyMs;Ff0006jNkl(0xRKvata_Vk>zG|&_# zIOl4mQc>&mx_=lojylO)o{H%4VzKzf_x)b2R@*3-%X;V}G_EP>bUK>NW(^_4$#^^- zK8bNb5+p$qBta4+F>3GRe009}SKqBVDpMnjYf)7luXA7ggs$sSC7y4(TNgIntwZ^I z{^H`|!ir^CW0g2-nn)&-QY8T36#(RNxusMp1>3emmw!%wVT^rlwOTvvc6%V}AdIn& z>$)SwSN8j1wOTzT^EN%ta~h3Cmxk^C^+y2!TmmpFasO`sp2?J02C|QVJeTM2qz`;O z2jG*e>NEu`2;jahPvXVSek0QdqJ3;_T`YQ;%{BuIiJNMZt$U5EXdP^BP5U%JFg;KOU+@^m6` z__%4#rbIAa3CpsPm^&&};s?+=4*=`yYj<{i<=$YZgfX4|c{~cBse#P1FsTx;SnPr8 r_D(QW@#Vb_ye||AJsP%&3G*A}D2$K+Gi`hT015yANkvXXu0mjf4HGHC delta 512 zcmV+b0{{J<1&;)f8Gix*000fBWS#&3010qNS#tmY4gUZD4gUf3in56S00F^CL_t(& zf$i5%YZ^fq$MK&tJKZFL-K^2Vdhr?z_EN+g0=|qKgb3!47KEImMIncrd>5YcA_DEX z&_f^uj|NE~Y!2GSb+(5>PyQKaCa}=wgQsQZ*)NMYBR~itgntl1$p0a=@amrHOU%uu zyG%SxpEh0PEWCP{D|bJBF;2qCw+m}c+s;<7lQ&L+lj1^%cDvo{_0(4}^9Qf+Zp&>n z8c`H=yWLi+m53%sIHgjlQmIHOv)ODSn)FbU8fsEQO=_q~&Eoy;=kwj^_pgjIE*!@6 zyC?FO>$-NDZhyn!Z8)seY6l1VzVB-{9eG}%P_WbVSG8I#7K=d;XgBFu)x8*>2Q1c+^XK50CA z)o+10*A-`<&&%a9;<(vtDz19l{Z0s;PJ6#!5yuz|26>5Sih)RCw&6eOB%TYXNewlr zp(Zs+Y+AOrJOVf7)1{nftXkIe131p*c0KRCjP;v*Kgi`j*lHR9xVpN0jZ(Aun)9)B zYt98M1&0~DC@rg+GMP*mzHnyYJxPgry>32-B-|h4^>`}fCX{dh0000