The capabilities request is managed in parameters class

qgis · Mar 9, 2021 · f82fec3 · f82fec3
1 parent c3a4994
commit f82fec3
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 6 deletions.
diff --git a/python/server/auto_generated/qgsserverparameters.sip.in b/python/server/auto_generated/qgsserverparameters.sip.in
@@ -324,7 +324,7 @@ defined.
 :return: service
 %End
 
-    QString request() const;
+    virtual QString request() const;
 %Docstring
 Returns REQUEST parameter as a string or an empty string if not
 defined.

diff --git a/src/server/qgsserverparameters.h b/src/server/qgsserverparameters.h
@@ -302,7 +302,7 @@ class SERVER_EXPORT QgsServerParameters
      * defined.
      * \returns request
      */
-    QString request() const;
+    virtual QString request() const;
 
     /**
      * Returns MAP parameter as a string or an empty string if not

diff --git a/src/server/services/wms/qgswms.cpp b/src/server/services/wms/qgswms.cpp
@@ -99,9 +99,7 @@ namespace QgsWms
                                      QStringLiteral( "Please add or check the value of the REQUEST parameter" ), 501 );
         }
 
-        if ( ( mVersion.compare( QLatin1String( "1.1.1" ) ) == 0 \
-               && QSTR_COMPARE( req, "capabilities" ) )
-             || QSTR_COMPARE( req, "GetCapabilities" ) )
+        if ( QSTR_COMPARE( req, "GetCapabilities" ) )
         {
           writeGetCapabilities( mServerIface, project, version, request, response, false );
         }

diff --git a/src/server/services/wms/qgswmsparameters.cpp b/src/server/services/wms/qgswmsparameters.cpp
@@ -757,7 +757,7 @@ namespace QgsWms
   {
     QString version = QgsServerParameters::version();
 
-    if ( request().compare( QLatin1String( "GetProjectSettings" ), Qt::CaseInsensitive ) == 0 )
+    if ( QgsServerParameters::request().compare( QLatin1String( "GetProjectSettings" ), Qt::CaseInsensitive ) == 0 )
     {
       version = QStringLiteral( "1.3.0" );
     }
@@ -790,6 +790,19 @@ namespace QgsWms
     return version;
   }
 
+  QString QgsWmsParameters::request() const
+  {
+    QString req = QgsServerParameters::request();
+
+    if ( version().compare( QLatin1String( "1.1.1" ) ) == 0
+         && req.compare( QLatin1String( "capabilities" ), Qt::CaseInsensitive ) == 0 )
+    {
+      req = QStringLiteral( "GetCapabilities" );
+    }
+
+    return req;
+  }
+
   QgsProjectVersion QgsWmsParameters::versionAsNumber() const
   {
     return QgsProjectVersion( version() );

diff --git a/src/server/services/wms/qgswmsparameters.h b/src/server/services/wms/qgswmsparameters.h
@@ -1329,6 +1329,8 @@ namespace QgsWms
 
       QString version() const override;
 
+      QString request() const override;
+
     private:
       static bool isExternalLayer( const QString &name );