Improves QGIS Server WMS GetCapabilities output

Fixes #40736
qgis · Jan 4, 2021 · 118ba4d31c39308183470afb0a35f365ff72053a · 118ba4d
1 parent 8b00a0c
commit 118ba4d31c39308183470afb0a35f365ff72053a
Unified Split

Showing with 25 additions and 8 deletions.

+25 −8 src/server/services/wms/qgswmsgetcapabilities.cpp
diff --git a/src/server/services/wms/qgswmsgetcapabilities.cpp b/src/server/services/wms/qgswmsgetcapabilities.cpp
@@ -846,17 +846,34 @@ namespace QgsWms
       layerParentElem.appendChild( layerParentNameElem );
     }
 
-    if ( !project->title().isEmpty() )
+    // Root Layer title
+    QDomText layerParentTitleText;
+    QString rootLayerTitle = QgsServerProjectUtils::owsServiceTitle( *project );
+    QDomElement layerParentTitleElem = doc.createElement( QStringLiteral( "Title" ) );
+    if ( !rootLayerTitle.isEmpty() )
     {
-      // Root Layer title
-      QDomElement layerParentTitleElem = doc.createElement( QStringLiteral( "Title" ) );
-      QDomText layerParentTitleText = doc.createTextNode( project->title() );
-      layerParentTitleElem.appendChild( layerParentTitleText );
-      layerParentElem.appendChild( layerParentTitleElem );
+      layerParentTitleText = doc.createTextNode( rootLayerTitle );
+    }
+    else
+    {
+      if ( !project->title().isEmpty() )
+      {
+        layerParentTitleText = doc.createTextNode( project->title() );
+      }
+      else
+      {
+        layerParentTitleText = doc.createTextNode( QStringLiteral( "untitled" ) );
+      }
+    }
+    layerParentTitleElem.appendChild( layerParentTitleText );
+    layerParentElem.appendChild( layerParentTitleElem );
 
-      // Root Layer abstract
+    // Root Layer abstract
+    QString rootLayerAbstract = QgsServerProjectUtils::owsServiceAbstract( *project );
+    if ( !rootLayerAbstract.isEmpty() )
+    {
       QDomElement layerParentAbstElem = doc.createElement( QStringLiteral( "Abstract" ) );
-      QDomText layerParentAbstText = doc.createTextNode( project->title() );
+      QDomText layerParentAbstText = doc.createTextNode( rootLayerAbstract );
       layerParentAbstElem.appendChild( layerParentAbstText );
       layerParentElem.appendChild( layerParentAbstElem );
     }