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

[OAPIF provider] If the server provide only a default limit, and no maximum, use the max of 1000 and the default for the page size

Browse Source
This commit is contained in:
Even Rouault 2019-10-17 01:52:39 +02:00 committed by Nyall Dawson
parent 4485ea38b4
commit 6aa4fadd59
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/providers/wfs/qgsoapifprovider.cpp
View File

@ -119,7 +119,7 @@ bool QgsOapifProvider::init()
mShared->mPageSize = std::min( std::max( 1000, apiRequest.defaultLimit() ), apiRequest.maxLimit() );
}
else if ( apiRequest.defaultLimit() > 0 )
mShared->mPageSize = apiRequest.defaultLimit();
mShared->mPageSize = std::max( 1000, apiRequest.defaultLimit() );
else if ( apiRequest.maxLimit() > 0 )
mShared->mPageSize = apiRequest.maxLimit();
else

2
src/providers/wfs/qgswfsnewconnection.cpp
View File

@ -206,7 +206,7 @@ void QgsWFSNewConnection::oapifApiReplyFinished()
if ( mOAPIFApi->defaultLimit() > 0 && mOAPIFApi->maxLimit() > 0 )
wfsPageSizeLineEdit()->setText( QString::number( std::min( std::max( 1000, mOAPIFApi->defaultLimit() ), mOAPIFApi->maxLimit() ) ) );
else if ( mOAPIFApi->defaultLimit() > 0 )
wfsPageSizeLineEdit()->setText( QString::number( mOAPIFApi->defaultLimit() ) );
wfsPageSizeLineEdit()->setText( QString::number( std::max( 1000, mOAPIFApi->defaultLimit() ) ) );
else if ( mOAPIFApi->maxLimit() > 0 )
wfsPageSizeLineEdit()->setText( QString::number( mOAPIFApi->maxLimit() ) );