root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2024-11-28 05:34:47 +01:00
Code Issues Projects Releases Activity

Code cleanup

Browse Source
This commit is contained in:
Martin Tůma 2023-12-25 11:12:52 +01:00
parent 5f76427ba4
commit 9380f31022
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/map/mbtilesmap.cpp
View File

@ -382,12 +382,19 @@ void MBTilesMap::cancelJobs(bool wait)
_jobs.at(i)->cancel(wait); _jobs.at(i)->cancel(wait);
} }
QPointF MBTilesMap::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());
}
void MBTilesMap::draw(QPainter *painter, const QRectF &rect, Flags flags) void MBTilesMap::draw(QPainter *painter, const QRectF &rect, Flags flags)
{ {
const Zoom &zoom = _zooms.at(_zi); const Zoom &zoom = _zooms.at(_zi);
unsigned overzoom = zoom.z - zoom.base; unsigned overzoom = zoom.z - zoom.base;
unsigned f = 1U<<overzoom; unsigned f = 1U<<overzoom;
qreal scale = OSM::zoom2scale(zoom.base, _tileSize * f); qreal scale = OSM::zoom2scale(zoom.base, _tileSize << overzoom);
QPoint tile = OSM::mercator2tile(QPointF(rect.topLeft().x() * scale, QPoint tile = OSM::mercator2tile(QPointF(rect.topLeft().x() * scale,
-rect.topLeft().y() * scale) * coordinatesRatio(), zoom.base); -rect.topLeft().y() * scale) * coordinatesRatio(), zoom.base);
Coordinates ctl(OSM::tile2ll(tile, zoom.base)); Coordinates ctl(OSM::tile2ll(tile, zoom.base));
@ -409,8 +416,7 @@ void MBTilesMap::draw(QPainter *painter, const QRectF &rect, Flags flags)
continue; continue;
if (QPixmapCache::find(key, &pm)) { if (QPixmapCache::find(key, &pm)) {
QPointF tp(tl.x() + (t.x() - tile.x()) * tileSize() * f, QPointF tp(tilePos(tl, t, tile, overzoom));
tl.y() + (t.y() - tile.y()) * tileSize() * f);
drawTile(painter, pm, tp); drawTile(painter, pm, tp);
} else } else
tiles.append(MBTile(zoom.z, overzoom, _scaledSize, t, tiles.append(MBTile(zoom.z, overzoom, _scaledSize, t,
@ -431,8 +437,7 @@ void MBTilesMap::draw(QPainter *painter, const QRectF &rect, Flags flags)
QPixmapCache::insert(mt.key(), pm); QPixmapCache::insert(mt.key(), pm);
QPointF tp(tl.x() + (mt.xy().x() - tile.x()) * tileSize() * f, QPointF tp(tilePos(tl, mt.xy(), tile, overzoom));
tl.y() + (mt.xy().y() - tile.y()) * tileSize() * f);
drawTile(painter, pm, tp); drawTile(painter, pm, tp);
} }
} else } else

2
src/map/mbtilesmap.h
View File

@ -139,6 +139,8 @@ private:
void runJob(MBTilesMapJob *job); void runJob(MBTilesMapJob *job);
void removeJob(MBTilesMapJob *job); void removeJob(MBTilesMapJob *job);
void cancelJobs(bool wait); void cancelJobs(bool wait);
QPointF tilePos(const QPointF &tl, const QPoint &tc, const QPoint &tile,
unsigned overzoom) const;
friend QDebug operator<<(QDebug dbg, const Zoom &zoom); friend QDebug operator<<(QDebug dbg, const Zoom &zoom);