Add utils method for external layers

qgis · Mar 18, 2019 · ed31a32 · ed31a32
1 parent ec3e15f
commit ed31a32
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 15 deletions.
diff --git a/src/server/services/wms/qgswmsparameters.cpp b/src/server/services/wms/qgswmsparameters.cpp
@@ -19,6 +19,8 @@
 #include "qgsdatasourceuri.h"
 #include "qgsmessagelog.h"
 
+const QString EXTERNAL_LAYER_PREFIX = QStringLiteral( "EXTERNAL_WMS:" );
+
 namespace QgsWms
 {
   //
@@ -1409,7 +1411,7 @@ namespace QgsWms
     {
       QString layer = layers[i];
 
-      if ( layer.startsWith( QStringLiteral( "EXTERNAL_WMS:" ) ) )
+      if ( isExternalLayer( layer ) )
         continue;
 
       QgsWmsParametersLayer param;
@@ -1503,15 +1505,10 @@ namespace QgsWms
     const QStringList layers = allLayersNickname();
     for ( const QString &layer : allLayersNickname() )
     {
-      if ( ! layer.startsWith( QStringLiteral( "EXTERNAL_WMS:" ) ) )
+      if ( ! isExternalLayer( layer ) )
         continue;
 
-      QgsWmsParametersExternalLayer externalLayer;
-      externalLayer.mName = layer;
-      externalLayer.mName.remove( 0, 13 );
-      externalLayer.mUri = externalWMSUri( externalLayer.mName );
-
-      externalLayers << externalLayer;
+      externalLayers << externalLayerParameter( layer );
     }
 
     return externalLayers;
@@ -1615,14 +1612,9 @@ namespace QgsWms
 
     for ( const auto &layer : allLayers )
     {
-      if ( layer.startsWith( QStringLiteral( "EXTERNAL_WMS:" ) ) )
+      if ( isExternalLayer( layer ) )
       {
-        QgsWmsParametersExternalLayer externalParam;
-        externalParam.mName = layer;
-        externalParam.mName.remove( 0, 13 );
-        externalParam.mUri = externalWMSUri( externalParam.mName );
-
-        eParams << externalParam;
+        eParams << externalLayerParameter( layer );
       }
       else
       {
@@ -1810,4 +1802,20 @@ namespace QgsWms
 
     return p;
   }
+
+  QgsWmsParametersExternalLayer QgsWmsParameters::externalLayerParameter( const QString &name ) const
+  {
+    QgsWmsParametersExternalLayer param;
+
+    param.mName = name;
+    param.mName.remove( 0, EXTERNAL_LAYER_PREFIX.size() );
+    param.mUri = externalWMSUri( param.mName );
+
+    return param;
+  }
+
+  bool QgsWmsParameters::isExternalLayer( const QString &name ) const
+  {
+    return name.startsWith( EXTERNAL_LAYER_PREFIX );
+  }
 }
diff --git a/src/server/services/wms/qgswmsparameters.h b/src/server/services/wms/qgswmsparameters.h
@@ -1187,6 +1187,9 @@ namespace QgsWms
       void raiseError( const QString &msg ) const;
       void log( const QString &msg ) const;
 
+      bool isExternalLayer( const QString &name ) const;
+      QgsWmsParametersExternalLayer externalLayerParameter( const QString &name ) const;
+
       QMultiMap<QString, QgsWmsParametersFilter> layerFilters( const QStringList &layers ) const;
 
       QMap<QgsWmsParameter::Name, QgsWmsParameter> mWmsParameters;