Use the new class in dxf writer

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

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/src/server/services/wms/qgsdxfwriter.cpp b/src/server/services/wms/qgsdxfwriter.cpp
@@ -22,24 +22,21 @@ email                : david dot marteau at 3liz dot com
 namespace QgsWms
 {
   void writeAsDxf( 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::UseWfsLayersOnly );
     context.setFlag( QgsWmsRenderContext::UseOpacity );
     context.setFlag( QgsWmsRenderContext::UseFilter );
     context.setFlag( QgsWmsRenderContext::SetAccessControl );
-    context.setParameters( parameters );
+    context.setParameters( request.wmsParameters() );
 
     // Write output
     QgsRenderer renderer( context );
     std::unique_ptr<QgsDxfExport> dxf = renderer.getDxf();
     response.setHeader( "Content-Type", "application/dxf" );
-    dxf->writeToFile( response.io(), parameters.dxfCodec() );
+    dxf->writeToFile( response.io(), request.wmsParameters().dxfCodec() );
   }
 } // namespace QgsWms
diff --git a/src/server/services/wms/qgsdxfwriter.h b/src/server/services/wms/qgsdxfwriter.h
@@ -15,14 +15,16 @@ email                : david dot marteau at 3liz dot com
  *                                                                         *
  ***************************************************************************/
 
+#include "qgswmsrequest.h"
+
 namespace QgsWms
 {
 
   /**
    * Output GetMap response in DXF format
    */
   void writeAsDxf( QgsServerInterface *serverIface, const QgsProject *project,
-                   const QString &version,  const QgsServerRequest &request,
+                   const QgsWmsRequest &request,
                    QgsServerResponse &response );
 
 } // namespace QgsWms
diff --git a/src/server/services/wms/qgswms.cpp b/src/server/services/wms/qgswms.cpp
@@ -113,7 +113,7 @@ namespace QgsWms
         {
           if QSTR_COMPARE( parameters.formatAsString(), "application/dxf" )
           {
-            writeAsDxf( mServerIface, project, version, request, response );
+            writeAsDxf( mServerIface, project, request, response );
           }
           else
           {