root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2025-07-16 11:54:23 +02:00
Code Issues Projects Releases Activity

Now using a strict horizontal map scale

Browse Source 
Code cleanup
This commit is contained in:
Martin Tůma
2018-06-30 12:14:58 +02:00
parent 201256d882
commit a432ff3461
17 changed files with 34 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/map/jnxmap.cpp
View File

@ -2,7 +2,6 @@
#include <QPainter>
#include <QFileInfo>
#include <QPixmapCache>
#include "transform.h"
#include "rectd.h"
#include "jnxmap.h"
@ -146,13 +145,13 @@ JNXMap::JNXMap(const QString &fileName, QObject *parent)
_valid = true;
}
QPointF JNXMap::ll2xy(const Coordinates &c) const
QPointF JNXMap::ll2xy(const Coordinates &c)
{
const Transform &t = _zooms.at(_zoom).transform;
return t.proj2img(PointD(c.lon(), c.lat()));
}
Coordinates JNXMap::xy2ll(const QPointF &p) const
Coordinates JNXMap::xy2ll(const QPointF &p)
{
const Transform &t = _zooms.at(_zoom).transform;
PointD pp(t.img2proj(p));
@ -168,17 +167,6 @@ QRectF JNXMap::bounds() const
_bounds.bottomRight().lat())));
}
qreal JNXMap::resolution(const QRectF &rect) const
{
Coordinates tl = xy2ll((rect.topLeft()));
Coordinates br = xy2ll(rect.bottomRight());
qreal ds = tl.distanceTo(br);
qreal ps = QLineF(rect.topLeft(), rect.bottomRight()).length();
return ds/ps;
}
int JNXMap::zoomFit(const QSize &size, const RectC &rect)
{
if (!rect.isValid())