Move xyz tile loading to data provider

nyalldawson · nyalldawson · commit f56c6822e45c · 2023-03-20T11:55:31.000+10:00
diff --git a/src/core/vectortile/qgsvectortilelayer.cpp b/src/core/vectortile/qgsvectortilelayer.cpp
@@ -1367,7 +1367,11 @@ bool QgsVectorTileDataProvider::supportsAsync() const
 QgsXyzVectorTileDataProvider::QgsXyzVectorTileDataProvider( const QString &uri, const ProviderOptions &providerOptions, ReadFlags flags )
   : QgsVectorTileDataProvider( uri, providerOptions, flags )
 {
+  QgsDataSourceUri dsUri;
+  dsUri.setEncodedUri( uri );
 
+  mAuthCfg = dsUri.authConfigId();
+  mHeaders = dsUri.httpHeaders();
 }
 
 QgsVectorTileDataProvider *QgsXyzVectorTileDataProvider::clone() const
@@ -1409,27 +1413,48 @@ bool QgsXyzVectorTileDataProvider::supportsAsync() const
 
 QByteArray QgsXyzVectorTileDataProvider::readTile( const QgsTileMatrix &tileMatrix, const QgsTileXYZ &id, QgsFeedback *feedback ) const
 {
-  QgsDataSourceUri dsUri;
-  dsUri.setEncodedUri( dataSourceUri() );
-  const QString authcfg = dsUri.authConfigId();
-
-  const QgsTileRange tileRange( id.column(), id.column(), id.row(), id.row() );
-
-  QList<QgsVectorTileRawData> rawTiles = QgsVectorTileLoader::blockingFetchTileRawData( QStringLiteral( "xyz" ),
-                                         dsUri.param( QStringLiteral( "url" ) ),
-                                         tileMatrix,
-                                         QPointF(),
-                                         tileRange,
-                                         authcfg,
-                                         dsUri.httpHeaders() );
-  if ( rawTiles.isEmpty() )
-    return QByteArray();
-  return rawTiles.first().data;
+  return loadFromNetwork( id, tileMatrix, sourcePath(), mAuthCfg, mHeaders, feedback );
 }
 
-QList<QgsVectorTileRawData> QgsXyzVectorTileDataProvider::readTiles( const QgsTileMatrix &, const QVector<QgsTileXYZ> &tiles, QgsFeedback *feedback ) const
+QList<QgsVectorTileRawData> QgsXyzVectorTileDataProvider::readTiles( const QgsTileMatrix &tileMatrix, const QVector<QgsTileXYZ> &tiles, QgsFeedback *feedback ) const
 {
+  QList<QgsVectorTileRawData> rawTiles;
+  rawTiles.reserve( tiles.size() );
+  const QString source = sourcePath();
+  for ( QgsTileXYZ id : std::as_const( tiles ) )
+  {
+    if ( feedback && feedback->isCanceled() )
+      break;
 
+    const QByteArray rawData = loadFromNetwork( id, tileMatrix, source, mAuthCfg, mHeaders, feedback );
+    if ( !rawData.isEmpty() )
+    {
+      rawTiles.append( QgsVectorTileRawData( id, rawData ) );
+    }
+  }
+  return rawTiles;
+}
+
+QByteArray QgsXyzVectorTileDataProvider::loadFromNetwork( const QgsTileXYZ &id, const QgsTileMatrix &tileMatrix, const QString &requestUrl, const QString &authid, const QgsHttpHeaders &headers, QgsFeedback *feedback )
+{
+  QString url = QgsVectorTileUtils::formatXYZUrlTemplate( requestUrl, id, tileMatrix );
+  QNetworkRequest nr;
+  nr.setUrl( QUrl( url ) );
+
+  headers.updateNetworkRequest( nr );
+
+  QgsBlockingNetworkRequest req;
+  req.setAuthCfg( authid );
+  QgsDebugMsgLevel( QStringLiteral( "Blocking request: " ) + url, 2 );
+  QgsBlockingNetworkRequest::ErrorCode errCode = req.get( nr, false, feedback );
+  if ( errCode != QgsBlockingNetworkRequest::NoError )
+  {
+    QgsDebugMsg( QStringLiteral( "Request failed: " ) + url );
+    return QByteArray();
+  }
+  QgsNetworkReplyContent reply = req.reply();
+  QgsDebugMsgLevel( QStringLiteral( "Request successful, content size %1" ).arg( reply.content().size() ), 2 );
+  return reply.content();
 }
 
 //
@@ -1474,7 +1499,7 @@ QgsCoordinateReferenceSystem QgsMbTilesVectorTileDataProvider::crs() const
   return QgsCoordinateReferenceSystem( QStringLiteral( "EPSG:3857" ) );
 }
 
