From dba8ff01b82aa8eb0ca2292592f55665b90c3507 Mon Sep 17 00:00:00 2001 From: Paolo Angelelli Date: Thu, 9 Feb 2017 16:16:53 +0100 Subject: Use cameraCapabilities from QGeoMap This patch makes the access to cameraCapabilities consistent throughout qdeclarativegeomap.cpp, whereas previously this was sometimes accessed through the mappingManager. Change-Id: I6948f4c376530162a872798b5df848c48237c4c6 Reviewed-by: Alex Blasche --- src/location/declarativemaps/qdeclarativegeomap.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/location/declarativemaps/qdeclarativegeomap.cpp b/src/location/declarativemaps/qdeclarativegeomap.cpp index b7ec31ca..20e61ed3 100644 --- a/src/location/declarativemaps/qdeclarativegeomap.cpp +++ b/src/location/declarativemaps/qdeclarativegeomap.cpp @@ -655,11 +655,11 @@ void QDeclarativeGeoMap::mappingManagerInitialized() //strict zoom level limit before initialization nothing is done here. //minimum zoom level might be changed to limit gray bundaries //This code assumes that plugins' maximum zoom level will never exceed 30.0 - if (m_mappingManager->cameraCapabilities().maximumZoomLevelAt256() < m_gestureArea->maximumZoomLevel()) - setMaximumZoomLevel(m_mappingManager->cameraCapabilities().maximumZoomLevelAt256()); + if (m_map->cameraCapabilities().maximumZoomLevelAt256() < m_gestureArea->maximumZoomLevel()) + setMaximumZoomLevel(m_map->cameraCapabilities().maximumZoomLevelAt256()); - if (m_mappingManager->cameraCapabilities().minimumZoomLevelAt256() > m_gestureArea->minimumZoomLevel()) - setMinimumZoomLevel(m_mappingManager->cameraCapabilities().minimumZoomLevelAt256()); + if (m_map->cameraCapabilities().minimumZoomLevelAt256() > m_gestureArea->minimumZoomLevel()) + setMinimumZoomLevel(m_map->cameraCapabilities().minimumZoomLevelAt256()); // Map tiles are built in this call. m_map->minimumZoom() becomes operational -- cgit v1.2.1