From ae2329252e84a4931b321cacf529a13a3f06a0d5 Mon Sep 17 00:00:00 2001
From: Paolo Angelelli <paolo.angelelli@qt.io>
Date: Fri, 7 Apr 2017 11:23:55 +0200
Subject: Bound check QGeoTileSpec against min/max ZL before requesting it

Until now we have not honored the min/max zoom levels specified
in QGeoCameraCapabilities when requesting tiles.
As a result we have often fired requests for non-existing tile layers.

This change complements the added support for individual camera caps
for each map type, and makes the tile fetcher honor the bounds
defined in the camera capabilities.

This also allows to set larger zoom levels in the renderer, overzooming
existing tiles, without the fetcher firing requests for invalid
resources

Change-Id: Ic8a523a114147109f7ef8af3510a3ab78d06d714
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
---
 tests/auto/geotestplugin/qgeotilefetcher_test.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'tests')

diff --git a/tests/auto/geotestplugin/qgeotilefetcher_test.h b/tests/auto/geotestplugin/qgeotilefetcher_test.h
index a25b0119..e108f484 100644
--- a/tests/auto/geotestplugin/qgeotilefetcher_test.h
+++ b/tests/auto/geotestplugin/qgeotilefetcher_test.h
@@ -32,6 +32,7 @@
 #include <QtLocation/private/qgeotiledmapreply_p.h>
 #include <QtLocation/private/qgeotilefetcher_p.h>
 #include <QtLocation/private/qgeotilespec_p.h>
+#include <QtLocation/private/qgeomappingmanagerengine_p.h>
 
 #include <QLocale>
 #include <QPainter>
@@ -65,7 +66,7 @@ class QGeoTileFetcherTest: public QGeoTileFetcher
 {
     Q_OBJECT
 public:
-    QGeoTileFetcherTest(QObject *parent = 0)
+    QGeoTileFetcherTest(QGeoMappingManagerEngine *parent)
     :    QGeoTileFetcher(parent), finishRequestImmediately_(false), errorCode_(QGeoTiledMapReply::NoError)
     {
     }
-- 
cgit v1.2.1