OAPIF source select: fix missing extra query in collections url

Fix #46535
qgis · Feb 2, 2022 · 9e1fbf7 · 9e1fbf7
1 parent e608ba2
commit 9e1fbf7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/providers/wfs/qgsoapiflandingpagerequest.cpp b/src/providers/wfs/qgsoapiflandingpagerequest.cpp
@@ -134,7 +134,7 @@ void QgsOapifLandingPageRequest::processReply()
     return;
   }
 
-  // Strip off suffixex like /collections?f=json
+  // Strip off suffixes like /collections?f=json
   const auto posQuotationMark = mCollectionsUrl.indexOf( '?' );
   if ( posQuotationMark > 0 )
   {

diff --git a/src/providers/wfs/qgswfssourceselect.cpp b/src/providers/wfs/qgswfssourceselect.cpp
@@ -333,6 +333,16 @@ void QgsWFSSourceSelect::oapifLandingPageReplyFinished()
 
   mAvailableCRS.clear();
   QString url( mOAPIFLandingPage->collectionsUrl() );
+
+  // Add back any extra query parameters, see issue GH #46535
+  const QgsWfsConnection connection( cmbConnections->currentText() );
+  const QUrl connectionUrl( connection.uri().param( QStringLiteral( "url" ) ) );
+  if ( ! connectionUrl.query().isEmpty() )
+  {
+    url.append( '?' );
+    url.append( connectionUrl.query() );
+  }
+
   mOAPIFLandingPage.reset();
   startOapifCollectionsRequest( url );
 }