From f5c9275b6a37377052d3385579a4f545c09ebaea Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Fri, 10 Mar 2017 00:08:18 +0100 Subject: [PATCH] [ArcGIS Rest] Fix connection key inconsistencies --- src/providers/arcgisrest/qgsafsdataitems.cpp | 14 +++++++------- src/providers/arcgisrest/qgsafsproviderextern.cpp | 4 ++-- src/providers/arcgisrest/qgsamsdataitems.cpp | 14 +++++++------- src/providers/arcgisrest/qgsamsproviderextern.cpp | 4 ++-- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/providers/arcgisrest/qgsafsdataitems.cpp b/src/providers/arcgisrest/qgsafsdataitems.cpp index daa001b4fd6..71370c0e510 100644 --- a/src/providers/arcgisrest/qgsafsdataitems.cpp +++ b/src/providers/arcgisrest/qgsafsdataitems.cpp @@ -37,9 +37,9 @@ QVector QgsAfsRootItem::createChildren() { QVector connections; - Q_FOREACH ( const QString &connName, QgsOwsConnection::connectionList( "ArcGisFeatureServer" ) ) + Q_FOREACH ( const QString &connName, QgsOwsConnection::connectionList( "arcgisfeatureserver" ) ) { - QgsOwsConnection connection( QStringLiteral( "ArcGisFeatureServer" ), connName ); + QgsOwsConnection connection( QStringLiteral( "arcgisfeatureserver" ), connName ); QString path = "afs:/" + connName; connections.append( new QgsAfsConnectionItem( this, connName, path, connection.uri().param( QStringLiteral( "url" ) ) ) ); } @@ -67,8 +67,8 @@ void QgsAfsRootItem::connectionsChanged() void QgsAfsRootItem::newConnection() { - QgsNewHttpConnection nc( 0, QStringLiteral( "/Qgis/connections-afs/" ) ); - nc.setWindowTitle( tr( "Create a new AFS connection" ) ); + QgsNewHttpConnection nc( 0, QStringLiteral( "/Qgis/connections-arcgisfeatureserver/" ) ); + nc.setWindowTitle( tr( "Create a new ArcGisFeatureServer connection" ) ); if ( nc.exec() ) { @@ -130,8 +130,8 @@ QList QgsAfsConnectionItem::actions() void QgsAfsConnectionItem::editConnection() { - QgsNewHttpConnection nc( 0, QStringLiteral( "/Qgis/connections-afs/" ), mName ); - nc.setWindowTitle( tr( "Modify AFS connection" ) ); + QgsNewHttpConnection nc( 0, QStringLiteral( "/Qgis/connections-arcgisfeatureserver/" ), mName ); + nc.setWindowTitle( tr( "Modify ArcGisFeatureServer connection" ) ); if ( nc.exec() ) { @@ -141,7 +141,7 @@ void QgsAfsConnectionItem::editConnection() void QgsAfsConnectionItem::deleteConnection() { - QgsOwsConnection::deleteConnection( QStringLiteral( "ArcGisFeatureServer" ), mName ); + QgsOwsConnection::deleteConnection( QStringLiteral( "arcgisfeatureserver" ), mName ); mParent->refresh(); } diff --git a/src/providers/arcgisrest/qgsafsproviderextern.cpp b/src/providers/arcgisrest/qgsafsproviderextern.cpp index 6f9d77ec9ec..d8631314312 100644 --- a/src/providers/arcgisrest/qgsafsproviderextern.cpp +++ b/src/providers/arcgisrest/qgsafsproviderextern.cpp @@ -66,9 +66,9 @@ QGISEXTERN QgsDataItem *dataItem( QString path, QgsDataItem *parentItem ) if ( path.startsWith( QLatin1String( "afs:/" ) ) ) { QString connectionName = path.split( '/' ).last(); - if ( QgsOwsConnection::connectionList( QStringLiteral( "ArcGisFeatureServer" ) ).contains( connectionName ) ) + if ( QgsOwsConnection::connectionList( QStringLiteral( "arcgisfeatureserver" ) ).contains( connectionName ) ) { - QgsOwsConnection connection( QStringLiteral( "ArcGisFeatureServer" ), connectionName ); + QgsOwsConnection connection( QStringLiteral( "arcgisfeatureserver" ), connectionName ); return new QgsAfsConnectionItem( parentItem, QStringLiteral( "ArcGisFeatureServer" ), path, connection.uri().param( QStringLiteral( "url" ) ) ); } } diff --git a/src/providers/arcgisrest/qgsamsdataitems.cpp b/src/providers/arcgisrest/qgsamsdataitems.cpp index a0aa69f7020..e23b9362422 100644 --- a/src/providers/arcgisrest/qgsamsdataitems.cpp +++ b/src/providers/arcgisrest/qgsamsdataitems.cpp @@ -33,9 +33,9 @@ QVector QgsAmsRootItem::createChildren() { QVector connections; - Q_FOREACH ( const QString &connName, QgsOwsConnection::connectionList( "ArcGisMapServer" ) ) + Q_FOREACH ( const QString &connName, QgsOwsConnection::connectionList( "arcgismapserver" ) ) { - QgsOwsConnection connection( QStringLiteral( "ArcGisMapServer" ), connName ); + QgsOwsConnection connection( QStringLiteral( "arcgismapserver" ), connName ); QString path = "ams:/" + connName; connections.append( new QgsAmsConnectionItem( this, connName, path, connection.uri().param( QStringLiteral( "url" ) ) ) ); } @@ -64,8 +64,8 @@ void QgsAmsRootItem::connectionsChanged() void QgsAmsRootItem::newConnection() { - QgsNewHttpConnection nc( 0 ); - nc.setWindowTitle( tr( "Create a new AMS connection" ) ); + QgsNewHttpConnection nc( 0, QStringLiteral( "/Qgis/connections-arcgismapserver/" ) ); + nc.setWindowTitle( tr( "Create a new ArcGisMapServer connection" ) ); if ( nc.exec() ) { @@ -145,8 +145,8 @@ QList QgsAmsConnectionItem::actions() void QgsAmsConnectionItem::editConnection() { - QgsNewHttpConnection nc( 0, QStringLiteral( "/Qgis/connections-afs/" ), mName ); - nc.setWindowTitle( tr( "Modify AMS connection" ) ); + QgsNewHttpConnection nc( 0, QStringLiteral( "/Qgis/connections-arcgismapserver/" ), mName ); + nc.setWindowTitle( tr( "Modify ArcGisMapServer connection" ) ); if ( nc.exec() ) { @@ -156,7 +156,7 @@ void QgsAmsConnectionItem::editConnection() void QgsAmsConnectionItem::deleteConnection() { - QgsOwsConnection::deleteConnection( QStringLiteral( "ArcGisMapServer" ), mName ); + QgsOwsConnection::deleteConnection( QStringLiteral( "arcgismapserver" ), mName ); mParent->refresh(); } diff --git a/src/providers/arcgisrest/qgsamsproviderextern.cpp b/src/providers/arcgisrest/qgsamsproviderextern.cpp index f72f29f6b97..72b76057642 100644 --- a/src/providers/arcgisrest/qgsamsproviderextern.cpp +++ b/src/providers/arcgisrest/qgsamsproviderextern.cpp @@ -66,9 +66,9 @@ QGISEXTERN QgsDataItem *dataItem( QString path, QgsDataItem *parentItem ) if ( path.startsWith( QLatin1String( "ams:/" ) ) ) { QString connectionName = path.split( '/' ).last(); - if ( QgsOwsConnection::connectionList( QStringLiteral( "ArcGisMapServer" ) ).contains( connectionName ) ) + if ( QgsOwsConnection::connectionList( QStringLiteral( "arcgismapserver" ) ).contains( connectionName ) ) { - QgsOwsConnection connection( QStringLiteral( "ArcGisMapServer" ), connectionName ); + QgsOwsConnection connection( QStringLiteral( "arcgismapserver" ), connectionName ); return new QgsAmsConnectionItem( parentItem, QStringLiteral( "ArcGisMapServer" ), path, connection.uri().param( QStringLiteral( "url" ) ) ); } }