From a3bac33bf44023f55582f56bf4f069e550c402b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20T=C5=AFma?= <tumic@cbox.cz>
Date: Sun, 4 Feb 2024 17:42:36 +0100
Subject: [PATCH] Use a more accurate and faster top left xy coordinate
 computation

---
 src/map/aqmmap.cpp      | 4 ++--
 src/map/gemfmap.cpp     | 4 ++--
 src/map/mbtilesmap.cpp  | 6 +++---
 src/map/onlinemap.cpp   | 4 ++--
 src/map/osmdroidmap.cpp | 4 ++--
 src/map/sqlitemap.cpp   | 4 ++--
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/map/aqmmap.cpp b/src/map/aqmmap.cpp
index b2235a8a..bc00b658 100644
--- a/src/map/aqmmap.cpp
+++ b/src/map/aqmmap.cpp
@@ -348,8 +348,8 @@ void AQMMap::draw(QPainter *painter, const QRectF &rect, Flags flags)
 	qreal scale = OSM::zoom2scale(z.zoom, z.tileSize);
 	QPoint tile = OSM::mercator2tile(QPointF(rect.topLeft().x() * scale,
 	  -rect.topLeft().y() * scale) * _mapRatio, z.zoom);
-	Coordinates ctl(OSM::tile2ll(tile, z.zoom));
-	QPointF tl(ll2xy(Coordinates(ctl.lon(), -ctl.lat())));
+	QPointF tlm(OSM::tile2mercator(tile, z.zoom));
+	QPointF tl(QPointF(tlm.x() / scale, tlm.y() / scale) / _mapRatio);
 	QSizeF s(rect.right() - tl.x(), rect.bottom() - tl.y());
 	int width = ceil(s.width() / tileSize());
 	int height = ceil(s.height() / tileSize());
diff --git a/src/map/gemfmap.cpp b/src/map/gemfmap.cpp
index 3b711a2b..91797df3 100644
--- a/src/map/gemfmap.cpp
+++ b/src/map/gemfmap.cpp
@@ -245,8 +245,8 @@ void GEMFMap::draw(QPainter *painter, const QRectF &rect, Flags flags)
 	qreal scale = OSM::zoom2scale(z.level, _tileSize);
 	QPoint tile = OSM::mercator2tile(QPointF(rect.topLeft().x() * scale,
 	  -rect.topLeft().y() * scale) * _mapRatio, z.level);
-	Coordinates ctl(OSM::tile2ll(tile, z.level));
-	QPointF tl(ll2xy(Coordinates(ctl.lon(), -ctl.lat())));
+	QPointF tlm(OSM::tile2mercator(tile, z.level));
+	QPointF tl(QPointF(tlm.x() / scale, tlm.y() / scale) / _mapRatio);
 	QSizeF s(rect.right() - tl.x(), rect.bottom() - tl.y());
 	int width = ceil(s.width() / tileSize());
 	int height = ceil(s.height() / tileSize());
diff --git a/src/map/mbtilesmap.cpp b/src/map/mbtilesmap.cpp
index cb9e467f..5dabf729 100644
--- a/src/map/mbtilesmap.cpp
+++ b/src/map/mbtilesmap.cpp
@@ -393,13 +393,13 @@ void MBTilesMap::draw(QPainter *painter, const QRectF &rect, Flags flags)
 {
 	const Zoom &zoom = _zooms.at(_zi);
 	unsigned overzoom = zoom.z - zoom.base;
-	unsigned f = 1U<<overzoom;
 	qreal scale = OSM::zoom2scale(zoom.base, _tileSize << overzoom);
 	QPoint tile = OSM::mercator2tile(QPointF(rect.topLeft().x() * scale,
 	  -rect.topLeft().y() * scale) * coordinatesRatio(), zoom.base);
-	Coordinates ctl(OSM::tile2ll(tile, zoom.base));
-	QPointF tl(ll2xy(Coordinates(ctl.lon(), -ctl.lat())));
+	QPointF tlm(OSM::tile2mercator(tile, zoom.base));
+	QPointF tl(QPointF(tlm.x() / scale, tlm.y() / scale) / coordinatesRatio());
 	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));
 
diff --git a/src/map/onlinemap.cpp b/src/map/onlinemap.cpp
index 07ed3092..3f8557e5 100644
--- a/src/map/onlinemap.cpp
+++ b/src/map/onlinemap.cpp
@@ -185,8 +185,8 @@ void OnlineMap::draw(QPainter *painter, const QRectF &rect, Flags flags)
 	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())));
+	QPointF tlm(OSM::tile2mercator(tile, baseZoom));
+	QPointF tl(QPointF(tlm.x() / scale, tlm.y() / scale) / coordinatesRatio());
 	QSizeF s(rect.right() - tl.x(), rect.bottom() - tl.y());
 	unsigned f = 1U<<overzoom;
 	int width = ceil(s.width() / (tileSize() * f));
diff --git a/src/map/osmdroidmap.cpp b/src/map/osmdroidmap.cpp
index 8d21a115..a967e9f0 100644
--- a/src/map/osmdroidmap.cpp
+++ b/src/map/osmdroidmap.cpp
@@ -240,8 +240,8 @@ void OsmdroidMap::draw(QPainter *painter, const QRectF &rect, Flags flags)
 	qreal scale = OSM::zoom2scale(_zoom, _tileSize);
 	QPoint tile = OSM::mercator2tile(QPointF(rect.topLeft().x() * scale,
 	  -rect.topLeft().y() * scale) * _mapRatio, _zoom);
-	Coordinates ctl(OSM::tile2ll(tile, _zoom));
-	QPointF tl(ll2xy(Coordinates(ctl.lon(), -ctl.lat())));
+	QPointF tlm(OSM::tile2mercator(tile, _zoom));
+	QPointF tl(QPointF(tlm.x() / scale, tlm.y() / scale) / _mapRatio);
 	QSizeF s(rect.right() - tl.x(), rect.bottom() - tl.y());
 	int width = ceil(s.width() / tileSize());
 	int height = ceil(s.height() / tileSize());
diff --git a/src/map/sqlitemap.cpp b/src/map/sqlitemap.cpp
index 29d4e8aa..455d25d4 100644
--- a/src/map/sqlitemap.cpp
+++ b/src/map/sqlitemap.cpp
@@ -187,8 +187,8 @@ void SqliteMap::draw(QPainter *painter, const QRectF &rect, Flags flags)
 	qreal scale = OSM::zoom2scale(_zoom, _tileSize);
 	QPoint tile = OSM::mercator2tile(QPointF(rect.topLeft().x() * scale,
 	  -rect.topLeft().y() * scale) * _mapRatio, _zoom);
-	Coordinates ctl(OSM::tile2ll(tile, _zoom));
-	QPointF tl(ll2xy(Coordinates(ctl.lon(), -ctl.lat())));
+	QPointF tlm(OSM::tile2mercator(tile, _zoom));
+	QPointF tl(QPointF(tlm.x() / scale, tlm.y() / scale) / _mapRatio);
 	QSizeF s(rect.right() - tl.x(), rect.bottom() - tl.y());
 	int width = ceil(s.width() / tileSize());
 	int height = ceil(s.height() / tileSize());