Update getcontext

qgis · Mar 9, 2021 · daab06c · daab06c
1 parent ca43236
commit daab06c
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 16 deletions.
diff --git a/src/server/services/wms/qgswms.cpp b/src/server/services/wms/qgswms.cpp
@@ -126,7 +126,7 @@ namespace QgsWms
         }
         else if ( QSTR_COMPARE( req, "GetContext" ) )
         {
-          writeGetContext( mServerIface, project, version, request, response );
+          writeGetContext( mServerIface, project, request, response );
         }
         else if ( QSTR_COMPARE( req, "GetSchemaExtension" ) )
         {

diff --git a/src/server/services/wms/qgswmsgetcontext.cpp b/src/server/services/wms/qgswmsgetcontext.cpp
@@ -19,6 +19,7 @@
  *                                                                         *
  ***************************************************************************/
 #include "qgswmsutils.h"
+#include "qgswmsrequest.h"
 #include "qgswmsgetcontext.h"
 #include "qgsserverprojectutils.h"
 
@@ -40,18 +41,18 @@ namespace QgsWms
                                        QDomElement &parentLayer,
                                        QgsServerInterface *serverIface,
                                        const QgsProject *project,
-                                       const QgsServerRequest &request,
+                                       const QgsWmsRequest &request,
                                        const QgsLayerTreeGroup *layerTreeGroup,
                                        QgsRectangle &combinedBBox,
                                        const QString &strGroup );
 
     void appendOwsGeneralAndResourceList( QDomDocument &doc, QDomElement &parentElement,
                                           QgsServerInterface *serverIface, const QgsProject *project,
-                                          const QgsServerRequest &request );
+                                          const QgsWmsRequest &request );
   }
 
   void writeGetContext( QgsServerInterface *serverIface, const QgsProject *project,
-                        const QString &version, const QgsServerRequest &request,
+                        const QgsWmsRequest &request,
                         QgsServerResponse &response )
   {
 #ifdef HAVE_SERVER_PYTHON_PLUGINS
@@ -69,7 +70,7 @@ namespace QgsWms
     }
     else //context xml not in cache. Create a new one
     {
-      doc = getContext( serverIface, project, version, request );
+      doc = getContext( serverIface, project, request );
 
       if ( cacheManager )
       {
@@ -78,19 +79,18 @@ namespace QgsWms
       contextDocument = &doc;
     }
 #else
-    doc = getContext( serverIface, project, version, request );
+    doc = getContext( serverIface, project, request );
     contextDocument = &doc;
 #endif
     response.setHeader( QStringLiteral( "Content-Type" ), QStringLiteral( "text/xml; charset=utf-8" ) );
     response.write( contextDocument->toByteArray() );
   }
 
 
-  QDomDocument getContext( QgsServerInterface *serverIface, const QgsProject *project,
-                           const QString &version, const QgsServerRequest &request )
+  QDomDocument getContext( QgsServerInterface *serverIface,
+                           const QgsProject *project,
+                           const QgsWmsRequest &request )
   {
-    Q_UNUSED( version )
-
     QDomDocument doc;
     QDomProcessingInstruction xmlDeclaration = doc.createProcessingInstruction( QStringLiteral( "xml" ),
         QStringLiteral( "version=\"1.0\" encoding=\"utf-8\"" ) );
@@ -121,7 +121,7 @@ namespace QgsWms
   {
     void appendOwsGeneralAndResourceList( QDomDocument &doc, QDomElement &parentElement,
                                           QgsServerInterface *serverIface, const QgsProject *project,
-                                          const QgsServerRequest &request )
+                                          const QgsWmsRequest &request )
     {
       parentElement.setAttribute( QStringLiteral( "id" ), "ows-context-" + project->baseName() );
 
@@ -219,7 +219,7 @@ namespace QgsWms
                                        QDomElement &parentLayer,
                                        QgsServerInterface *serverIface,
                                        const QgsProject *project,
-                                       const QgsServerRequest &request,
+                                       const QgsWmsRequest &request,
                                        const QgsLayerTreeGroup *layerTreeGroup,
                                        QgsRectangle &combinedBBox,
                                        const QString &strGroup )

diff --git a/src/server/services/wms/qgswmsgetcontext.h b/src/server/services/wms/qgswmsgetcontext.h
@@ -25,15 +25,17 @@ namespace QgsWms
   /**
    * Output GetContext response
    */
-  void writeGetContext( QgsServerInterface *serverIface, const QgsProject *project,
-                        const QString &version, const QgsServerRequest &request,
+  void writeGetContext( QgsServerInterface *serverIface,
+                        const QgsProject *project,
+                        const QgsWmsRequest &request,
                         QgsServerResponse &response );
 
   /**
    * Returns XML document for the 'GetContext' request
    */
-  QDomDocument getContext( QgsServerInterface *serverIface, const QgsProject *project,
-                           const QString &version, const QgsServerRequest &request );
+  QDomDocument getContext( QgsServerInterface *serverIface,
+                           const QgsProject *project,
+                           const QgsWmsRequest &request );
 
 } // namespace QgsWms