Update getfeature info request

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

Hide file tree

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

diff --git a/src/server/services/wms/qgswmsgetfeatureinfo.cpp b/src/server/services/wms/qgswmsgetfeatureinfo.cpp
@@ -24,12 +24,12 @@
 
 namespace QgsWms
 {
-  void writeGetFeatureInfo( QgsServerInterface *serverIface, const QgsProject *project,
-                            const QString &version, const QgsServerRequest &request,
+  void writeGetFeatureInfo( QgsServerInterface *serverIface,
+                            const QgsProject *project,
+                            const QgsWmsRequest &request,
                             QgsServerResponse &response )
   {
-    // get wms parameters from query
-    QgsWmsParameters parameters( request.serverParameters() );
+    QgsWmsParameters parameters = request.wmsParameters();
 
     // WIDTH and HEIGHT are not mandatory, but we need to set a default size
     if ( ( parameters.widthAsInt() <= 0
@@ -62,6 +62,6 @@ namespace QgsWms
     response.setHeader( QStringLiteral( "Content-Type" ), infoFormat + QStringLiteral( "; charset=utf-8" ) );
 
     QgsRenderer renderer( context );
-    response.write( renderer.getFeatureInfo( version ) );
+    response.write( renderer.getFeatureInfo( parameters.version() ) );
   }
 } // namespace QgsWms
diff --git a/src/server/services/wms/qgswmsgetfeatureinfo.h b/src/server/services/wms/qgswmsgetfeatureinfo.h
@@ -19,14 +19,16 @@
  *                                                                         *
  ***************************************************************************/
 
+#include "qgswmsrequest.h"
+
 namespace QgsWms
 {
 
   /**
    * Output GetFeatureInfo response
    */
   void writeGetFeatureInfo( QgsServerInterface *serverIface, const QgsProject *project,
-                            const QString &version, const QgsServerRequest &request,
+                            const QgsWmsRequest &request,
                             QgsServerResponse &response );
 
 } // namespace QgsWms