sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-01 00:46:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

[wms] Do not pass null QStrings to QgsWmsProvider::setQueryItem

Browse Source 
Fix #20271 - WMS is not displayed in QGIS 3.4.0

With test
This commit is contained in:
Alessandro Pasotti 2018-10-31 10:06:47 +01:00
parent 2f1dec9824
commit 94aa628e3e
3 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/providers/wms/qgswmsprovider.cpp
View File

@ -482,7 +482,10 @@ bool QgsWmsProvider::setImageCrs( QString const &crs )
void QgsWmsProvider::setQueryItem( QUrl &url, const QString &item, const QString &value )
{
url.removeQueryItem( item );
url.addQueryItem( item, value );
if ( value.isNull() )
url.addQueryItem( item, QStringLiteral( "" ) );
else
url.addQueryItem( item, value );
}
void QgsWmsProvider::setFormatQueryItem( QUrl &url )

3
src/providers/wms/qgswmsprovider.h
View File

@ -461,6 +461,9 @@ class QgsWmsProvider : public QgsRasterDataProvider
//! User's settings (URI, authorization, layer, style, ...)
QgsWmsSettings mSettings;
friend class TestQgsWmsProvider;
};

11
tests/src/providers/testqgswmsprovider.cpp
View File

@ -76,6 +76,17 @@ class TestQgsWmsProvider: public QObject
QCOMPARE( provider.getLegendGraphicUrl(), QString( "http://localhost:8380/mapserv?" ) );
}
// regression #20271 - WMS is not displayed in QGIS 3.4.0
void queryItemsWithNullValue()
{
QString failingAddress( "http://localhost:8380/mapserv" );
QgsWmsProvider provider( failingAddress, QgsDataProvider::ProviderOptions(), mCapabilities );
QUrl url( provider.createRequestUrlWMS( QgsRectangle( 0, 0, 90, 90 ), 100, 100 ) );
QCOMPARE( url.toString(), QString( "http://localhost:8380/mapserv?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap"
"&BBOX=0,0,90,90&CRS=CRS:84&WIDTH=100&HEIGHT=100&LAYERS=&"
"STYLES=&FORMAT=&TRANSPARENT=TRUE" ) );
}
private:
QgsWmsCapabilities *mCapabilities = nullptr;
};