Update getmap request

qgis · Mar 9, 2021 · 3de9094 · 3de9094
1 parent 0276a65
commit 3de9094
Show file tree

Hide file tree

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

diff --git a/src/server/services/wms/qgswmsgetmap.cpp b/src/server/services/wms/qgswmsgetmap.cpp
@@ -29,12 +29,9 @@ namespace QgsWms
 {
 
   void writeGetMap( QgsServerInterface *serverIface, const QgsProject *project,
-                    const QString &, const QgsServerRequest &request,
+                    const QgsWmsRequest &request,
                     QgsServerResponse &response )
   {
-    // get wms parameters from query
-    const QgsWmsParameters parameters( request.serverParameters() );
-
     // prepare render context
     QgsWmsRenderContext context( project, serverIface );
     context.setFlag( QgsWmsRenderContext::UpdateExtent );
@@ -45,7 +42,7 @@ namespace QgsWms
     context.setFlag( QgsWmsRenderContext::AddExternalLayers );
     context.setFlag( QgsWmsRenderContext::SetAccessControl );
     context.setFlag( QgsWmsRenderContext::UseTileBuffer );
-    context.setParameters( parameters );
+    context.setParameters( request.wmsParameters() );
 
     // rendering
     QgsRenderer renderer( context );

diff --git a/src/server/services/wms/qgswmsgetmap.h b/src/server/services/wms/qgswmsgetmap.h
@@ -19,14 +19,16 @@
  *                                                                         *
  ***************************************************************************/
 
+#include "qgswmsrequest.h"
+
 namespace QgsWms
 {
 
   /**
    * Output GetMap response in DXF format
    */
   void writeGetMap( QgsServerInterface *serverIface, const QgsProject *project,
-                    const QString &version,  const QgsServerRequest &request,
+                    const QgsWmsRequest &request,
                     QgsServerResponse &response );
 
 } // namespace QgsWms