sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #43990 from Joonalai/fix-oapif-q-params

Browse Source 
[OAPIF provider] Fix extra query parameters (fixes #43905)
This commit is contained in:
Even Rouault 2021-07-01 16:59:14 +02:00 committed by GitHub
commit 3f1722d0bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -690,10 +690,9 @@ void QgsOapifFeatureDownloaderImpl::run( bool serializeFeatures, long long maxFe
}
}
url = mShared->appendExtraQueryParameters( url );
while ( !url.isEmpty() )
{
url = mShared->appendExtraQueryParameters( url );
if ( maxTotalFeatures > 0 && totalDownloadedFeatureCount >= maxTotalFeatures )
{
@ -721,7 +720,6 @@ void QgsOapifFeatureDownloaderImpl::run( bool serializeFeatures, long long maxFe
break;
}
url = itemsRequest.nextUrl();
url = mShared->appendExtraQueryParameters( url );
// Consider if we should display a progress dialog
// We can only do that if we know how many features will be downloaded

10
tests/src/python/test_provider_oapif.py
View File

@ -20,6 +20,7 @@ import tempfile
from osgeo import gdal
from qgis.PyQt.QtCore import QCoreApplication, Qt, QObject, QDateTime, QVariant
from qgis.PyQt.QtTest import QSignalSpy
from qgis.core import (
QgsWkbTypes,
@ -36,7 +37,8 @@ from qgis.core import (
QgsExpressionContextUtils,
QgsExpressionContext,
QgsCoordinateReferenceSystem,
QgsBox3d
QgsBox3d,
QgsMessageLog
)
from qgis.testing import (start_app,
unittest
@ -702,10 +704,16 @@ class TestPyQgsOapifProvider(unittest.TestCase, ProviderTestCase):
with open(sanitize(endpoint, '/collections/mycollection/items?limit=1000&apikey=mykey&' + ACCEPT_ITEMS), 'wb') as f:
f.write(json.dumps(first_items).encode('UTF-8'))
app_log = QgsApplication.messageLog()
# signals should be emitted by application log
app_spy = QSignalSpy(app_log.messageReceived)
vl = QgsVectorLayer("url='http://" + endpoint + "?apikey=mykey' typename='mycollection'", 'test', 'OAPIF')
self.assertTrue(vl.isValid())
values = [f['id'] for f in vl.getFeatures()]
self.assertEqual(values, ['feat.1'])
self.assertEqual(len(app_spy), 0, list(app_spy))
if __name__ == '__main__':