Merge pull request #42086 from pblottiere/wms_params_cst

Test a more direct way to init QgsWmsParameters
qgis · Mar 8, 2021 · a3be580 · a3be580
2 parents 875ba80 + b116c19
commit a3be580
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 7 deletions.
diff --git a/src/server/qgsserverparameters.cpp b/src/server/qgsserverparameters.cpp
@@ -454,7 +454,8 @@ QUrlQuery QgsServerParameters::urlQuery() const
     const auto constMap( toMap().toStdMap() );
     for ( const auto &param : constMap )
     {
-      query.addQueryItem( param.first, param.second );
+      const QString value = QString( param.second ).replace( '+', QLatin1String( "%2B" ) );
+      query.addQueryItem( param.first, value );
     }
   }
 

diff --git a/src/server/services/wms/qgsdxfwriter.cpp b/src/server/services/wms/qgsdxfwriter.cpp
@@ -26,7 +26,7 @@ namespace QgsWms
                    QgsServerResponse &response )
   {
     // get wms parameters from query
-    QgsWmsParameters parameters( QUrlQuery( request.url() ) );
+    const QgsWmsParameters parameters( request.serverParameters() );
 
     // prepare render context
     QgsWmsRenderContext context( project, serverIface );

diff --git a/src/server/services/wms/qgswms.cpp b/src/server/services/wms/qgswms.cpp
@@ -65,7 +65,7 @@ namespace QgsWms
       void executeRequest( const QgsServerRequest &request, QgsServerResponse &response,
                            const QgsProject *project ) override
       {
-        const QgsWmsParameters parameters( QUrlQuery( request.url() ) );
+        const QgsWmsParameters parameters( request.serverParameters() );
 
         QString version = parameters.version();
         if ( version.isEmpty() )

diff --git a/src/server/services/wms/qgswmsgetfeatureinfo.cpp b/src/server/services/wms/qgswmsgetfeatureinfo.cpp
@@ -29,7 +29,7 @@ namespace QgsWms
                             QgsServerResponse &response )
   {
     // get wms parameters from query
-    QgsWmsParameters parameters( QUrlQuery( request.url() ) );
+    QgsWmsParameters parameters( request.serverParameters() );
 
     // WIDTH and HEIGHT are not mandatory, but we need to set a default size
     if ( ( parameters.widthAsInt() <= 0

diff --git a/src/server/services/wms/qgswmsgetlegendgraphics.cpp b/src/server/services/wms/qgswmsgetlegendgraphics.cpp
@@ -41,7 +41,7 @@ namespace QgsWms
                                QgsServerResponse &response )
   {
     // get parameters from query
-    QgsWmsParameters parameters( QUrlQuery( request.url() ) );
+    QgsWmsParameters parameters( request.serverParameters() );
 
     // check parameters validity
     // FIXME fail with png + mode

diff --git a/src/server/services/wms/qgswmsgetmap.cpp b/src/server/services/wms/qgswmsgetmap.cpp
@@ -33,7 +33,7 @@ namespace QgsWms
                     QgsServerResponse &response )
   {
     // get wms parameters from query
-    const QgsWmsParameters parameters( QUrlQuery( request.url() ) );
+    const QgsWmsParameters parameters( request.serverParameters() );
 
     // prepare render context
     QgsWmsRenderContext context( project, serverIface );

diff --git a/src/server/services/wms/qgswmsgetprint.cpp b/src/server/services/wms/qgswmsgetprint.cpp
@@ -30,7 +30,7 @@ namespace QgsWms
                       QgsServerResponse &response )
   {
     // get wms parameters from query
-    const QgsWmsParameters parameters( QUrlQuery( request.url() ) );
+    const QgsWmsParameters parameters( request.serverParameters() );
 
     // GetPrint supports svg/png/pdf
     const QgsWmsParameters::Format format = parameters.format();

diff --git a/tests/src/server/wms/test_qgsserver_wms_parameters.cpp b/tests/src/server/wms/test_qgsserver_wms_parameters.cpp
@@ -29,6 +29,7 @@ class TestQgsServerWmsParameters : public QObject
     void cleanupTestCase();
 
     void external_layers();
+    void percent_encoding();
 };
 
 void TestQgsServerWmsParameters::initTestCase()
@@ -68,5 +69,20 @@ void TestQgsServerWmsParameters::external_layers()
   QCOMPARE( layer_params.mExternalUri, QString( "layers=layer_2_name&url=http://url_2" ) );
 }
 
+void TestQgsServerWmsParameters::percent_encoding()
+{
+  // '+' in its encoded ('%2B') form is transformed in '+' sign and
+  // forwarded to parameters subclasses
+  QUrlQuery query;
+  query.addQueryItem( "MYPARAM", QString( "my%1value" ).arg( QLatin1String( "%2B" ) ) );
+
+  QgsServerParameters params;
+  params.load( query );
+  QCOMPARE( params.value( "MYPARAM" ), QString( "my+value" ) );
+
+  QgsWms::QgsWmsParameters wmsParams( params );
+  QCOMPARE( wmsParams.value( "MYPARAM" ), QString( "my+value" ) );
+}
+
 QGSTEST_MAIN( TestQgsServerWmsParameters )
 #include "test_qgsserver_wms_parameters.moc"