Move creation of datasource uri for external wms layers to QgsWMSParameters

Author: mhugent

src/server/services/wms/qgswmsparameters.cpp

@@ -16,6 +16,7 @@
  ***************************************************************************/
 
 #include "qgswmsparameters.h"
+#include "qgsdatasourceuri.h"
 #include "qgsmessagelog.h"
 #include <iostream>
 
@@ -512,6 +513,16 @@ namespace QgsWms
             raiseError( name );
           }
         }
+        else //maybe an external wms parameter?
+        {
+          int separator = key.indexOf( ":" );
+          if ( separator >= 1 )
+          {
+            QString id = key.left( separator );
+            QString param = key.right( key.length() - separator - 1 );
+            mExternalWMSParameters[id].insert( param, parameters[key] );
+          }
+        }
       }
     }
   }
@@ -1874,6 +1885,23 @@ namespace QgsWms
     return param;
   }
 
+  QString QgsWmsParameters::externalWMSUri( const QString &id ) const
+  {
+    if ( !mExternalWMSParameters.contains( id ) )
+    {
+      return QString();
+    }
+
+    QgsDataSourceUri wmsUri;
+    const QMap<QString, QString> &paramMap = mExternalWMSParameters[ id ];
+    QMap<QString, QString>::const_iterator paramIt = paramMap.constBegin();
+    for ( ; paramIt != paramMap.constEnd(); ++paramIt )
+    {
+      wmsUri.setParam( paramIt.key().toLower(), paramIt.value() );
+    }
+    return wmsUri.encodedUri();
+  }
+
   QString QgsWmsParameters::name( ParameterName name ) const
   {
     const QMetaEnum metaEnum( QMetaEnum::fromType<ParameterName>() );

src/server/services/wms/qgswmsparameters.h

@@ -909,6 +909,13 @@ namespace QgsWms
        */
       QgsWmsParametersComposerMap composerMapParameters( int mapId ) const;
 
+      /**
+       * @brief externalWMSUri
+       * @param id the id of the external wms
+       * @return uri string or an empty string if the external wms id does not exist
+       */
+      QString externalWMSUri( const QString &id ) const;
+
     private:
       QString name( ParameterName name ) const;
       void raiseError( ParameterName name ) const;
@@ -955,6 +962,7 @@ namespace QgsWms
       QgsServerRequest::Parameters mRequestParameters;
       QMap<ParameterName, Parameter> mParameters;
       QMap<int, QMap<ParameterName, Parameter>> mComposerParameters;
+      QMap<QString, QMap<QString, QString> > mExternalWMSParameters;
       QList<QgsProjectVersion> mVersions;
   };
 }

src/server/services/wms/qgswmsrenderer.cpp

@@ -2653,24 +2653,8 @@ namespace QgsWms
 
   QgsMapLayer *QgsRenderer::createExternalWMSLayer( const QString &externalLayerId ) const
   {
-    QgsMapLayer *wmsLayer = 0;
-    QgsDataSourceUri wmsUri;
-
-    QgsServerRequest::Parameters::const_iterator it = mParameters.lowerBound( externalLayerId.toUpper() + ":" );
-    while ( it != mParameters.constEnd() )
-    {
-      if ( !it.key().startsWith( externalLayerId.toUpper() + ":" ) )
-      {
-        break;
-      }
-
-      QString paramKey = it.key();
-      paramKey.remove( 0, externalLayerId.size() + 1 );
-      wmsUri.setParam( paramKey.toLower(), it.value() );
-      ++it;
-    }
-
-    wmsLayer = new QgsRasterLayer( wmsUri.encodedUri(), externalLayerId, QStringLiteral( "wms" ) );
+    QString wmsUri = mWmsParameters.externalWMSUri( externalLayerId.toUpper() );
+    QgsMapLayer *wmsLayer = new QgsRasterLayer( wmsUri, externalLayerId, QStringLiteral( "wms" ) );
     if ( !wmsLayer->isValid() )
     {
       delete wmsLayer;