Update getlegendgraphics

qgis · Mar 9, 2021 · ebcbc30 · ebcbc30
1 parent ea01684
commit ebcbc30
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/src/server/services/wms/qgswms.cpp b/src/server/services/wms/qgswms.cpp
@@ -142,7 +142,7 @@ namespace QgsWms
         }
         else if ( QSTR_COMPARE( req, "GetLegendGraphic" ) || QSTR_COMPARE( req, "GetLegendGraphics" ) )
         {
-          writeGetLegendGraphics( mServerIface, project, version, request, response );
+          writeGetLegendGraphics( mServerIface, project, request, response );
         }
         else if ( QSTR_COMPARE( req, "GetPrint" ) )
         {

diff --git a/src/server/services/wms/qgswmsgetlegendgraphics.cpp b/src/server/services/wms/qgswmsgetlegendgraphics.cpp
@@ -26,6 +26,7 @@
 #include "qgsmaplayerlegend.h"
 
 #include "qgswmsutils.h"
+#include "qgswmsrequest.h"
 #include "qgswmsserviceexception.h"
 #include "qgswmsgetlegendgraphics.h"
 #include "qgswmsrenderer.h"
@@ -37,11 +38,11 @@
 namespace QgsWms
 {
   void writeGetLegendGraphics( QgsServerInterface *serverIface, const QgsProject *project,
-                               const QString &, const QgsServerRequest &request,
+                               const QgsWmsRequest &request,
                                QgsServerResponse &response )
   {
     // get parameters from query
-    QgsWmsParameters parameters( request.serverParameters() );
+    QgsWmsParameters parameters = request.wmsParameters();
 
     // check parameters validity
     // FIXME fail with png + mode

diff --git a/src/server/services/wms/qgswmsgetlegendgraphics.h b/src/server/services/wms/qgswmsgetlegendgraphics.h
@@ -29,7 +29,7 @@ namespace QgsWms
    * Output GetLegendGRaphics response
    */
   void writeGetLegendGraphics( QgsServerInterface *serverIface, const QgsProject *project,
-                               const QString &version, const QgsServerRequest &request,
+                               const QgsWmsRequest &request,
                                QgsServerResponse &response );
 
   /**