root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2025-01-18 19:52:09 +01:00
Code Issues Projects Releases Activity

Code cleanup

Browse Source
This commit is contained in:
Martin Tůma 2021-02-05 21:58:34 +01:00
parent 86c6fa7b03
commit c82e97b1ca
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/map/aqmmap.cpp
View File

@ -100,13 +100,6 @@ static bool parseLevel(const QByteArray &data, int &zoom, int &tileSize,
return true; return true;
} }
static Coordinates tile2ll(const QPoint &p, int z)
{
double n = M_PI - 2.0 * M_PI * p.y() / (double)(1 << z);
return Coordinates(p.x() / (double)(1 << z) * 360.0 - 180,
180.0 / M_PI * atan(0.5 * (exp(n) - exp(-n))));
}
bool AQMMap::readSize(size_t &size) bool AQMMap::readSize(size_t &size)
{ {
@ -200,8 +193,8 @@ bool AQMMap::readHeader()
if (!parseLevel(data, zoom, tileSize, bounds)) if (!parseLevel(data, zoom, tileSize, bounds))
return false; return false;
_bounds = RectC(tile2ll(bounds.topLeft(), zoom), _bounds = RectC(OSM::tile2ll(bounds.topLeft(), zoom),
tile2ll(bounds.bottomRight(), zoom)); OSM::tile2ll(bounds.bottomRight(), zoom));
_zooms.append(Zoom(zoom, tileSize)); _zooms.append(Zoom(zoom, tileSize));
} else if (files.at(i).name == "@LEVEL") { } else if (files.at(i).name == "@LEVEL") {
li = i; li = i;

7
src/map/osm.cpp
View File

@ -21,6 +21,13 @@ QPoint OSM::mercator2tile(const QPointF &m, int zoom)
qFloor((1.0 - (m.y() / 180.0)) / 2.0 * (1<<zoom))); qFloor((1.0 - (m.y() / 180.0)) / 2.0 * (1<<zoom)));
} }
Coordinates OSM::tile2ll(const QPoint &p, int z)
{
double n = M_PI - 2.0 * M_PI * p.y() / (double)(1 << z);
return Coordinates(p.x() / (double)(1 << z) * 360.0 - 180,
180.0 / M_PI * atan(0.5 * (exp(n) - exp(-n))));
}
qreal OSM::zoom2scale(int zoom, int tileSize) qreal OSM::zoom2scale(int zoom, int tileSize)
{ {
return (360.0/(qreal)((1<<zoom) * tileSize)); return (360.0/(qreal)((1<<zoom) * tileSize));

1
src/map/osm.h
View File

@ -15,6 +15,7 @@ namespace OSM
QPointF ll2m(const Coordinates &c); QPointF ll2m(const Coordinates &c);
Coordinates m2ll(const QPointF &p); Coordinates m2ll(const QPointF &p);
QPoint mercator2tile(const QPointF &m, int zoom); QPoint mercator2tile(const QPointF &m, int zoom);
Coordinates tile2ll(const QPoint &p, int z);
qreal zoom2scale(int zoom, int tileSize); qreal zoom2scale(int zoom, int tileSize);
int scale2zoom(qreal scale, int tileSize); int scale2zoom(qreal scale, int tileSize);
qreal resolution(const QPointF &p, int zoom, int tileSize); qreal resolution(const QPointF &p, int zoom, int tileSize);