Skip to content

Commit 1a2ff54

Browse files
wrassnyalldawson
authored andcommitted
Amend sprite retrieval (#43925)
Update url path with resolution and extension rather than appending to string
1 parent 7821292 commit 1a2ff54

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

src/core/vectortile/qgsvectortilelayer.cpp

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,10 @@ bool QgsVectorTileLayer::loadDefaultStyle( QString &error, QStringList &warnings
424424

425425
for ( int resolution = 2; resolution > 0; resolution-- )
426426
{
427-
QNetworkRequest request = QNetworkRequest( QUrl( spriteUriBase + QStringLiteral( "%1.json" ).arg( resolution > 1 ? QStringLiteral( "@%1x" ).arg( resolution ) : QString() ) ) );
427+
QUrl spriteUrl = QUrl( spriteUriBase );
428+
spriteUrl.setPath( spriteUrl.path() + QStringLiteral( "%1.json" ).arg( resolution > 1 ? QStringLiteral( "@%1x" ).arg( resolution ) : QString() ) );
429+
QNetworkRequest request = QNetworkRequest( spriteUrl );
430+
428431
QgsSetRequestInitiatorClass( request, QStringLiteral( "QgsVectorTileLayer" ) )
429432
QgsBlockingNetworkRequest networkRequest;
430433
switch ( networkRequest.get( request ) )
@@ -435,10 +438,11 @@ bool QgsVectorTileLayer::loadDefaultStyle( QString &error, QStringList &warnings
435438
const QVariantMap spriteDefinition = QgsJsonUtils::parseJson( content.content() ).toMap();
436439

437440
// retrieve sprite images
438-
QNetworkRequest request = QNetworkRequest( QUrl( spriteUriBase + QStringLiteral( "%1.png" ).arg( resolution > 1 ? QStringLiteral( "@%1x" ).arg( resolution ) : QString() ) ) );
439-
441+
QUrl spriteUrl = QUrl( spriteUriBase );
442+
spriteUrl.setPath( spriteUrl.path() + QStringLiteral( "%1.png" ).arg( resolution > 1 ? QStringLiteral( "@%1x" ).arg( resolution ) : QString() ) );
443+
QNetworkRequest request = QNetworkRequest( spriteUrl );
444+
440445
QgsSetRequestInitiatorClass( request, QStringLiteral( "QgsVectorTileLayer" ) )
441-
442446
QgsBlockingNetworkRequest networkRequest;
443447
switch ( networkRequest.get( request ) )
444448
{

0 commit comments

Comments
 (0)