Skip to content

Commit 227689a

Browse files
committed
[afs] Fix provider incorrectly overrides provider name and description
with layer name and description
1 parent e3fbb4c commit 227689a

File tree

2 files changed

+22
-3
lines changed

2 files changed

+22
-3
lines changed

src/providers/arcgisrest/qgsafsprovider.cpp

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@
3434
#include <QNetworkReply>
3535

3636

37+
static const QString TEXT_PROVIDER_KEY = QStringLiteral( "arcgisfeatureserver" );
38+
static const QString TEXT_PROVIDER_DESCRIPTION = QStringLiteral( "ArcGIS Feature Server data provider" );
39+
3740
QgsAfsProvider::QgsAfsProvider( const QString &uri )
3841
: QgsVectorDataProvider( uri )
3942
, mValid( false )
@@ -204,6 +207,21 @@ QgsRectangle QgsAfsProvider::extent() const
204207
return mSharedData->extent();
205208
}
206209

210+
QString QgsAfsProvider::name() const
211+
{
212+
return TEXT_PROVIDER_KEY;
213+
}
214+
215+
QString QgsAfsProvider::description() const
216+
{
217+
return TEXT_PROVIDER_DESCRIPTION;
218+
}
219+
220+
QString QgsAfsProvider::dataComment() const
221+
{
222+
return mLayerDescription;
223+
}
224+
207225
void QgsAfsProvider::reloadData()
208226
{
209227
mSharedData->clearCache();
@@ -217,7 +235,7 @@ class QgsAfsSourceSelectProvider : public QgsSourceSelectProvider
217235
{
218236
public:
219237

220-
QString providerKey() const override { return QStringLiteral( "arcgisfeatureserver" ); }
238+
QString providerKey() const override { return TEXT_PROVIDER_KEY; }
221239
QString text() const override { return QObject::tr( "ArcGIS Feature Server" ); }
222240
int ordering() const override { return QgsSourceSelectProvider::OrderRemoteProvider + 150; }
223241
QIcon icon() const override { return QgsApplication::getThemeIcon( QStringLiteral( "/mActionAddAfsLayer.svg" ) ); }

src/providers/arcgisrest/qgsafsprovider.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,9 @@ class QgsAfsProvider : public QgsVectorDataProvider
6464
/* Read only for the moment
6565
void updateExtents() override{}
6666
*/
67-
QString name() const override { return mLayerName; }
68-
QString description() const override { return mLayerDescription; }
67+
QString name() const override;
68+
QString description() const override;
69+
QString dataComment() const override;
6970
void reloadData() override;
7071

7172
private:

0 commit comments

Comments
 (0)