Skip to content

Commit f5c9275

Browse files
committed
[ArcGIS Rest] Fix connection key inconsistencies
1 parent f10e9ee commit f5c9275

File tree

4 files changed

+18
-18
lines changed

4 files changed

+18
-18
lines changed

src/providers/arcgisrest/qgsafsdataitems.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ QVector<QgsDataItem *> QgsAfsRootItem::createChildren()
3737
{
3838
QVector<QgsDataItem *> connections;
3939

40-
Q_FOREACH ( const QString &connName, QgsOwsConnection::connectionList( "ArcGisFeatureServer" ) )
40+
Q_FOREACH ( const QString &connName, QgsOwsConnection::connectionList( "arcgisfeatureserver" ) )
4141
{
42-
QgsOwsConnection connection( QStringLiteral( "ArcGisFeatureServer" ), connName );
42+
QgsOwsConnection connection( QStringLiteral( "arcgisfeatureserver" ), connName );
4343
QString path = "afs:/" + connName;
4444
connections.append( new QgsAfsConnectionItem( this, connName, path, connection.uri().param( QStringLiteral( "url" ) ) ) );
4545
}
@@ -67,8 +67,8 @@ void QgsAfsRootItem::connectionsChanged()
6767

6868
void QgsAfsRootItem::newConnection()
6969
{
70-
QgsNewHttpConnection nc( 0, QStringLiteral( "/Qgis/connections-afs/" ) );
71-
nc.setWindowTitle( tr( "Create a new AFS connection" ) );
70+
QgsNewHttpConnection nc( 0, QStringLiteral( "/Qgis/connections-arcgisfeatureserver/" ) );
71+
nc.setWindowTitle( tr( "Create a new ArcGisFeatureServer connection" ) );
7272

7373
if ( nc.exec() )
7474
{
@@ -130,8 +130,8 @@ QList<QAction *> QgsAfsConnectionItem::actions()
130130

131131
void QgsAfsConnectionItem::editConnection()
132132
{
133-
QgsNewHttpConnection nc( 0, QStringLiteral( "/Qgis/connections-afs/" ), mName );
134-
nc.setWindowTitle( tr( "Modify AFS connection" ) );
133+
QgsNewHttpConnection nc( 0, QStringLiteral( "/Qgis/connections-arcgisfeatureserver/" ), mName );
134+
nc.setWindowTitle( tr( "Modify ArcGisFeatureServer connection" ) );
135135

136136
if ( nc.exec() )
137137
{
@@ -141,7 +141,7 @@ void QgsAfsConnectionItem::editConnection()
141141

142142
void QgsAfsConnectionItem::deleteConnection()
143143
{
144-
QgsOwsConnection::deleteConnection( QStringLiteral( "ArcGisFeatureServer" ), mName );
144+
QgsOwsConnection::deleteConnection( QStringLiteral( "arcgisfeatureserver" ), mName );
145145
mParent->refresh();
146146
}
147147

src/providers/arcgisrest/qgsafsproviderextern.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ QGISEXTERN QgsDataItem *dataItem( QString path, QgsDataItem *parentItem )
6666
if ( path.startsWith( QLatin1String( "afs:/" ) ) )
6767
{
6868
QString connectionName = path.split( '/' ).last();
69-
if ( QgsOwsConnection::connectionList( QStringLiteral( "ArcGisFeatureServer" ) ).contains( connectionName ) )
69+
if ( QgsOwsConnection::connectionList( QStringLiteral( "arcgisfeatureserver" ) ).contains( connectionName ) )
7070
{
71-
QgsOwsConnection connection( QStringLiteral( "ArcGisFeatureServer" ), connectionName );
71+
QgsOwsConnection connection( QStringLiteral( "arcgisfeatureserver" ), connectionName );
7272
return new QgsAfsConnectionItem( parentItem, QStringLiteral( "ArcGisFeatureServer" ), path, connection.uri().param( QStringLiteral( "url" ) ) );
7373
}
7474
}

src/providers/arcgisrest/qgsamsdataitems.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ QVector<QgsDataItem *> QgsAmsRootItem::createChildren()
3333
{
3434
QVector<QgsDataItem *> connections;
3535

36-
Q_FOREACH ( const QString &connName, QgsOwsConnection::connectionList( "ArcGisMapServer" ) )
36+
Q_FOREACH ( const QString &connName, QgsOwsConnection::connectionList( "arcgismapserver" ) )
3737
{
38-
QgsOwsConnection connection( QStringLiteral( "ArcGisMapServer" ), connName );
38+
QgsOwsConnection connection( QStringLiteral( "arcgismapserver" ), connName );
3939
QString path = "ams:/" + connName;
4040
connections.append( new QgsAmsConnectionItem( this, connName, path, connection.uri().param( QStringLiteral( "url" ) ) ) );
4141
}
@@ -64,8 +64,8 @@ void QgsAmsRootItem::connectionsChanged()
6464

6565
void QgsAmsRootItem::newConnection()
6666
{
67-
QgsNewHttpConnection nc( 0 );
68-
nc.setWindowTitle( tr( "Create a new AMS connection" ) );
67+
QgsNewHttpConnection nc( 0, QStringLiteral( "/Qgis/connections-arcgismapserver/" ) );
68+
nc.setWindowTitle( tr( "Create a new ArcGisMapServer connection" ) );
6969

7070
if ( nc.exec() )
7171
{
@@ -145,8 +145,8 @@ QList<QAction *> QgsAmsConnectionItem::actions()
145145

146146
void QgsAmsConnectionItem::editConnection()
147147
{
148-
QgsNewHttpConnection nc( 0, QStringLiteral( "/Qgis/connections-afs/" ), mName );
149-
nc.setWindowTitle( tr( "Modify AMS connection" ) );
148+
QgsNewHttpConnection nc( 0, QStringLiteral( "/Qgis/connections-arcgismapserver/" ), mName );
149+
nc.setWindowTitle( tr( "Modify ArcGisMapServer connection" ) );
150150

151151
if ( nc.exec() )
152152
{
@@ -156,7 +156,7 @@ void QgsAmsConnectionItem::editConnection()
156156

157157
void QgsAmsConnectionItem::deleteConnection()
158158
{
159-
QgsOwsConnection::deleteConnection( QStringLiteral( "ArcGisMapServer" ), mName );
159+
QgsOwsConnection::deleteConnection( QStringLiteral( "arcgismapserver" ), mName );
160160
mParent->refresh();
161161
}
162162

src/providers/arcgisrest/qgsamsproviderextern.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ QGISEXTERN QgsDataItem *dataItem( QString path, QgsDataItem *parentItem )
6666
if ( path.startsWith( QLatin1String( "ams:/" ) ) )
6767
{
6868
QString connectionName = path.split( '/' ).last();
69-
if ( QgsOwsConnection::connectionList( QStringLiteral( "ArcGisMapServer" ) ).contains( connectionName ) )
69+
if ( QgsOwsConnection::connectionList( QStringLiteral( "arcgismapserver" ) ).contains( connectionName ) )
7070
{
71-
QgsOwsConnection connection( QStringLiteral( "ArcGisMapServer" ), connectionName );
71+
QgsOwsConnection connection( QStringLiteral( "arcgismapserver" ), connectionName );
7272
return new QgsAmsConnectionItem( parentItem, QStringLiteral( "ArcGisMapServer" ), path, connection.uri().param( QStringLiteral( "url" ) ) );
7373
}
7474
}

0 commit comments

Comments
 (0)