From 6aa4fadd598aad7ee41b2f762d3edef7e5f5f38f Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Thu, 17 Oct 2019 01:52:39 +0200 Subject: [PATCH] [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 --- src/providers/wfs/qgsoapifprovider.cpp | 2 +- src/providers/wfs/qgswfsnewconnection.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/providers/wfs/qgsoapifprovider.cpp b/src/providers/wfs/qgsoapifprovider.cpp index 61cea16455e..0a1552fae80 100644 --- a/src/providers/wfs/qgsoapifprovider.cpp +++ b/src/providers/wfs/qgsoapifprovider.cpp @@ -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 diff --git a/src/providers/wfs/qgswfsnewconnection.cpp b/src/providers/wfs/qgswfsnewconnection.cpp index b5d6b6ae901..fddb7cccde6 100644 --- a/src/providers/wfs/qgswfsnewconnection.cpp +++ b/src/providers/wfs/qgswfsnewconnection.cpp @@ -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() ) );