Merge pull request #8950 from elpaso/bugfix-opengis-zug-wmsroot

elpaso · nyalldawson · commit ac1b49263423 · 2019-02-07T09:08:16.000+11:00
Fix server WMS short name (unreported) Cherry-picked from master de29767
diff --git a/src/server/services/wms/qgswmsrenderer.cpp b/src/server/services/wms/qgswmsrenderer.cpp
@@ -2425,8 +2425,9 @@ namespace QgsWms
     }
 
     // init groups
+    const QString rootName { QgsServerProjectUtils::wmsRootName( *mProject ) };
     const QgsLayerTreeGroup *root = mProject->layerTreeRoot();
-    initLayerGroupsRecursive( root, mProject->title() );
+    initLayerGroupsRecursive( root, rootName.isEmpty() ? mProject->title() : rootName );
   }
 
   void QgsRenderer::initLayerGroupsRecursive( const QgsLayerTreeGroup *group, const QString &groupName )
diff --git a/tests/src/python/test_qgsserver_wms_getlegendgraphic.py b/tests/src/python/test_qgsserver_wms_getlegendgraphic.py
@@ -488,6 +488,47 @@ def test_wms_GetLegendGraphic_EmptyLegend(self):
         self.assertEqual(-1, h.find(b'Content-Type: text/xml; charset=utf-8'), "Header: %s\nResponse:\n%s" % (h, r))
         self.assertNotEqual(-1, h.find(b'Content-Type: image/png'), "Header: %s\nResponse:\n%s" % (h, r))
 
+    def test_wms_GetLegendGraphic_wmsRootName(self):
+        """Test an unreported issue when a wmsRootName short name is set in the service capabilities"""
+
+        # First test with the project title itself:
+        qs = "?" + "&".join(["%s=%s" % i for i in list({
+            "MAP": self.testdata_path + 'test_project_wms_grouped_layers.qgs',
+            "SERVICE": "WMS",
+            "VERSION": "1.1.1",
+            "REQUEST": "GetLegendGraphic",
+            "LAYER": "QGIS%20Server%20-%20Grouped%20Layer",
+            "FORMAT": "image/png",
+            "HEIGHT": "840",
+            "WIDTH": "1226",
+            "BBOX": "609152,5808188,625492,5814318",
+            "SRS": "EPSG:25832",
+            "SCALE": "38976"
+        }.items())])
+
+        h, r = self._execute_request(qs)
+        self.assertEqual(-1, h.find(b'Content-Type: text/xml; charset=utf-8'), "Header: %s\nResponse:\n%s" % (h, r))
+        self.assertNotEqual(-1, h.find(b'Content-Type: image/png'), "Header: %s\nResponse:\n%s" % (h, r))
+
+        # Then test with the wmsRootName short name:
+        qs = "?" + "&".join(["%s=%s" % i for i in list({
+            "MAP": self.testdata_path + 'test_project_wms_grouped_layers_wmsroot.qgs',
+            "SERVICE": "WMS",
+            "VERSION": "1.1.1",
+            "REQUEST": "GetLegendGraphic",
+            "LAYER": "All_grouped_layers",
+            "FORMAT": "image/png",
+            "HEIGHT": "840",
+            "WIDTH": "1226",
+            "BBOX": "609152,5808188,625492,5814318",
+            "SRS": "EPSG:25832",
+            "SCALE": "38976"
+        }.items())])
+
+        h, r = self._execute_request(qs)
+        self.assertEqual(-1, h.find(b'Content-Type: text/xml; charset=utf-8'), "Header: %s\nResponse:\n%s" % (h, r))
+        self.assertNotEqual(-1, h.find(b'Content-Type: image/png'), "Header: %s\nResponse:\n%s" % (h, r))
+
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/tests/testdata/qgis_server/test_project_wms_grouped_layers_wmsroot.qgs b/tests/testdata/qgis_server/test_project_wms_grouped_layers_wmsroot.qgs

Original file line number	Diff line number	Diff line change
`@@ -2425,8 +2425,9 @@ namespace QgsWms`
`2425`	`2425`	`}`
`2426`	`2426`
`2427`	`2427`	`// init groups`
	`2428`	`+ const QString rootName { QgsServerProjectUtils::wmsRootName( *mProject ) };`
`2428`	`2429`	`const QgsLayerTreeGroup *root = mProject->layerTreeRoot();`
`2429`		`- initLayerGroupsRecursive( root, mProject->title() );`
	`2430`	`+ initLayerGroupsRecursive( root, rootName.isEmpty() ? mProject->title() : rootName );`
`2430`	`2431`	`}`
`2431`	`2432`
`2432`	`2433`	`void QgsRenderer::initLayerGroupsRecursive( const QgsLayerTreeGroup *group, const QString &groupName )`