Update describelayer

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

Hide file tree

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

diff --git a/src/server/services/wms/qgswmsdescribelayer.cpp b/src/server/services/wms/qgswmsdescribelayer.cpp
@@ -20,6 +20,7 @@
  ***************************************************************************/
 
 #include "qgswmsutils.h"
+#include "qgswmsrequest.h"
 #include "qgswmsserviceexception.h"
 #include "qgswmsdescribelayer.h"
 #include "qgsserverprojectutils.h"
@@ -28,21 +29,19 @@
 namespace QgsWms
 {
 
-  void writeDescribeLayer( QgsServerInterface *serverIface, const QgsProject *project, const QString &version,
-                           const QgsServerRequest &request, QgsServerResponse &response )
+  void writeDescribeLayer( QgsServerInterface *serverIface, const QgsProject *project,
+                           const QgsWmsRequest &request, QgsServerResponse &response )
   {
-    QDomDocument doc = describeLayer( serverIface, project, version, request );
+    QDomDocument doc = describeLayer( serverIface, project, request );
     response.setHeader( QStringLiteral( "Content-Type" ), QStringLiteral( "text/xml; charset=utf-8" ) );
     response.write( doc.toByteArray() );
   }
 
   // DescribeLayer is defined for WMS1.1.1/SLD1.0 and in WMS 1.3.0 SLD Extension
-  QDomDocument describeLayer( QgsServerInterface *serverIface, const QgsProject *project, const QString &version,
-                              const QgsServerRequest &request )
+  QDomDocument describeLayer( QgsServerInterface *serverIface, const QgsProject *project,
+                              const QgsWmsRequest &request )
   {
-    Q_UNUSED( version )
-
-    QgsServerRequest::Parameters parameters = request.parameters();
+    const QgsServerRequest::Parameters parameters = request.parameters();
 
     if ( !parameters.contains( QStringLiteral( "SLD_VERSION" ) ) )
     {

diff --git a/src/server/services/wms/qgswmsdescribelayer.h b/src/server/services/wms/qgswmsdescribelayer.h
@@ -26,13 +26,13 @@ namespace QgsWms
    * Output GetMap response in DXF format
    */
   void writeDescribeLayer( QgsServerInterface *serverIface, const QgsProject *project,
-                           const QString &version, const QgsServerRequest &request,
+                           const QgsWmsRequest &request,
                            QgsServerResponse &response );
 
   /**
    *  DescribeLayer is defined for WMS1.1.1/SLD1.0 and in WMS 1.3.0 SLD Extension
    */
   QDomDocument describeLayer( QgsServerInterface *serverIface, const QgsProject *project,
-                              const QString &version, const QgsServerRequest &request );
+                              const QgsWmsRequest &request );
 
 } // namespace QgsWms