"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/providers/wms/qgswmsprovider.cpp" between
QGIS-final-3_14_15.tar.gz and QGIS-final-3_14_16.tar.gz

About: QGIS (Quantum GIS) is a Geographic Information System that supports vector, raster, and database formats. Latest release (3.14.x series).

qgswmsprovider.cpp  (QGIS-final-3_14_15):qgswmsprovider.cpp  (QGIS-final-3_14_16)
skipping to change at line 689 skipping to change at line 689
image->fill( 0 ); image->fill( 0 );
int maxWidth = mCaps.mCapabilities.service.maxWidth == 0 ? std::numeric_limit s<int>::max() : mCaps.mCapabilities.service.maxWidth; int maxWidth = mCaps.mCapabilities.service.maxWidth == 0 ? std::numeric_limit s<int>::max() : mCaps.mCapabilities.service.maxWidth;
int maxHeight = mCaps.mCapabilities.service.maxHeight == 0 ? std::numeric_limi ts<int>::max() : mCaps.mCapabilities.service.maxHeight; int maxHeight = mCaps.mCapabilities.service.maxHeight == 0 ? std::numeric_limi ts<int>::max() : mCaps.mCapabilities.service.maxHeight;
if ( !mSettings.mTiled && mSettings.mMaxWidth == 0 && mSettings.mMaxHeight == 0 && pixelWidth <= maxWidth && pixelHeight <= maxHeight ) if ( !mSettings.mTiled && mSettings.mMaxWidth == 0 && mSettings.mMaxHeight == 0 && pixelWidth <= maxWidth && pixelHeight <= maxHeight )
{ {
QUrl url = createRequestUrlWMS( viewExtent, pixelWidth, pixelHeight ); QUrl url = createRequestUrlWMS( viewExtent, pixelWidth, pixelHeight );
// cache some details for if the user wants to do an identifyAsHtml() later // cache some details for if the user wants to do an identifyAsHtml() later
emit statusChanged( tr( "Getting map via WMS." ) );
QgsWmsImageDownloadHandler handler( dataSourceUri(), url, mSettings.authoriz ation(), image, feedback ); QgsWmsImageDownloadHandler handler( dataSourceUri(), url, mSettings.authoriz ation(), image, feedback );
handler.downloadBlocking(); handler.downloadBlocking();
} }
else else
{ {
mTileReqNo++; mTileReqNo++;
double vres = viewExtent.width() / pixelWidth; double vres = viewExtent.width() / pixelWidth;
const QgsWmtsTileMatrix *tm = nullptr; const QgsWmtsTileMatrix *tm = nullptr;
skipping to change at line 827 skipping to change at line 824
case XYZ: case XYZ:
createTileRequestsXYZ( tm, tiles, requests ); createTileRequestsXYZ( tm, tiles, requests );
break; break;
default: default:
QgsDebugMsg( QStringLiteral( "unexpected tile mode %1" ).arg( mTileLayer ->tileMode ) ); QgsDebugMsg( QStringLiteral( "unexpected tile mode %1" ).arg( mTileLayer ->tileMode ) );
return image; return image;
} }
emit statusChanged( tr( "Getting tiles." ) );
QList<TileImage> tileImages; // in the correct resolution QList<TileImage> tileImages; // in the correct resolution
QList<QRectF> missing; // rectangles (in map coords) of missing tiles for t his view QList<QRectF> missing; // rectangles (in map coords) of missing tiles for t his view
std::unique_ptr<QgsMbTiles> mbtilesReader; std::unique_ptr<QgsMbTiles> mbtilesReader;
if ( mSettings.mIsMBTiles ) if ( mSettings.mIsMBTiles )
{ {
mbtilesReader.reset( new QgsMbTiles( QUrl( mSettings.mBaseUrl ).path() ) ) ; mbtilesReader.reset( new QgsMbTiles( QUrl( mSettings.mBaseUrl ).path() ) ) ;
mbtilesReader->open(); mbtilesReader->open();
} }
skipping to change at line 3438 skipping to change at line 3433
mIdentifyResultBodies.clear(); mIdentifyResultBodies.clear();
QEventLoop *loop = qobject_cast< QEventLoop *>( sender()->property( "eventLoop " ).value< QObject *>() ); QEventLoop *loop = qobject_cast< QEventLoop *>( sender()->property( "eventLoop " ).value< QObject *>() );
if ( mIdentifyReply->error() == QNetworkReply::NoError ) if ( mIdentifyReply->error() == QNetworkReply::NoError )
{ {
QVariant redirect = mIdentifyReply->attribute( QNetworkRequest::RedirectionT argetAttribute ); QVariant redirect = mIdentifyReply->attribute( QNetworkRequest::RedirectionT argetAttribute );
if ( !redirect.isNull() ) if ( !redirect.isNull() )
{ {
QgsDebugMsgLevel( QStringLiteral( "identify request redirected to %1" ).ar g( redirect.toString() ), 2 ); QgsDebugMsgLevel( QStringLiteral( "identify request redirected to %1" ).ar g( redirect.toString() ), 2 );
emit statusChanged( tr( "identify request redirected." ) );
mIdentifyReply->deleteLater(); mIdentifyReply->deleteLater();
QgsDebugMsgLevel( QStringLiteral( "redirected getfeatureinfo: %1" ).arg( r edirect.toString() ), 2 ); QgsDebugMsgLevel( QStringLiteral( "redirected getfeatureinfo: %1" ).arg( r edirect.toString() ), 2 );
mIdentifyReply = QgsNetworkAccessManager::instance()->get( QNetworkRequest ( redirect.toUrl() ) ); mIdentifyReply = QgsNetworkAccessManager::instance()->get( QNetworkRequest ( redirect.toUrl() ) );
mSettings.authorization().setAuthorizationReply( mIdentifyReply ); mSettings.authorization().setAuthorizationReply( mIdentifyReply );
mIdentifyReply->setProperty( "eventLoop", QVariant::fromValue( qobject_cas t<QObject *>( loop ) ) ); mIdentifyReply->setProperty( "eventLoop", QVariant::fromValue( qobject_cas t<QObject *>( loop ) ) );
connect( mIdentifyReply, &QNetworkReply::finished, this, &QgsWmsProvider:: identifyReplyFinished ); connect( mIdentifyReply, &QNetworkReply::finished, this, &QgsWmsProvider:: identifyReplyFinished );
return; return;
} }
 End of changes. 3 change blocks. 
6 lines changed or deleted 0 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)