Merge remote-tracking branch 'gerrit/5.7' into dev

Change-Id: I6a1a72547077c628429ee9a0781070ad3ae787f1

1 files changed, 14 insertions, 0 deletions

diff --git a/src/location/maps/qgeotiledmap.cpp b/src/location/maps/qgeotiledmap.cpp
index ac02afa8..f59417f7 100644
--- a/src/location/maps/qgeotiledmap.cpp
+++ b/src/location/maps/qgeotiledmap.cpp
@@ -194,6 +194,20 @@ double QGeoTiledMap::maximumCenterLatitudeAtZoom(double zoomLevel) const
     return topMost.latitude();
 }
 
+QDoubleVector2D QGeoTiledMap::referenceCoordinateToItemPosition(const QGeoCoordinate &coordinate) const
+{
+    Q_D(const QGeoTiledMap);
+    QDoubleVector2D point = QGeoProjection::coordToMercator(coordinate);
+    return point * std::pow(2.0, d->m_cameraData.zoomLevel()) * d->m_visibleTiles->tileSize();
+}
+
+QGeoCoordinate QGeoTiledMap::referenceItemPositionToCoordinate(const QDoubleVector2D &pos) const
+{
+    Q_D(const QGeoTiledMap);
+    QDoubleVector2D point = pos / (std::pow(2.0, d->m_cameraData.zoomLevel()) * d->m_visibleTiles->tileSize());
+    return QGeoProjection::mercatorToCoord(point);
+}
+
 QGeoTiledMapPrivate::QGeoTiledMapPrivate(QGeoTiledMappingManagerEngine *engine)
     : QGeoMapPrivate(engine),
       m_cache(engine->tileCache()),