Merge pull request #45282 from pathmapper/empty_check

Remove redundant check
qgis · Oct 1, 2021 · 97884ad · 97884ad
2 parents 994d1a4 + 596c92d
commit 97884ad
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 40 deletions.
diff --git a/src/server/services/landingpage/qgslandingpageutils.cpp b/src/server/services/landingpage/qgslandingpageutils.cpp
@@ -294,10 +294,6 @@ json QgsLandingPageUtils::projectInfo( const QString &projectUri, const QgsServe
     QString title { p->metadata().title() };
     if ( title.isEmpty() )
       title = QgsServerProjectUtils::owsServiceTitle( *p );
-    if ( title.isEmpty() )
-      title = p->title();
-    if ( title.isEmpty() )
-      title = p->baseName();
     info["title"] = title.toStdString();
     // Description
     QString description { p->metadata().abstract() };

diff --git a/src/server/services/wcs/qgswcsgetcapabilities.cpp b/src/server/services/wcs/qgswcsgetcapabilities.cpp
@@ -142,13 +142,10 @@ namespace QgsWcs
     serviceElem.appendChild( nameElem );
 
     const QString title = QgsServerProjectUtils::owsServiceTitle( *project );
-    if ( !title.isEmpty() )
-    {
-      QDomElement titleElem = doc.createElement( QStringLiteral( "label" ) );
-      const QDomText titleText = doc.createTextNode( title );
-      titleElem.appendChild( titleText );
-      serviceElem.appendChild( titleElem );
-    }
+    QDomElement titleElem = doc.createElement( QStringLiteral( "label" ) );
+    const QDomText titleText = doc.createTextNode( title );
+    titleElem.appendChild( titleText );
+    serviceElem.appendChild( titleElem );
 
     const QString abstract = QgsServerProjectUtils::owsServiceAbstract( *project );
     if ( !abstract.isEmpty() )

diff --git a/src/server/services/wfs/qgswfsgetcapabilities.cpp b/src/server/services/wfs/qgswfsgetcapabilities.cpp
@@ -170,13 +170,10 @@ namespace QgsWfs
     QDomElement serviceElem = doc.createElement( QStringLiteral( "ows:ServiceIdentification" ) );
 
     const QString title = QgsServerProjectUtils::owsServiceTitle( *project );
-    if ( !title.isEmpty() )
-    {
-      QDomElement titleElem = doc.createElement( QStringLiteral( "ows:Title" ) );
-      const QDomText titleText = doc.createTextNode( title );
-      titleElem.appendChild( titleText );
-      serviceElem.appendChild( titleElem );
-    }
+    QDomElement titleElem = doc.createElement( QStringLiteral( "ows:Title" ) );
+    const QDomText titleText = doc.createTextNode( title );
+    titleElem.appendChild( titleText );
+    serviceElem.appendChild( titleElem );
 
     const QString abstract = QgsServerProjectUtils::owsServiceAbstract( *project );
     if ( !abstract.isEmpty() )

diff --git a/src/server/services/wfs/qgswfsgetcapabilities_1_0_0.cpp b/src/server/services/wfs/qgswfsgetcapabilities_1_0_0.cpp
@@ -141,13 +141,10 @@ namespace QgsWfs
       serviceElem.appendChild( nameElem );
 
       const QString title = QgsServerProjectUtils::owsServiceTitle( *project );
-      if ( !title.isEmpty() )
-      {
-        QDomElement titleElem = doc.createElement( QStringLiteral( "Title" ) );
-        const QDomText titleText = doc.createTextNode( title );
-        titleElem.appendChild( titleText );
-        serviceElem.appendChild( titleElem );
-      }
+      QDomElement titleElem = doc.createElement( QStringLiteral( "Title" ) );
+      const QDomText titleText = doc.createTextNode( title );
+      titleElem.appendChild( titleText );
+      serviceElem.appendChild( titleElem );
 
       const QString abstract = QgsServerProjectUtils::owsServiceAbstract( *project );
       if ( !abstract.isEmpty() )

diff --git a/src/server/services/wms/qgswmsgetcontext.cpp b/src/server/services/wms/qgswmsgetcontext.cpp
@@ -135,15 +135,11 @@ namespace QgsWms
       generalElem.appendChild( windowElem );
 
       //OWS title
-      //why not use project title ?
       const QString title = QgsServerProjectUtils::owsServiceTitle( *project );
-      if ( !title.isEmpty() )
-      {
-        QDomElement titleElem = doc.createElement( QStringLiteral( "ows:Title" ) );
-        const QDomText titleText = doc.createTextNode( title );
-        titleElem.appendChild( titleText );
-        generalElem.appendChild( titleElem );
-      }
+      QDomElement titleElem = doc.createElement( QStringLiteral( "ows:Title" ) );
+      const QDomText titleText = doc.createTextNode( title );
+      titleElem.appendChild( titleText );
+      generalElem.appendChild( titleElem );
 
       //OWS abstract
       const QString abstract = QgsServerProjectUtils::owsServiceAbstract( *project );

diff --git a/src/server/services/wmts/qgswmtsgetcapabilities.cpp b/src/server/services/wmts/qgswmtsgetcapabilities.cpp
@@ -124,13 +124,10 @@ namespace QgsWmts
     serviceElem.appendChild( typeVersionElem );
 
     const QString title = QgsServerProjectUtils::owsServiceTitle( *project );
-    if ( !title.isEmpty() )
-    {
-      QDomElement titleElem = doc.createElement( QStringLiteral( "ows:Title" ) );
-      const QDomText titleText = doc.createTextNode( title );
-      titleElem.appendChild( titleText );
-      serviceElem.appendChild( titleElem );
-    }
+    QDomElement titleElem = doc.createElement( QStringLiteral( "ows:Title" ) );
+    const QDomText titleText = doc.createTextNode( title );
+    titleElem.appendChild( titleText );
+    serviceElem.appendChild( titleElem );
 
     const QString abstract = QgsServerProjectUtils::owsServiceAbstract( *project );
     if ( !abstract.isEmpty() )