-QByteArray QgsMbTilesVectorTileDataProvider::readTile( const QgsTileMatrix &tileMatrix, const QgsTileXYZ &id, QgsFeedback *feedback ) const
+QByteArray QgsMbTilesVectorTileDataProvider::readTile( const QgsTileMatrix &, const QgsTileXYZ &id, QgsFeedback *feedback ) const
 {
   QgsDataSourceUri dsUri;
   dsUri.setEncodedUri( dataSourceUri() );
@@ -1622,7 +1647,7 @@ QByteArray QgsVtpkVectorTileDataProvider::loadFromVtpk( QgsVtpkTiles &vtpkTileRe
 //
 
 QgsArcGisVectorTileServiceDataProvider::QgsArcGisVectorTileServiceDataProvider( const QString &uri, const QString &sourcePath, const ProviderOptions &providerOptions, ReadFlags flags )
-  : QgsVectorTileDataProvider( uri, providerOptions, flags )
+  : QgsXyzVectorTileDataProvider( uri, providerOptions, flags )
   , mSourcePath( sourcePath )
 {
 
@@ -1651,38 +1676,6 @@ bool QgsArcGisVectorTileServiceDataProvider::isValid() const
   return true;
 }
 
-QgsCoordinateReferenceSystem QgsArcGisVectorTileServiceDataProvider::crs() const
-{
-  QGIS_PROTECT_QOBJECT_THREAD_ACCESS
-
-  return QgsCoordinateReferenceSystem( QStringLiteral( "EPSG:3857" ) );
-}
-
-QByteArray QgsArcGisVectorTileServiceDataProvider::readTile( const QgsTileMatrix &tileMatrix, const QgsTileXYZ &id, QgsFeedback *feedback ) const
-{
-  QgsDataSourceUri dsUri;
-  dsUri.setEncodedUri( dataSourceUri() );
-  const QString authcfg = dsUri.authConfigId();
-
-  const QgsTileRange tileRange( id.column(), id.column(), id.row(), id.row() );
-
-  QList<QgsVectorTileRawData> rawTiles = QgsVectorTileLoader::blockingFetchTileRawData( QStringLiteral( "xyz" ),
-                                         mSourcePath,
-                                         tileMatrix,
-                                         QPointF(),
-                                         tileRange,
-                                         authcfg,
-                                         dsUri.httpHeaders() );
-  if ( rawTiles.isEmpty() )
-    return QByteArray();
-  return rawTiles.first().data;
-}
-
-QList<QgsVectorTileRawData> QgsArcGisVectorTileServiceDataProvider::readTiles( const QgsTileMatrix &, const QVector<QgsTileXYZ> &tiles, QgsFeedback *feedback ) const
-{
-
-}
-
 ///@endcond
 
 
diff --git a/src/core/vectortile/qgsvectortilelayer.h b/src/core/vectortile/qgsvectortilelayer.h
@@ -374,6 +374,22 @@ class QgsXyzVectorTileDataProvider : public QgsVectorTileDataProvider
     bool supportsAsync() const override;
     QByteArray readTile( const QgsTileMatrix &tileMatrix, const QgsTileXYZ &id, QgsFeedback *feedback = nullptr ) const override;
     QList<QgsVectorTileRawData> readTiles( const QgsTileMatrix &, const QVector<QgsTileXYZ> &tiles, QgsFeedback *feedback = nullptr ) const override;
+
+  protected:
+
+    QString mAuthCfg;
+    QgsHttpHeaders mHeaders;
+
+  private:
+
+    //! Returns raw tile data for a single tile, doing a HTTP request. Block the caller until tile data are downloaded.
+    static QByteArray loadFromNetwork( const QgsTileXYZ &id,
+                                       const QgsTileMatrix &tileMatrix,
+                                       const QString &requestUrl,
+                                       const QString &authid,
+                                       const QgsHttpHeaders &headers,
+                                       QgsFeedback *feedback = nullptr );
+
 };
 
 class QgsMbTilesVectorTileDataProvider : public QgsVectorTileDataProvider
@@ -424,7 +440,7 @@ class QgsVtpkVectorTileDataProvider : public QgsVectorTileDataProvider
 
 };
 
-class QgsArcGisVectorTileServiceDataProvider : public QgsVectorTileDataProvider
+class QgsArcGisVectorTileServiceDataProvider : public QgsXyzVectorTileDataProvider
 {
     Q_OBJECT
 
@@ -436,9 +452,6 @@ class QgsArcGisVectorTileServiceDataProvider : public QgsVectorTileDataProvider
     QgsVectorTileDataProvider *clone() const override;
     QString sourcePath() const override;
     bool isValid() const override;
-    QgsCoordinateReferenceSystem crs() const override;
-    QByteArray readTile( const QgsTileMatrix &tileMatrix, const QgsTileXYZ &id, QgsFeedback *feedback = nullptr ) const override;
-    QList<QgsVectorTileRawData> readTiles( const QgsTileMatrix &, const QVector<QgsTileXYZ> &tiles, QgsFeedback *feedback = nullptr ) const override;
 
   private:
 
