|
19 | 19 | #include "qgsdatasourceuri.h"
|
20 | 20 | #include "qgsmessagelog.h"
|
21 | 21 |
|
| 22 | +const QString EXTERNAL_LAYER_PREFIX = QStringLiteral( "EXTERNAL_WMS:" ); |
| 23 | + |
22 | 24 | namespace QgsWms
|
23 | 25 | {
|
24 | 26 | //
|
@@ -1409,7 +1411,7 @@ namespace QgsWms
|
1409 | 1411 | {
|
1410 | 1412 | QString layer = layers[i];
|
1411 | 1413 |
|
1412 |
| - if ( layer.startsWith( QStringLiteral( "EXTERNAL_WMS:" ) ) ) |
| 1414 | + if ( isExternalLayer( layer ) ) |
1413 | 1415 | continue;
|
1414 | 1416 |
|
1415 | 1417 | QgsWmsParametersLayer param;
|
@@ -1503,15 +1505,10 @@ namespace QgsWms
|
1503 | 1505 | const QStringList layers = allLayersNickname();
|
1504 | 1506 | for ( const QString &layer : allLayersNickname() )
|
1505 | 1507 | {
|
1506 |
| - if ( ! layer.startsWith( QStringLiteral( "EXTERNAL_WMS:" ) ) ) |
| 1508 | + if ( ! isExternalLayer( layer ) ) |
1507 | 1509 | continue;
|
1508 | 1510 |
|
1509 |
| - QgsWmsParametersExternalLayer externalLayer; |
1510 |
| - externalLayer.mName = layer; |
1511 |
| - externalLayer.mName.remove( 0, 13 ); |
1512 |
| - externalLayer.mUri = externalWMSUri( externalLayer.mName ); |
1513 |
| - |
1514 |
| - externalLayers << externalLayer; |
| 1511 | + externalLayers << externalLayerParameter( layer ); |
1515 | 1512 | }
|
1516 | 1513 |
|
1517 | 1514 | return externalLayers;
|
@@ -1615,14 +1612,9 @@ namespace QgsWms
|
1615 | 1612 |
|
1616 | 1613 | for ( const auto &layer : allLayers )
|
1617 | 1614 | {
|
1618 |
| - if ( layer.startsWith( QStringLiteral( "EXTERNAL_WMS:" ) ) ) |
| 1615 | + if ( isExternalLayer( layer ) ) |
1619 | 1616 | {
|
1620 |
| - QgsWmsParametersExternalLayer externalParam; |
1621 |
| - externalParam.mName = layer; |
1622 |
| - externalParam.mName.remove( 0, 13 ); |
1623 |
| - externalParam.mUri = externalWMSUri( externalParam.mName ); |
1624 |
| - |
1625 |
| - eParams << externalParam; |
| 1617 | + eParams << externalLayerParameter( layer ); |
1626 | 1618 | }
|
1627 | 1619 | else
|
1628 | 1620 | {
|
@@ -1810,4 +1802,20 @@ namespace QgsWms
|
1810 | 1802 |
|
1811 | 1803 | return p;
|
1812 | 1804 | }
|
| 1805 | + |
| 1806 | + QgsWmsParametersExternalLayer QgsWmsParameters::externalLayerParameter( const QString &name ) const |
| 1807 | + { |
| 1808 | + QgsWmsParametersExternalLayer param; |
| 1809 | + |
| 1810 | + param.mName = name; |
| 1811 | + param.mName.remove( 0, EXTERNAL_LAYER_PREFIX.size() ); |
| 1812 | + param.mUri = externalWMSUri( param.mName ); |
| 1813 | + |
| 1814 | + return param; |
| 1815 | + } |
| 1816 | + |
| 1817 | + bool QgsWmsParameters::isExternalLayer( const QString &name ) const |
| 1818 | + { |
| 1819 | + return name.startsWith( EXTERNAL_LAYER_PREFIX ); |
| 1820 | + } |
1813 | 1821 | }
|
0 commit comments