From 5f76427ba42589112dd6799eca375674fff4ab96 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Martin=20T=C5=AFma?= <tumic@cbox.cz>
Date: Mon, 25 Dec 2023 10:49:50 +0100
Subject: [PATCH] Code cleanup

---
 src/map/onlinemap.cpp | 19 ++++++++++++-------
 src/map/onlinemap.h   |  4 +++-
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/map/onlinemap.cpp b/src/map/onlinemap.cpp
index 440bdf2d..07ed3092 100644
--- a/src/map/onlinemap.cpp
+++ b/src/map/onlinemap.cpp
@@ -118,11 +118,18 @@ qreal OnlineMap::tileSize() const
 	return (_tileSize / coordinatesRatio());
 }
 
-QPoint OnlineMap::tileCoordinates(int x, int y, int zoom)
+QPoint OnlineMap::tileCoordinates(int x, int y, int zoom) const
 {
 	return QPoint(x, _invertY ? (1<<zoom) - y - 1 : y);
 }
 
+QPointF OnlineMap::tilePos(const QPointF &tl, const QPoint &tc,
+  const QPoint &tile, unsigned overzoom) const
+{
+	return QPointF(tl.x() + ((tc.x() - tile.x()) << overzoom) * tileSize(),
+	  tl.y() + ((tc.y() - tile.y()) << overzoom) * tileSize());
+}
+
 bool OnlineMap::isRunning(const QString &key) const
 {
 	for (int i = 0; i < _jobs.size(); i++) {
@@ -174,14 +181,14 @@ void OnlineMap::draw(QPainter *painter, const QRectF &rect, Flags flags)
 {
 	int baseZoom = qMin(_baseZoom, _zoom);
 	unsigned overzoom = _zoom - baseZoom;
-	unsigned f = 1U<<overzoom;
 
-	qreal scale = OSM::zoom2scale(baseZoom, _tileSize * f);
+	qreal scale = OSM::zoom2scale(baseZoom, _tileSize << overzoom);
 	QPoint tile = OSM::mercator2tile(QPointF(rect.topLeft().x() * scale,
 	  -rect.topLeft().y() * scale) * coordinatesRatio(), baseZoom);
 	Coordinates ctl(OSM::tile2ll(tile, baseZoom));
 	QPointF tl(ll2xy(Coordinates(ctl.lon(), -ctl.lat())));
 	QSizeF s(rect.right() - tl.x(), rect.bottom() - tl.y());
+	unsigned f = 1U<<overzoom;
 	int width = ceil(s.width() / (tileSize() * f));
 	int height = ceil(s.height() / (tileSize() * f));
 
@@ -213,8 +220,7 @@ void OnlineMap::draw(QPainter *painter, const QRectF &rect, Flags flags)
 		QPixmap pm;
 		if (QPixmapCache::find(key, &pm)) {
 			QPoint tc(tileCoordinates(t.xy().x(), t.xy().y(), baseZoom));
-			QPointF tp(tl.x() + (tc.x() - tile.x()) * tileSize() * f,
-			  tl.y() + (tc.y() - tile.y()) * tileSize() * f);
+			QPointF tp(tilePos(tl, tc, tile, overzoom));
 			drawTile(painter, pm, tp);
 		} else
 			renderTiles.append(OnlineMapTile(t.xy(), t.file(), _zoom, overzoom,
@@ -236,8 +242,7 @@ void OnlineMap::draw(QPainter *painter, const QRectF &rect, Flags flags)
 				QPixmapCache::insert(mt.key(), pm);
 
 				QPoint tc(tileCoordinates(mt.xy().x(), mt.xy().y(), baseZoom));
-				QPointF tp(tl.x() + (tc.x() - tile.x()) * tileSize() * f,
-				  tl.y() + (tc.y() - tile.y()) * tileSize() * f);
+				QPointF tp(tilePos(tl, tc, tile, overzoom));
 				drawTile(painter, pm, tp);
 			}
 		} else
diff --git a/src/map/onlinemap.h b/src/map/onlinemap.h
index 4ea342c3..a3fca426 100644
--- a/src/map/onlinemap.h
+++ b/src/map/onlinemap.h
@@ -115,7 +115,9 @@ private:
 	qreal tileSize() const;
 	qreal coordinatesRatio() const;
 	qreal imageRatio() const;
-	QPoint tileCoordinates(int x, int y, int zoom);
+	QPoint tileCoordinates(int x, int y, int zoom) const;
+	QPointF tilePos(const QPointF &tl, const QPoint &tc, const QPoint &tile,
+	  unsigned overzoom) const;
 	void drawTile(QPainter *painter, QPixmap &pixmap, QPointF &tp);
 	bool isRunning(const QString &key) const;
 	void runJob(OnlineMapJob *job);
-- 
2.11.4.GIT