From 04f945708526dc1fd603676917e96e8e82920c78 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Martin=20T=C5=AFma?= Date: Sat, 18 Nov 2023 21:32:30 +0100 Subject: [PATCH] Fixed bounds limiting --- src/map/onlinemap.cpp | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/src/map/onlinemap.cpp b/src/map/onlinemap.cpp index 9723d564..7b5dce7e 100644 --- a/src/map/onlinemap.cpp +++ b/src/map/onlinemap.cpp @@ -1,4 +1,3 @@ -#include #include #include #include "common/rectc.h" @@ -101,15 +100,11 @@ qreal OnlineMap::tileSize() const void OnlineMap::draw(QPainter *painter, const QRectF &rect, Flags flags) { qreal scale = OSM::zoom2scale(_zoom, _tileSize); - QRectF b(bounds()); - QPoint tile = OSM::mercator2tile(QPointF(rect.topLeft().x() * scale, -rect.topLeft().y() * scale) * coordinatesRatio(), _zoom); - QPointF tl(floor(rect.left() / tileSize()) - * tileSize(), floor(rect.top() / tileSize()) * tileSize()); - - QSizeF s(qMin(rect.right() - tl.x(), b.width()), - qMin(rect.bottom() - tl.y(), b.height())); + Coordinates ctl(OSM::tile2ll(tile, _zoom)); + QPointF tl(ll2xy(Coordinates(ctl.lon(), -ctl.lat()))); + QSizeF s(rect.right() - tl.x(), rect.bottom() - tl.y()); int width = ceil(s.width() / tileSize()); int height = ceil(s.height() / tileSize()); @@ -127,9 +122,10 @@ void OnlineMap::draw(QPainter *painter, const QRectF &rect, Flags flags) for (int i = 0; i < tiles.count(); i++) { FetchTile &t = tiles[i]; - QPointF tp(qMax(tl.x(), b.left()) + (t.xy().x() - tile.x()) * tileSize(), - qMax(tl.y(), b.top()) + ((_invertY ? (1<<_zoom) - t.xy().y() - 1 : - t.xy().y()) - tile.y()) * tileSize()); + QPointF tp(tl.x() + (t.xy().x() - tile.x()) * tileSize(), + tl.y() + ((_invertY + ? (1<<_zoom) - t.xy().y() - 1 + : t.xy().y()) - tile.y()) * tileSize()); if (!t.pixmap().isNull()) { t.pixmap().setDevicePixelRatio(imageRatio()); -- 2.11.4.GIT