Merge pull request #6792 from mhugent/get_legend_fix_no_layers

mhugent · web-flow · commit 673fafb04b54 · 2018-04-17T14:59:05.000+02:00
2.18 Server: return empty image in GetLegendGraphis if no layer is there
diff --git a/src/server/qgswmsserver.cpp b/src/server/qgswmsserver.cpp
@@ -762,7 +762,7 @@ QImage* QgsWMSServer::getLegendGraphics()
 
   if ( layersList.size() < 1 )
   {
-    return nullptr;
+    return createImage( 1, 1, false );
   }
 
   //scale
@@ -782,7 +782,7 @@ QImage* QgsWMSServer::getLegendGraphics()
   QStringList layerIds = mConfigParser->layerSet( layersList, stylesList, dummyCRS, scaleDenominator );
   if ( layerIds.size() < 1 )
   {
-    return nullptr;
+    return createImage( 1, 1, false );
   }
 
   //get icon size, spaces between legend items and font from config parser
diff --git a/tests/src/python/test_qgsserver.py b/tests/src/python/test_qgsserver.py
@@ -893,6 +893,25 @@ def test_wms_GetLegendGraphic_BBox2(self):
         r, h = self._result(self.server.handleRequest(qs))
         self._img_diff_error(r, h, "WMS_GetLegendGraphic_BBox2")
 
+    def test_wms_GetLegendGraphic_EmptyLegend(self):
+        mapPath = self.testdata_path + 'test_project_contextual_legend.qgs'
+        qs = "&".join(["%s=%s" % i for i in list({
+            "MAP": urllib.quote(mapPath),
+            "SERVICE": "WMS",
+            "VERSION": "1.3.1",
+            "REQUEST": "GetLegendGraphic",
+            "LAYER": "QGIS%20Server%20Hello%20World",
+            "FORMAT": "image/png",
+            "HEIGHT": "840",
+            "WIDTH": "1226",
+            "BBOX": "10.38450,-49.6370,73.8183,42.9461",
+            "SRS": "EPSG:4326",
+            "SCALE": "15466642"
+        }.items())])
+
+        r, h = self._result(self.server.handleRequest(qs) )
+        self.assertTrue( h['Content-Type'] == 'image/png' )
+
     def _result(self, data):
         headers = {}
         for line in data[0].decode('UTF-8').split("\n"):
diff --git a/tests/testdata/qgis_server/test_project_contextual_legend.qgs b/tests/testdata/qgis_server/test_project_contextual_legend.qgs

Original file line number	Diff line number	Diff line change
`@@ -762,7 +762,7 @@ QImage* QgsWMSServer::getLegendGraphics()`
`762`	`762`
`763`	`763`	`if ( layersList.size() < 1 )`
`764`	`764`	`{`
`765`		`- return nullptr;`
	`765`	`+ return createImage( 1, 1, false );`
`766`	`766`	`}`
`767`	`767`
`768`	`768`	`//scale`
`@@ -782,7 +782,7 @@ QImage* QgsWMSServer::getLegendGraphics()`
`782`	`782`	`QStringList layerIds = mConfigParser->layerSet( layersList, stylesList, dummyCRS, scaleDenominator );`
`783`	`783`	`if ( layerIds.size() < 1 )`
`784`	`784`	`{`
`785`		`- return nullptr;`
	`785`	`+ return createImage( 1, 1, false );`
`786`	`786`	`}`
`787`	`787`
`788`	`788`	`//get icon size, spaces between legend items and font from config parser`