force downloading wms capabilities when refreshing wms connection items

qgis · Oct 6, 2021 · 89a4f0b · 89a4f0b
1 parent 061b810
commit 89a4f0b
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 0 deletions.
diff --git a/src/providers/wms/qgswmscapabilities.cpp b/src/providers/wms/qgswmscapabilities.cpp
@@ -2294,6 +2294,16 @@ QgsWmsCapabilitiesDownload::~QgsWmsCapabilitiesDownload()
   abort();
 }
 
+bool QgsWmsCapabilitiesDownload::forceRefresh()
+{
+  return mForceRefresh;
+}
+
+void QgsWmsCapabilitiesDownload::setForceRefresh( bool forceRefresh )
+{
+  mForceRefresh = forceRefresh;
+}
+
 bool QgsWmsCapabilitiesDownload::downloadCapabilities( const QString &baseUrl, const QgsWmsAuthorization &auth )
 {
   mBaseUrl = baseUrl;

diff --git a/src/providers/wms/qgswmscapabilities.h b/src/providers/wms/qgswmscapabilities.h
@@ -1035,6 +1035,22 @@ class QgsWmsCapabilitiesDownload : public QObject
 
     bool downloadCapabilities( const QString &baseUrl, const QgsWmsAuthorization &auth );
 
+    /**
+     * Returns the download refresh state.
+     * \see setForceRefresh()
+     *
+     * \since QGIS 3.22
+     */
+    bool forceRefresh();
+
+    /**
+     * Sets the download refresh state.
+     * \see forceRefresh()
+     *
+     * \since QGIS 3.22
+     */
+    void setForceRefresh( bool forceRefresh );
+
     QString lastError() const { return mError; }
 
     QByteArray response() const { return mHttpCapabilitiesResponse; }

diff --git a/src/providers/wms/qgswmsdataitems.cpp b/src/providers/wms/qgswmsdataitems.cpp
@@ -43,6 +43,12 @@ QgsWMSConnectionItem::~QgsWMSConnectionItem()
   delete mCapabilitiesDownload;
 }
 
+void QgsWMSConnectionItem::refresh()
+{
+  mCapabilitiesDownload->setForceRefresh( true );
+  QgsDataItem::refresh();
+}
+
 void QgsWMSConnectionItem::deleteLater()
 {
   if ( mCapabilitiesDownload )

diff --git a/src/providers/wms/qgswmsdataitems.h b/src/providers/wms/qgswmsdataitems.h
@@ -34,6 +34,7 @@ class QgsWMSConnectionItem : public QgsDataCollectionItem
 
     QVector<QgsDataItem *> createChildren() override;
     bool equal( const QgsDataItem *other ) override;
+    void refresh() override;
 
   public slots:
     void deleteLater() override;