Merge pull request qgis#55847 from rouault/wfs_complex_content

[WFS provider] Handle documents with Complex Feature schemas (using OGR GMLAS driver), and JSON'ify content of complex properties
rouault · Feb 20, 2024 · ca336f7 · ca336f7
2 parents 086d5cf + f017314
commit ca336f7
Show file tree

Hide file tree

Showing 44 changed files with 2,435 additions and 142 deletions.
diff --git a/python/PyQt6/core/auto_generated/qgsgml.sip.in b/python/PyQt6/core/auto_generated/qgsgml.sip.in
@@ -11,6 +11,7 @@
 
 
 
+
 class QgsGml : QObject
 {
 %Docstring(signature="appended")

diff --git a/python/PyQt6/core/auto_generated/qgsogcutils.sip.in b/python/PyQt6/core/auto_generated/qgsogcutils.sip.in
@@ -197,7 +197,9 @@ Creates an ElseFilter from ``doc``
         bool honourAxisOrientation,
         bool invertAxisOrientation,
         QString *errorMessage = 0,
-        bool requiresFilterElement = false );
+        bool requiresFilterElement = false,
+        const QMap<QString, QString> &fieldNameToXPathMap = QMap<QString, QString>(),
+        const QMap<QString, QString> &namespacePrefixToUriMap = QMap<QString, QString>() );
 %Docstring
 Creates an OGC expression XML element from the ``exp`` expression.
 

diff --git a/python/PyQt6/gui/auto_generated/qgsnewhttpconnection.sip.in b/python/PyQt6/gui/auto_generated/qgsnewhttpconnection.sip.in
@@ -83,6 +83,7 @@ Returns the current connection url.
       WFS_VERSION_API_FEATURES_1_0,
     };
 
+
     virtual bool validate();
 %Docstring
 Returns ``True`` if dialog settings are valid, or ``False`` if current

diff --git a/python/core/auto_generated/qgsgml.sip.in b/python/core/auto_generated/qgsgml.sip.in
@@ -11,6 +11,7 @@
 
 
 
+
 class QgsGml : QObject
 {
 %Docstring(signature="appended")

diff --git a/python/core/auto_generated/qgsogcutils.sip.in b/python/core/auto_generated/qgsogcutils.sip.in
@@ -197,7 +197,9 @@ Creates an ElseFilter from ``doc``
         bool honourAxisOrientation,
         bool invertAxisOrientation,
         QString *errorMessage = 0,
-        bool requiresFilterElement = false );
+        bool requiresFilterElement = false,
+        const QMap<QString, QString> &fieldNameToXPathMap = QMap<QString, QString>(),
+        const QMap<QString, QString> &namespacePrefixToUriMap = QMap<QString, QString>() );
 %Docstring
 Creates an OGC expression XML element from the ``exp`` expression.
 

diff --git a/python/gui/auto_generated/qgsnewhttpconnection.sip.in b/python/gui/auto_generated/qgsnewhttpconnection.sip.in
@@ -83,6 +83,7 @@ Returns the current connection url.
       WFS_VERSION_API_FEATURES_1_0,
     };
 
+
     virtual bool validate();
 %Docstring
 Returns ``True`` if dialog settings are valid, or ``False`` if current

diff --git a/src/app/options/qgsoptions.cpp b/src/app/options/qgsoptions.cpp
@@ -2263,6 +2263,20 @@ void QgsOptions::browseCacheDirectory()
 void QgsOptions::clearCache()
 {
   QgsNetworkAccessManager::instance()->cache()->clear();
+
+  // Clear WFS XSD cache used by OGR GMLAS driver
+  QString cacheDirectory = mSettings->value( QStringLiteral( "cache/directory" ) ).toString();
+  if ( cacheDirectory.isEmpty() )
+    cacheDirectory = QStandardPaths::writableLocation( QStandardPaths::CacheLocation );
+  if ( !cacheDirectory.endsWith( QDir::separator() ) )
+  {
+    cacheDirectory.push_back( QDir::separator() );
+  }
+  // Must be kept in sync with QgsWFSProvider::readAttributesFromSchemaWithGMLAS()
+  cacheDirectory += QLatin1String( "gmlas_xsd_cache" );
+  QDir dir( cacheDirectory );
+  dir.removeRecursively();
+
   QMessageBox::information( this, tr( "Clear Cache" ), tr( "Content cache has been cleared." ) );
 }
 

diff --git a/src/core/qgscplhttpfetchoverrider.cpp b/src/core/qgscplhttpfetchoverrider.cpp
@@ -63,6 +63,13 @@ CPLHTTPResult *QgsCPLHTTPFetchOverrider::callback( const char *pszURL,
     }
   }
 
+  if ( pThis->mFeedback && pThis->mFeedback->isCanceled() )
+  {
+    psResult->nStatus = 1;
+    psResult->pszErrBuf = CPLStrdup( "download interrupted by user" );
+    return psResult;
+  }
+
   QgsBlockingNetworkRequest blockingRequest;
   blockingRequest.setAuthCfg( pThis->mAuthCfg );
 

diff --git a/src/core/qgscplhttpfetchoverrider.h b/src/core/qgscplhttpfetchoverrider.h
@@ -42,7 +42,7 @@ class QgsFeedback;
  * \note not available in Python bindings
  * \since QGIS 3.18
  */
-class QgsCPLHTTPFetchOverrider
+class CORE_EXPORT QgsCPLHTTPFetchOverrider
 {
   public:
     //! Installs the redirection for the current thread