Skip to content

Commit 1a19283

Browse files
nyalldawsonnyalldawson
committedSep 12, 2017
Class shuffle
·
ltr-3_40final-3_0_0
1 parent e6a8980 commit 1a19283

File tree

6 files changed

+41
-53
lines changed

6 files changed

+41
-53
lines changed
 

‎python/core/geocms/geonode/qgsgeonoderequest.sip

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,6 @@
77
************************************************************************/
88

99

10-
11-
12-
struct QgsServiceLayerDetail
13-
{
14-
%TypeHeaderCode
15-
#include <qgsgeonoderequest.h>
16-
%End
17-
QUuid uuid;
18-
QString name;
19-
QString typeName;
20-
QString title;
21-
QString wmsURL;
22-
QString wfsURL;
23-
QString xyzURL;
24-
};
25-
2610
struct QgsGeoNodeStyle
2711
{
2812
%TypeHeaderCode
@@ -43,6 +27,17 @@ class QgsGeoNodeRequest : QObject
4327
%End
4428
public:
4529

30+
struct ServiceLayerDetail
31+
{
32+
QUuid uuid;
33+
QString name;
34+
QString typeName;
35+
QString title;
36+
QString wmsURL;
37+
QString wfsURL;
38+
QString xyzURL;
39+
};
40+
4641
explicit QgsGeoNodeRequest( bool forceRefresh, QObject *parent = 0 );
4742
%Docstring
4843
Constructor for QgsGeoNodeRequest.
@@ -57,9 +52,9 @@ class QgsGeoNodeRequest : QObject
5752
:rtype: bool
5853
%End
5954

60-
QList<QgsServiceLayerDetail> getLayers();
55+
QList<QgsGeoNodeRequest::ServiceLayerDetail> getLayers();
6156
%Docstring
62-
:rtype: list of QgsServiceLayerDetail
57+
:rtype: list of QgsGeoNodeRequest.ServiceLayerDetail
6358
%End
6459

6560
QList<QgsGeoNodeStyle> getStyles( const QString &layerName );

‎src/app/geocms/geonode/qgsgeonodenewconnection.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ void QgsGeoNodeNewConnection::testConnection()
249249
QString url = txtUrl->text();
250250
QgsGeoNodeRequest geonodeRequest( url, true );
251251

252-
QList<QgsServiceLayerDetail> layers = geonodeRequest.getLayers();
252+
QList<QgsGeoNodeRequest::ServiceLayerDetail> layers = geonodeRequest.getLayers();
253253
QApplication::restoreOverrideCursor();
254254

255255
if ( !layers.empty() )

‎src/app/geocms/geonode/qgsgeonodesourceselect.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ void QgsGeoNodeSourceSelect::connectToGeonodeConnection()
154154
QgsGeoNodeRequest geonodeRequest( url, true );
155155

156156
QApplication::setOverrideCursor( Qt::WaitCursor );
157-
const QList<QgsServiceLayerDetail> layers = geonodeRequest.getLayers();
157+
const QList<QgsGeoNodeRequest::ServiceLayerDetail> layers = geonodeRequest.getLayers();
158158
QApplication::restoreOverrideCursor();
159159

160160
if ( !layers.empty() )
@@ -173,7 +173,7 @@ void QgsGeoNodeSourceSelect::connectToGeonodeConnection()
173173

174174
if ( !layers.isEmpty() )
175175
{
176-
for ( const QgsServiceLayerDetail &layer : layers )
176+
for ( const QgsGeoNodeRequest::ServiceLayerDetail &layer : layers )
177177
{
178178
QUuid uuid = layer.uuid;
179179

‎src/core/geocms/geonode/qgsgeonoderequest.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ void QgsGeoNodeRequest::abort()
5757
}
5858
}
5959

60-
QList<QgsServiceLayerDetail> QgsGeoNodeRequest::getLayers()
60+
QList<QgsGeoNodeRequest::ServiceLayerDetail> QgsGeoNodeRequest::getLayers()
6161
{
62-
QList<QgsServiceLayerDetail> layers;
62+
QList<QgsGeoNodeRequest::ServiceLayerDetail> layers;
6363
bool success = request( QStringLiteral( "/api/layers/" ) );
6464
if ( !success )
6565
{
@@ -240,9 +240,9 @@ void QgsGeoNodeRequest::replyFinished()
240240

241241
}
242242

243-
QList<QgsServiceLayerDetail> QgsGeoNodeRequest::parseLayers( const QByteArray &layerResponse )
243+
QList<QgsGeoNodeRequest::ServiceLayerDetail> QgsGeoNodeRequest::parseLayers( const QByteArray &layerResponse )
244244
{
245-
QList<QgsServiceLayerDetail> layers;
245+
QList<QgsGeoNodeRequest::ServiceLayerDetail> layers;
246246
if ( layerResponse.isEmpty() )
247247
{
248248
return layers;
@@ -270,7 +270,7 @@ QList<QgsServiceLayerDetail> QgsGeoNodeRequest::parseLayers( const QByteArray &l
270270
{
271271
for ( const QVariant &layer : qgsAsConst( layerList ) )
272272
{
273-
QgsServiceLayerDetail layerStruct;
273+
QgsGeoNodeRequest::ServiceLayerDetail layerStruct;
274274
const QVariantMap layerMap = layer.toMap();
275275
// Find WMS and WFS. XYZ is not available
276276
// Trick to get layer's typename from distribution_url or detail_url
@@ -309,7 +309,7 @@ QList<QgsServiceLayerDetail> QgsGeoNodeRequest::parseLayers( const QByteArray &l
309309
{
310310
for ( const QVariant &layer : qgsAsConst( layerList ) )
311311
{
312-
QgsServiceLayerDetail layerStruct;
312+
QgsGeoNodeRequest::ServiceLayerDetail layerStruct;
313313
const QVariantMap layerMap = layer.toMap();
314314
// Find WMS, WFS, and XYZ link
315315
const QVariantList layerLinks = layerMap.value( QStringLiteral( "links" ) ).toList();
@@ -387,14 +387,14 @@ QStringList QgsGeoNodeRequest::serviceUrls( const QString &serviceType )
387387
{
388388
QStringList urls;
389389

390-
const QList<QgsServiceLayerDetail> layers = getLayers();
390+
const QList<QgsGeoNodeRequest::ServiceLayerDetail> layers = getLayers();
391391

392392
if ( layers.empty() )
393393
{
394394
return urls;
395395
}
396396

397-
for ( const QgsServiceLayerDetail &layer : layers )
397+
for ( const QgsGeoNodeRequest::ServiceLayerDetail &layer : layers )
398398
{
399399
QString url;
400400
if ( QString::compare( serviceType, QStringLiteral( "wms" ), Qt::CaseInsensitive ) == 0 )
@@ -430,14 +430,14 @@ QgsStringMap QgsGeoNodeRequest::serviceUrlData( const QString &serviceType )
430430
{
431431
QgsStringMap urls;
432432

433-
const QList<QgsServiceLayerDetail> layers = getLayers();
433+
const QList<QgsGeoNodeRequest::ServiceLayerDetail> layers = getLayers();
434434

435435
if ( layers.empty() )
436436
{
437437
return urls;
438438
}
439439

440-
for ( const QgsServiceLayerDetail &layer : layers )
440+
for ( const QgsGeoNodeRequest::ServiceLayerDetail &layer : layers )
441441
{
442442
QString url;
443443

‎src/core/geocms/geonode/qgsgeonoderequest.h

Lines changed: 14 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -17,29 +17,11 @@
1717

1818
#include "qgis.h"
1919
#include "qgis_core.h"
20-
#include <qnetworkreply.h>
20+
#include <QNetworkReply>
2121
#include <QDomDocument>
22-
23-
2422
#include <QObject>
2523
#include <QUuid>
2624

27-
struct CORE_EXPORT QgsServiceLayerDetail
28-
{
29-
#ifdef SIP_RUN
30-
% TypeHeaderCode
31-
#include <qgsgeonoderequest.h>
32-
% End
33-
#endif
34-
QUuid uuid;
35-
QString name;
36-
QString typeName;
37-
QString title;
38-
QString wmsURL;
39-
QString wfsURL;
40-
QString xyzURL;
41-
};
42-
4325
struct CORE_EXPORT QgsGeoNodeStyle
4426
{
4527
#ifdef SIP_RUN
@@ -59,6 +41,17 @@ class CORE_EXPORT QgsGeoNodeRequest : public QObject
5941
Q_OBJECT
6042
public:
6143

44+
struct ServiceLayerDetail
45+
{
46+
QUuid uuid;
47+
QString name;
48+
QString typeName;
49+
QString title;
50+
QString wmsURL;
51+
QString wfsURL;
52+
QString xyzURL;
53+
};
54+
6255
/**
6356
* Constructor for QgsGeoNodeRequest.
6457
*
@@ -70,7 +63,7 @@ class CORE_EXPORT QgsGeoNodeRequest : public QObject
7063

7164
bool request( const QString &endPoint );
7265

73-
QList<QgsServiceLayerDetail> getLayers();
66+
QList<QgsGeoNodeRequest::ServiceLayerDetail> getLayers();
7467

7568
QList<QgsGeoNodeStyle> getStyles( const QString &layerName );
7669

@@ -97,7 +90,7 @@ class CORE_EXPORT QgsGeoNodeRequest : public QObject
9790
void setProtocol( const QString &protocol );
9891

9992
private:
100-
QList<QgsServiceLayerDetail> parseLayers( const QByteArray &layerResponse );
93+
QList<QgsGeoNodeRequest::ServiceLayerDetail> parseLayers( const QByteArray &layerResponse );
10194
QgsGeoNodeStyle retrieveStyle( const QString &styleUrl );
10295

10396
signals:

‎tests/src/core/testqgsgeonodeconnection.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ void TestQgsGeoNodeConnection::testLayerAPI()
129129
}
130130

131131
QgsGeoNodeRequest geonodeRequest( mKartozaGeoNodeQGISServerURL, true );
132-
QList<QgsServiceLayerDetail> layers = geonodeRequest.getLayers();
132+
QList<QgsGeoNodeRequest::ServiceLayerDetail> layers = geonodeRequest.getLayers();
133133
QString msg = QStringLiteral( "Number of layers: %1" ).arg( layers.count() );
134134
QgsDebugMsg( msg );
135135
QVERIFY( layers.count() > 0 );

0 commit comments

Comments
 (0)
Please sign in to comment.