Start using data provider in renderer

qgis · Mar 20, 2023 · d2ca8a1 · d2ca8a1
1 parent ca34d14
commit d2ca8a1
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 4 deletions.
diff --git a/src/core/vectortile/qgsvectortilelayer.cpp b/src/core/vectortile/qgsvectortilelayer.cpp
@@ -1354,6 +1354,11 @@ bool QgsVectorTileDataProvider::renderInPreview( const PreviewContext &context )
   return context.lastRenderingTimeMs <= 1000;
 }
 
+bool QgsVectorTileDataProvider::supportsAsync() const
+{
+  return false;
+}
+
 //
 // QgsXyzVectorTileDataProvider
 //
@@ -1396,6 +1401,11 @@ QgsCoordinateReferenceSystem QgsXyzVectorTileDataProvider::crs() const
   return QgsCoordinateReferenceSystem( QStringLiteral( "EPSG:3857" ) );
 }
 
+bool QgsXyzVectorTileDataProvider::supportsAsync() const
+{
+  return true;
+}
+
 QByteArray QgsXyzVectorTileDataProvider::readTile( const QgsTileMatrix &tileMatrix, const QgsTileXYZ &id ) const
 {
   QgsDataSourceUri dsUri;

diff --git a/src/core/vectortile/qgsvectortilelayer.h b/src/core/vectortile/qgsvectortilelayer.h
@@ -343,6 +343,13 @@ class QgsVectorTileDataProvider : public QgsDataProvider
     virtual QString sourcePath() const = 0;
     virtual QgsVectorTileDataProvider *clone() const = 0 SIP_FACTORY;
 
+    /**
+     * Returns TRUE if the provider supports async tile reading.
+     *
+     * The default implementation returns FALSE.
+     */
+    virtual bool supportsAsync() const;
+
     //! Returns raw tile data for a single tile
     virtual QByteArray readTile( const QgsTileMatrix &tileMatrix, const QgsTileXYZ &id ) const = 0;
 
@@ -361,6 +368,7 @@ class QgsXyzVectorTileDataProvider : public QgsVectorTileDataProvider
     QString sourcePath() const override;
     bool isValid() const override;
     QgsCoordinateReferenceSystem crs() const override;
+    bool supportsAsync() const override;
     QByteArray readTile( const QgsTileMatrix &tileMatrix, const QgsTileXYZ &id ) const override;
 };
 

diff --git a/src/core/vectortile/qgsvectortilelayerrenderer.cpp b/src/core/vectortile/qgsvectortilelayerrenderer.cpp
@@ -16,6 +16,7 @@
 #include "qgsvectortilelayerrenderer.h"
 
 #include <QElapsedTimer>
+#include <QThread>
 
 #include "qgsexpressioncontextutils.h"
 #include "qgsfeedback.h"
@@ -36,6 +37,7 @@ QgsVectorTileLayerRenderer::QgsVectorTileLayerRenderer( QgsVectorTileLayer *laye
   : QgsMapLayerRenderer( layer->id(), &context )
   , mSourceType( layer->sourceType() )
   , mSourcePath( layer->sourcePath() )
+  , mDataProvider( qgis::down_cast< const QgsVectorTileDataProvider* >( layer->dataProvider() )->clone() )
   , mRenderer( layer->renderer()->clone() )
   , mDrawTileBoundaries( layer->isTileBorderRenderingEnabled() )
   , mFeedback( new QgsFeedback )
@@ -62,15 +64,21 @@ QgsVectorTileLayerRenderer::QgsVectorTileLayerRenderer( QgsVectorTileLayer *laye
   }
 
   mClippingRegions = QgsMapClippingUtils::collectClippingRegionsForLayer( *renderContext(), layer );
+
+  mDataProvider->moveToThread( nullptr );
 }
 
+QgsVectorTileLayerRenderer::~QgsVectorTileLayerRenderer() = default;
+
 bool QgsVectorTileLayerRenderer::render()
 {
   QgsRenderContext &ctx = *renderContext();
 
   if ( ctx.renderingStopped() )
     return false;
 
+  mDataProvider->moveToThread( QThread::currentThread() );
+
   const QgsScopedQPainterState painterState( ctx.painter() );
 
   if ( !mClippingRegions.empty() )
@@ -107,8 +115,6 @@ bool QgsVectorTileLayerRenderer::render()
     return true;   // nothing to do
   }
 
-  const bool isAsync = ( mSourceType == QLatin1String( "xyz" ) );
-
   if ( mSourceType == QLatin1String( "xyz" ) && mSourcePath.contains( QLatin1String( "{usage}" ) ) )
   {
     switch ( renderContext()->rendererUsage() )
@@ -127,7 +133,7 @@ bool QgsVectorTileLayerRenderer::render()
 
   std::unique_ptr<QgsVectorTileLoader> asyncLoader;
   QList<QgsVectorTileRawData> rawTiles;
-  if ( !isAsync )
+  if ( !mDataProvider->supportsAsync() )
   {
     QElapsedTimer tFetch;
     tFetch.start();
@@ -191,7 +197,7 @@ bool QgsVectorTileLayerRenderer::render()
     }
   }
 
-  if ( !isAsync )
+  if ( !mDataProvider->supportsAsync() )
   {
     for ( const QgsVectorTileRawData &rawTile : std::as_const( rawTiles ) )
     {

diff --git a/src/core/vectortile/qgsvectortilelayerrenderer.h b/src/core/vectortile/qgsvectortilelayerrenderer.h
@@ -23,6 +23,7 @@
 class QgsVectorTileLayer;
 class QgsVectorTileRawData;
 class QgsVectorTileLabelProvider;
+class QgsVectorTileDataProvider;
 
 #include "qgsvectortilerenderer.h"
 #include "qgsmapclippingregion.h"
@@ -45,6 +46,7 @@ class QgsVectorTileLayerRenderer : public QgsMapLayerRenderer
   public:
     //! Creates the renderer. Always called from main thread, should copy whatever necessary from the layer
     QgsVectorTileLayerRenderer( QgsVectorTileLayer *layer, QgsRenderContext &context );
+    ~QgsVectorTileLayerRenderer() override;
 
     virtual bool render() override;
     virtual QgsFeedback *feedback() const override { return mFeedback.get(); }
@@ -63,6 +65,8 @@ class QgsVectorTileLayerRenderer : public QgsMapLayerRenderer
     QString mAuthCfg;
     QgsHttpHeaders mHeaders;
 
+    std::unique_ptr< QgsVectorTileDataProvider > mDataProvider;
+
     //! Tile renderer object to do rendering of individual tiles
     std::unique_ptr<QgsVectorTileRenderer> mRenderer;