Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Make getRawTile return QgsVectorTileRawData instead of raw byte arrays
  • Loading branch information
@nyalldawson
nyalldawson committed May 22, 2023
1 parent ef25c58 commit a96c5a8
Show file tree
Hide file tree
Showing 13 changed files with 49 additions and 37 deletions.
4 changes: 2 additions & 2 deletions src/core/vectortile/qgsmbtilesvectortiledataprovider.cpp
View file
Expand Up @@ -150,7 +150,7 @@ const QgsVectorTileMatrixSet &QgsMbTilesVectorTileDataProvider::tileMatrixSet()
return mMatrixSet;
}

QByteArray QgsMbTilesVectorTileDataProvider::readTile( const QgsTileMatrixSet &, const QgsTileXYZ &id, QgsFeedback *feedback ) const
QgsVectorTileRawData QgsMbTilesVectorTileDataProvider::readTile( const QgsTileMatrixSet &, const QgsTileXYZ &id, QgsFeedback *feedback ) const
{
QGIS_PROTECT_QOBJECT_THREAD_ACCESS

Expand All @@ -159,7 +159,7 @@ QByteArray QgsMbTilesVectorTileDataProvider::readTile( const QgsTileMatrixSet &,

QgsMbTiles mbReader( dsUri.param( QStringLiteral( "url" ) ) );
mbReader.open();
return loadFromMBTiles( mbReader, id, feedback );
return QgsVectorTileRawData( id, loadFromMBTiles( mbReader, id, feedback ) );
}

QList<QgsVectorTileRawData> QgsMbTilesVectorTileDataProvider::readTiles( const QgsTileMatrixSet &, const QVector<QgsTileXYZ> &tiles, QgsFeedback *feedback ) const
Expand Down
2 changes: 1 addition & 1 deletion src/core/vectortile/qgsmbtilesvectortiledataprovider.h
View file
Expand Up @@ -52,7 +52,7 @@ class CORE_EXPORT QgsMbTilesVectorTileDataProvider : public QgsVectorTileDataPro
QgsRectangle extent() const override;
QgsCoordinateReferenceSystem crs() const override;
const QgsVectorTileMatrixSet &tileMatrixSet() const override;
QByteArray readTile( const QgsTileMatrixSet &tileMatrixSet, const QgsTileXYZ &id, QgsFeedback *feedback = nullptr ) const override;
QgsVectorTileRawData readTile( const QgsTileMatrixSet &tileMatrixSet, const QgsTileXYZ &id, QgsFeedback *feedback = nullptr ) const override;
QList<QgsVectorTileRawData> readTiles( const QgsTileMatrixSet &, const QVector<QgsTileXYZ> &tiles, QgsFeedback *feedback = nullptr ) const override;

static QString MB_TILES_VECTOR_TILE_DATA_PROVIDER_KEY;
Expand Down
2 changes: 1 addition & 1 deletion src/core/vectortile/qgsvectortiledataprovider.h
View file
Expand Up @@ -98,7 +98,7 @@ class CORE_EXPORT QgsVectorTileDataProvider : public QgsDataProvider
/**
* Returns raw tile data for a single tile.
*/
virtual QByteArray readTile( const QgsTileMatrixSet &tileMatrixSet, const QgsTileXYZ &id, QgsFeedback *feedback = nullptr ) const = 0;
virtual QgsVectorTileRawData readTile( const QgsTileMatrixSet &tileMatrixSet, const QgsTileXYZ &id, QgsFeedback *feedback = nullptr ) const = 0;

/**
* Returns raw tile data for a range of tiles.
Expand Down
9 changes: 5 additions & 4 deletions src/core/vectortile/qgsvectortilelayer.cpp
View file
Expand Up @@ -20,6 +20,7 @@
#include "qgsvectortilebasiclabeling.h"
#include "qgsvectortilebasicrenderer.h"
#include "qgsvectortilelabeling.h"
#include "qgsvectortileloader.h"
#include "qgsvectortileutils.h"
#include "qgsnetworkaccessmanager.h"
#include "qgsdatasourceuri.h"
Expand Down Expand Up @@ -577,13 +578,13 @@ QString QgsVectorTileLayer::sourcePath() const
return QString();
}

QByteArray QgsVectorTileLayer::getRawTile( QgsTileXYZ tileID )
QgsVectorTileRawData QgsVectorTileLayer::getRawTile( QgsTileXYZ tileID )
{
QGIS_PROTECT_QOBJECT_THREAD_ACCESS

QgsVectorTileDataProvider *vtProvider = qobject_cast< QgsVectorTileDataProvider * >( mDataProvider.get() );
if ( !vtProvider )
return QByteArray();
return QgsVectorTileRawData();

return vtProvider->readTile( mMatrixSet, tileID );
}
Expand Down Expand Up @@ -726,8 +727,8 @@ void QgsVectorTileLayer::selectByGeometry( const QgsGeometry &geometry, const Qg

for ( const QgsTileXYZ &tileID : tiles )
{
QByteArray data = getRawTile( tileID );
if ( data.isEmpty() )
const QgsVectorTileRawData data = getRawTile( tileID );
if ( data.data.isEmpty() )
continue; // failed to get data

QgsVectorTileMVTDecoder decoder( tileMatrixSet() );
Expand Down
3 changes: 2 additions & 1 deletion src/core/vectortile/qgsvectortilelayer.h
View file
Expand Up @@ -27,6 +27,7 @@ class QgsVectorTileLabeling;
class QgsFeature;
class QgsGeometry;
class QgsSelectionContext;
class QgsVectorTileRawData;

/**
* \ingroup core
Expand Down Expand Up @@ -197,7 +198,7 @@ class CORE_EXPORT QgsVectorTileLayer : public QgsMapLayer
* \note This call may issue a network request (depending on the source type) and will block
* the caller until the request is finished.
*/
QByteArray getRawTile( QgsTileXYZ tileID ) SIP_SKIP;
QgsVectorTileRawData getRawTile( QgsTileXYZ tileID ) SIP_SKIP;

/**
* Sets renderer for the map layer.
Expand Down
4 changes: 3 additions & 1 deletion src/core/vectortile/qgsvectortileutils.cpp
View file
Expand Up @@ -27,6 +27,7 @@
#include "qgsrectangle.h"
#include "qgsvectorlayer.h"

#include "qgsvectortileloader.h"
#include "qgsvectortilemvtdecoder.h"
#include "qgsvectortilelayer.h"
#include "qgsvectortilerenderer.h"
Expand Down Expand Up @@ -86,7 +87,8 @@ int QgsVectorTileUtils::scaleToZoomLevel( double mapScale, int sourceMinZoom, in
QgsVectorLayer *QgsVectorTileUtils::makeVectorLayerForTile( QgsVectorTileLayer *mvt, QgsTileXYZ tileID, const QString &layerName )
{
QgsVectorTileMVTDecoder decoder( mvt->tileMatrixSet() );
decoder.decode( tileID, mvt->getRawTile( tileID ) );
const QgsVectorTileRawData rawTile = mvt->getRawTile( tileID );
decoder.decode( tileID, rawTile.data );
QSet<QString> fieldNames = qgis::listToSet( decoder.layerFieldNames( layerName ) );
fieldNames << QStringLiteral( "_geom_type" );
QMap<QString, QgsFields> perLayerFields;
Expand Down
17 changes: 11 additions & 6 deletions src/core/vectortile/qgsvtpkvectortiledataprovider.cpp
View file
Expand Up @@ -176,7 +176,7 @@ QImage QgsVtpkVectorTileDataProvider::spriteImage() const
return mSpriteImage;
}

QByteArray QgsVtpkVectorTileDataProvider::readTile( const QgsTileMatrixSet &, const QgsTileXYZ &id, QgsFeedback *feedback ) const
QgsVectorTileRawData QgsVtpkVectorTileDataProvider::readTile( const QgsTileMatrixSet &, const QgsTileXYZ &id, QgsFeedback *feedback ) const
{
QGIS_PROTECT_QOBJECT_THREAD_ACCESS

Expand Down Expand Up @@ -204,10 +204,10 @@ QList<QgsVectorTileRawData> QgsVtpkVectorTileDataProvider::readTiles( const QgsT
if ( feedback && feedback->isCanceled() )
break;

const QByteArray rawData = loadFromVtpk( reader, id, feedback );
if ( !rawData.isEmpty() )
const QgsVectorTileRawData rawData = loadFromVtpk( reader, id, feedback );
if ( !rawData.data.isEmpty() )
{
rawTiles.append( QgsVectorTileRawData( id, rawData ) );
rawTiles.append( rawData );
}
}
return rawTiles;
Expand All @@ -230,7 +230,7 @@ QString QgsVtpkVectorTileDataProvider::htmlMetadata() const
return metadata;
}

QByteArray QgsVtpkVectorTileDataProvider::loadFromVtpk( QgsVtpkTiles &vtpkTileReader, const QgsTileXYZ &id, QgsFeedback * )
QgsVectorTileRawData QgsVtpkVectorTileDataProvider::loadFromVtpk( QgsVtpkTiles &vtpkTileReader, const QgsTileXYZ &id, QgsFeedback * )
{
const QByteArray tileData = vtpkTileReader.tileData( id.zoomLevel(), id.column(), id.row() );
if ( tileData.isEmpty() )
Expand All @@ -241,7 +241,12 @@ QByteArray QgsVtpkVectorTileDataProvider::loadFromVtpk( QgsVtpkTiles &vtpkTileRe

return QByteArray();
}
return tileData;

if ( tileData.isEmpty() )
return QgsVectorTileRawData();

QgsVectorTileRawData res( id, tileData );
return res;
}


Expand Down
4 changes: 2 additions & 2 deletions src/core/vectortile/qgsvtpkvectortiledataprovider.h
View file
Expand Up @@ -59,7 +59,7 @@ class CORE_EXPORT QgsVtpkVectorTileDataProvider : public QgsVectorTileDataProvid
QVariantMap styleDefinition() const override;
QVariantMap spriteDefinition() const override;
QImage spriteImage() const override;
QByteArray readTile( const QgsTileMatrixSet &tileMatrix, const QgsTileXYZ &id, QgsFeedback *feedback = nullptr ) const override;
QgsVectorTileRawData readTile( const QgsTileMatrixSet &tileMatrix, const QgsTileXYZ &id, QgsFeedback *feedback = nullptr ) const override;
QList<QgsVectorTileRawData> readTiles( const QgsTileMatrixSet &, const QVector<QgsTileXYZ> &tiles, QgsFeedback *feedback = nullptr ) const override;
QString htmlMetadata() const override;

Expand All @@ -69,7 +69,7 @@ class CORE_EXPORT QgsVtpkVectorTileDataProvider : public QgsVectorTileDataProvid
private:

//! Returns raw tile data for a single tile loaded from VTPK file
static QByteArray loadFromVtpk( QgsVtpkTiles &vtpkTileReader, const QgsTileXYZ &id, QgsFeedback *feedback = nullptr );
static QgsVectorTileRawData loadFromVtpk( QgsVtpkTiles &vtpkTileReader, const QgsTileXYZ &id, QgsFeedback *feedback = nullptr );
bool mIsValid = false;
QgsCoordinateReferenceSystem mCrs;
QgsRectangle mExtent;
Expand Down
4 changes: 2 additions & 2 deletions src/core/vectortile/qgsxyzvectortiledataprovider.cpp
View file
Expand Up @@ -57,9 +57,9 @@ bool QgsXyzVectorTileDataProviderBase::supportsAsync() const
return true;
}

QByteArray QgsXyzVectorTileDataProviderBase::readTile( const QgsTileMatrixSet &set, const QgsTileXYZ &id, QgsFeedback *feedback ) const
QgsVectorTileRawData QgsXyzVectorTileDataProviderBase::readTile( const QgsTileMatrixSet &set, const QgsTileXYZ &id, QgsFeedback *feedback ) const
{
return loadFromNetwork( id, set.tileMatrix( id.zoomLevel() ), sourcePath(), mAuthCfg, mHeaders, feedback );
return QgsVectorTileRawData( id, loadFromNetwork( id, set.tileMatrix( id.zoomLevel() ), sourcePath(), mAuthCfg, mHeaders, feedback ) );
}

QList<QgsVectorTileRawData> QgsXyzVectorTileDataProviderBase::readTiles( const QgsTileMatrixSet &set, const QVector<QgsTileXYZ> &tiles, QgsFeedback *feedback ) const
Expand Down
2 changes: 1 addition & 1 deletion src/core/vectortile/qgsxyzvectortiledataprovider.h
View file
Expand Up @@ -42,7 +42,7 @@ class CORE_EXPORT QgsXyzVectorTileDataProviderBase : public QgsVectorTileDataPro
QgsXyzVectorTileDataProviderBase &operator=( const QgsXyzVectorTileDataProviderBase &other ) = delete;

bool supportsAsync() const override;
QByteArray readTile( const QgsTileMatrixSet &tileMatrix, const QgsTileXYZ &id, QgsFeedback *feedback = nullptr ) const override;
QgsVectorTileRawData readTile( const QgsTileMatrixSet &tileMatrix, const QgsTileXYZ &id, QgsFeedback *feedback = nullptr ) const override;
QList<QgsVectorTileRawData> readTiles( const QgsTileMatrixSet &, const QVector<QgsTileXYZ> &tiles, QgsFeedback *feedback = nullptr ) const override;
QNetworkRequest tileRequest( const QgsTileMatrixSet &tileMatrix, const QgsTileXYZ &id, Qgis::RendererUsage usage ) const override;

Expand Down
5 changes: 3 additions & 2 deletions src/gui/qgsmaptoolidentify.cpp
View file
Expand Up @@ -35,6 +35,7 @@
#include "qgsvectorlayer.h"
#include "qgsvectorlayertemporalproperties.h"
#include "qgsvectortilelayer.h"
#include "qgsvectortileloader.h"
#include "qgsvectortilemvtdecoder.h"
#include "qgsvectortileutils.h"
#include "qgsproject.h"
Expand Down Expand Up @@ -450,8 +451,8 @@ bool QgsMapToolIdentify::identifyVectorTileLayer( QList<QgsMapToolIdentify::Iden

for ( const QgsTileXYZ &tileID : tiles )
{
QByteArray data = layer->getRawTile( tileID );
if ( data.isEmpty() )
const QgsVectorTileRawData data = layer->getRawTile( tileID );
if ( data.data.isEmpty() )
continue; // failed to get data

QgsVectorTileMVTDecoder decoder( layer->tileMatrixSet() );
Expand Down
9 changes: 5 additions & 4 deletions tests/src/core/testqgsvectortilelayer.cpp
View file
Expand Up @@ -36,6 +36,7 @@
#include "qgsproviderregistry.h"
#include "qgsprovidersublayerdetails.h"
#include "qgsproviderutils.h"
#include "qgsvectortileloader.h"

/**
* \ingroup UnitTests
Expand Down Expand Up @@ -129,11 +130,11 @@ void TestQgsVectorTileLayer::cleanupTestCase()
void TestQgsVectorTileLayer::test_basic()
{
// tile fetch test
const QByteArray tile0rawData = mLayer->getRawTile( QgsTileXYZ( 0, 0, 0 ) );
QCOMPARE( tile0rawData.length(), 64822 );
const QgsVectorTileRawData tile0rawData = mLayer->getRawTile( QgsTileXYZ( 0, 0, 0 ) );
QCOMPARE( tile0rawData.data.length(), 64822 );

const QByteArray invalidTileRawData = mLayer->getRawTile( QgsTileXYZ( 0, 0, 99 ) );
QCOMPARE( invalidTileRawData.length(), 0 );
const QgsVectorTileRawData invalidTileRawData = mLayer->getRawTile( QgsTileXYZ( 0, 0, 99 ) );
QCOMPARE( invalidTileRawData.data.length(), 0 );

// an xyz vector tile layer should be considered as a basemap layer
QCOMPARE( mLayer->properties(), Qgis::MapLayerProperties( Qgis::MapLayerProperty::IsBasemapLayer ) );
Expand Down
21 changes: 11 additions & 10 deletions tests/src/core/testqgsvectortilewriter.cpp
View file
Expand Up @@ -23,6 +23,7 @@
#include "qgsproject.h"
#include "qgstiles.h"
#include "qgsvectorlayer.h"
#include "qgsvectortileloader.h"
#include "qgsvectortilemvtdecoder.h"
#include "qgsvectortilelayer.h"
#include "qgsvectortilewriter.h"
Expand Down Expand Up @@ -114,9 +115,9 @@ void TestQgsVectorTileWriter::test_basic()

QgsVectorTileLayer *vtLayer = new QgsVectorTileLayer( ds.encodedUri(), "output" );

const QByteArray tile0 = vtLayer->getRawTile( QgsTileXYZ( 0, 0, 0 ) );
const QgsVectorTileRawData tile0 = vtLayer->getRawTile( QgsTileXYZ( 0, 0, 0 ) );
QgsVectorTileMVTDecoder decoder( QgsVectorTileMatrixSet::fromWebMercator() );
const bool resDecode0 = decoder.decode( QgsTileXYZ( 0, 0, 0 ), tile0 );
const bool resDecode0 = decoder.decode( QgsTileXYZ( 0, 0, 0 ), tile0.data );
QVERIFY( resDecode0 );
const QStringList layerNames = decoder.layers();
QCOMPARE( layerNames, QStringList() << "points" << "lines" << "polys" );
Expand Down Expand Up @@ -183,9 +184,9 @@ void TestQgsVectorTileWriter::test_mbtiles()

QgsVectorTileLayer *vtLayer = new QgsVectorTileLayer( ds.encodedUri(), "output" );

const QByteArray tile0 = vtLayer->getRawTile( QgsTileXYZ( 0, 0, 0 ) );
const QgsVectorTileRawData tile0 = vtLayer->getRawTile( QgsTileXYZ( 0, 0, 0 ) );
QgsVectorTileMVTDecoder decoder( QgsVectorTileMatrixSet::fromWebMercator() );
const bool resDecode0 = decoder.decode( QgsTileXYZ( 0, 0, 0 ), tile0 );
const bool resDecode0 = decoder.decode( QgsTileXYZ( 0, 0, 0 ), tile0.data );
QVERIFY( resDecode0 );
const QStringList layerNames = decoder.layers();
QCOMPARE( layerNames, QStringList() << "points" << "lines" << "polys" );
Expand Down Expand Up @@ -299,9 +300,9 @@ void TestQgsVectorTileWriter::test_filtering()

QgsVectorTileLayer *vtLayer = new QgsVectorTileLayer( ds.encodedUri(), "output" );

const QByteArray tile0 = vtLayer->getRawTile( QgsTileXYZ( 0, 0, 0 ) );
const QgsVectorTileRawData tile0 = vtLayer->getRawTile( QgsTileXYZ( 0, 0, 0 ) );
QgsVectorTileMVTDecoder decoder( QgsVectorTileMatrixSet::fromWebMercator() );
const bool resDecode0 = decoder.decode( QgsTileXYZ( 0, 0, 0 ), tile0 );
const bool resDecode0 = decoder.decode( QgsTileXYZ( 0, 0, 0 ), tile0.data );
QVERIFY( resDecode0 );
const QStringList layerNames = decoder.layers();
QCOMPARE( layerNames, QStringList() << "b52" << "lines" );
Expand Down Expand Up @@ -362,9 +363,9 @@ void TestQgsVectorTileWriter::test_z0TileMatrix3857()

QgsVectorTileLayer *vtLayer = new QgsVectorTileLayer( ds.encodedUri(), "output" );

const QByteArray tile0 = vtLayer->getRawTile( QgsTileXYZ( 0, 0, 0 ) );
const QgsVectorTileRawData tile0 = vtLayer->getRawTile( QgsTileXYZ( 0, 0, 0 ) );
QgsVectorTileMVTDecoder decoder( QgsVectorTileMatrixSet::fromWebMercator() );
const bool resDecode0 = decoder.decode( QgsTileXYZ( 0, 0, 0 ), tile0 );
const bool resDecode0 = decoder.decode( QgsTileXYZ( 0, 0, 0 ), tile0.data );
QVERIFY( resDecode0 );
const QStringList layerNames = decoder.layers();
QCOMPARE( layerNames, QStringList() << "points" << "lines" << "polys" );
Expand Down Expand Up @@ -448,9 +449,9 @@ void TestQgsVectorTileWriter::test_z0TileMatrix2154()

QgsVectorTileLayer *vtLayer = new QgsVectorTileLayer( ds.encodedUri(), "output" );

const QByteArray tile0 = vtLayer->getRawTile( QgsTileXYZ( 0, 0, 0 ) );
const QgsVectorTileRawData tile0 = vtLayer->getRawTile( QgsTileXYZ( 0, 0, 0 ) );
QgsVectorTileMVTDecoder decoder( QgsVectorTileMatrixSet::fromWebMercator() );
const bool resDecode0 = decoder.decode( QgsTileXYZ( 0, 0, 0 ), tile0 );
const bool resDecode0 = decoder.decode( QgsTileXYZ( 0, 0, 0 ), tile0.data );
QVERIFY( resDecode0 );
const QStringList layerNames = decoder.layers();
QCOMPARE( layerNames, QStringList() << "points" << "lines" << "polys" );
Expand Down

0 comments on commit a96c5a8

Please sign in to comment.