root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2025-07-26 00:14:24 +02:00
Code Issues Projects Releases Activity

Make the source projection of JNX and KMZ maps selectable

Browse Source
This commit is contained in:
Martin Tůma
2020-12-24 16:33:17 +01:00
parent 50d4ca1690
commit dde8e9a22c
13 changed files with 222 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/map/kmzmap.cpp
View File

@ -28,13 +28,15 @@
#define TL(m) ((m).bbox().topLeft())
#define BR(m) ((m).bbox().bottomRight())
KMZMap::Overlay::Overlay(const QString &path, const QSize &size,
const RectC &bbox, double rotation) : _path(path), _bbox(bbox),
_rotation(rotation), _img(0)
const RectC &bbox, double rotation, const Projection *proj)
: _path(path), _size(size), _bbox(bbox), _rotation(rotation), _img(0),
_proj(proj)
{
ReferencePoint tl(PointD(0, 0), PointD(bbox.left(), bbox.top()));
ReferencePoint tl(PointD(0, 0), _proj->ll2xy(bbox.topLeft()));
ReferencePoint br(PointD(size.width(), size.height()),
PointD(bbox.right(), bbox.bottom()));
_proj->ll2xy(bbox.bottomRight()));
QTransform t;
t.rotate(-rotation);
@ -87,6 +89,24 @@ void KMZMap::Overlay::unload()
_img = 0;
}
void KMZMap::Overlay::setProjection(const Projection *proj)
{
_proj = proj;
ReferencePoint tl(PointD(0, 0), _proj->ll2xy(_bbox.topLeft()));
ReferencePoint br(PointD(_size.width(), _size.height()),
_proj->ll2xy(_bbox.bottomRight()));
QTransform t;
t.rotate(-_rotation);
QRectF b(0, 0, _size.width(), _size.height());
QPolygonF ma = t.map(b);
_bounds = ma.boundingRect();
_transform = Transform(tl, br);
}
bool KMZMap::resCmp(const Overlay &m1, const Overlay &m2)
{
qreal r1, r2;
@ -150,7 +170,6 @@ void KMZMap::computeBounds()
_bounds = QVector<Bounds>(_maps.count());
for (int i = 0; i < _maps.count(); i++) {
QRectF xy(offsets.at(i), _maps.at(i).bounds().size());
_bounds[i] = Bounds(_maps.at(i).bbox(), xy);
_adjust = qMin(qMin(_maps.at(i).bounds().left(),
_maps.at(i).bounds().top()), _adjust);
@ -227,7 +246,7 @@ void KMZMap::groundOverlay(QXmlStreamReader &reader, QZipReader &zip)
QSize size(ir.size());
if (size.isValid())
_maps.append(Overlay(image, size, rect, rotation));
_maps.append(Overlay(image, size, rect, rotation, &_projection));
else
reader.raiseError(image + ": Invalid image file");
} else
@ -282,6 +301,8 @@ KMZMap::KMZMap(const QString &fileName, QObject *parent)
QByteArray xml(zip.fileData("doc.kml"));
QXmlStreamReader reader(xml);
_projection = Projection(GCS::gcs(4326));
if (reader.readNextStartElement()) {
if (reader.name() == QLatin1String("kml"))
kml(reader, zip);
@ -450,6 +471,20 @@ void KMZMap::unload()
_zip = 0;
}
void KMZMap::setInputProjection(const Projection &projection)
{
if (projection == _projection)
return;
_projection = projection;
for (int i = 0; i < _maps.size(); i++)
_maps[i].setProjection(&_projection);
_bounds.clear();
computeBounds();
}
void KMZMap::draw(QPainter *painter, const QRectF &rect, int mapIndex,
Flags flags)
{