Skip to content

Commit d6f4621

Browse files
committed
[ArcGIS Rest] Fix connection key inconsistencies
1 parent 6b8bcad commit d6f4621

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-
foreach ( QString connName, QgsOWSConnection::connectionList( "ArcGisFeatureServer" ) )
40+
foreach ( QString connName, QgsOWSConnection::connectionList( "arcgisfeatureserver" ) )
4141
{
42-
QgsOWSConnection connection( "ArcGisFeatureServer", connName );
42+
QgsOWSConnection connection( "arcgisfeatureserver", connName );
4343
QString path = "afs:/" + connName;
4444
connections.append( new QgsAfsConnectionItem( this, connName, path, connection.uri().param( "url" ) ) );
4545
}
@@ -67,8 +67,8 @@ void QgsAfsRootItem::connectionsChanged()
6767

6868
void QgsAfsRootItem::newConnection()
6969
{
70-
QgsNewHttpConnection nc( 0, "/Qgis/connections-afs/" );
71-
nc.setWindowTitle( tr( "Create a new AFS connection" ) );
70+
QgsNewHttpConnection nc( 0, "/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, "/Qgis/connections-afs/", mName );
134-
nc.setWindowTitle( tr( "Modify AFS connection" ) );
133+
QgsNewHttpConnection nc( 0, "/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( "ArcGisFeatureServer", mName );
144+
QgsOWSConnection::deleteConnection( "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 thePath, QgsDataItem *parentItem )
6666
if ( thePath.startsWith( "afs:/" ) )
6767
{
6868
QString connectionName = thePath.split( '/' ).last();
69-
if ( QgsOWSConnection::connectionList( "ArcGisFeatureServer" ).contains( connectionName ) )
69+
if ( QgsOWSConnection::connectionList( "arcgisfeatureserver" ).contains( connectionName ) )
7070
{
71-
QgsOWSConnection connection( "ArcGisFeatureServer", connectionName );
71+
QgsOWSConnection connection( "arcgisfeatureserver", connectionName );
7272
return new QgsAfsConnectionItem( parentItem, "ArcGisFeatureServer", thePath, connection.uri().param( "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-
foreach ( QString connName, QgsOWSConnection::connectionList( "ArcGisMapServer" ) )
36+
foreach ( QString connName, QgsOWSConnection::connectionList( "arcgismapserver" ) )
3737
{
38-
QgsOWSConnection connection( "ArcGisMapServer", connName );
38+
QgsOWSConnection connection( "arcgismapserver", connName );
3939
QString path = "ams:/" + connName;
4040
connections.append( new QgsAmsConnectionItem( this, connName, path, connection.uri().param( "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, "/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, "/Qgis/connections-afs/", mName );
149-
nc.setWindowTitle( tr( "Modify AMS connection" ) );
148+
QgsNewHttpConnection nc( 0, "/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( "ArcGisMapServer", mName );
159+
QgsOWSConnection::deleteConnection( "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 thePath, QgsDataItem *parentItem )
6666
if ( thePath.startsWith( "ams:/" ) )
6767
{
6868
QString connectionName = thePath.split( '/' ).last();
69-
if ( QgsOWSConnection::connectionList( "ArcGisMapServer" ).contains( connectionName ) )
69+
if ( QgsOWSConnection::connectionList( "arcgismapserver" ).contains( connectionName ) )
7070
{
71-
QgsOWSConnection connection( "ArcGisMapServer", connectionName );
71+
QgsOWSConnection connection( "arcgismapserver", connectionName );
7272
return new QgsAmsConnectionItem( parentItem, "ArcGisMapServer", thePath, connection.uri().param( "url" ) );
7373
}
7474
}

0 commit comments

Comments
 (0)