root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2024-11-24 11:45:53 +01:00
Code Issues Projects Releases Activity

Fixed issue with Mercator projections

Browse Source
This commit is contained in:
Martin Tůma 2020-12-02 20:51:19 +01:00
parent af6082425e
commit 8d52dbf59f
2 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/map/bsbmap.cpp
View File

@ -182,18 +182,26 @@ bool BSBMap::parseKNQ(const QByteArray &line, double params[9])
return true; return true;
} }
bool BSBMap::parseREF(const QByteArray &line, QList<ReferencePoint> &points) bool BSBMap::parseREF(const QByteArray &line, const QString &datum,
const QString &proj, double params[9], QList<ReferencePoint> &points)
{ {
QList<QByteArray> fields(line.split(',')); QList<QByteArray> fields(line.split(','));
if (fields.size() == 5) { if (fields.size() == 5) {
bool xok, yok, lonok, latok; bool xok, yok, lonok, latok;
CalibrationPoint p(PointD(fields.at(1).toDouble(&xok), Coordinates c(fields.at(4).toDouble(&lonok),
fields.at(2).toDouble(&yok)), Coordinates(fields.at(4).toDouble(&lonok), fields.at(3).toDouble(&latok));
fields.at(3).toDouble(&latok))); if (lonok && latok && c.isValid()) {
if (xok && yok && lonok && latok) { if (_projection.isNull()) {
points.append(p.rp(_projection)); if (!createProjection(datum, proj, params, c))
return true; return false;
}
CalibrationPoint p(PointD(fields.at(1).toDouble(&xok),
fields.at(2).toDouble(&yok)), c);
if (xok && yok) {
points.append(p.rp(_projection));
return true;
}
} }
} }
@ -207,10 +215,11 @@ bool BSBMap::parseRGB(const QByteArray &line)
bool iok, rok, gok, bok; bool iok, rok, gok, bok;
int i = fields.at(0).toUInt(&iok); int i = fields.at(0).toUInt(&iok);
if (fields.size() == 4 && i > 0 && i < 256) { if (iok && fields.size() == 4 && i > 0 && i < 256) {
_palette[i-1] = Color::rgb(fields.at(1).toUInt(&rok), _palette[i-1] = Color::rgb(fields.at(1).toUInt(&rok),
fields.at(2).toUInt(&gok), fields.at(3).toUInt(&bok)); fields.at(2).toUInt(&gok), fields.at(3).toUInt(&bok));
return true; if (rok && gok && bok)
return true;
} }
_errorString = QString(line) + ": Invalid RGB entry"; _errorString = QString(line) + ": Invalid RGB entry";
@ -240,14 +249,10 @@ bool BSBMap::readHeader(QFile &file)
return false; return false;
else if (isType(line, "KNQ/") && !parseKNQ(hdrData(line), params)) else if (isType(line, "KNQ/") && !parseKNQ(hdrData(line), params))
return false; return false;
else if (isType(line, "REF/")) { else if (isType(line, "REF/")
if (_projection.isNull()) { && !parseREF(hdrData(line), datum, proj, params, points))
if (!createProjection(datum, proj, params)) return false;
return false; else if (isType(line, "RGB/") && !parseRGB(hdrData(line)))
}
if (!parseREF(hdrData(line), points))
return false;
} else if (isType(line, "RGB/") && !parseRGB(hdrData(line)))
return false; return false;
line.clear(); line.clear();
@ -283,7 +288,7 @@ bool BSBMap::createTransform(QList<ReferencePoint> &points)
} }
bool BSBMap::createProjection(const QString &datum, const QString &proj, bool BSBMap::createProjection(const QString &datum, const QString &proj,
double params[9]) double params[9], const Coordinates &c)
{ {
const GCS *gcs = 0; const GCS *gcs = 0;
PCS pcs; PCS pcs;
@ -298,7 +303,7 @@ bool BSBMap::createProjection(const QString &datum, const QString &proj,
} }
if (!proj.compare("MERCATOR", Qt::CaseInsensitive)) { if (!proj.compare("MERCATOR", Qt::CaseInsensitive)) {
Projection::Setup setup(0, 0, NAN, 0, 0, NAN, NAN); Projection::Setup setup(0, c.lon(), NAN, 0, 0, NAN, NAN);
pcs = PCS(gcs, 9804, setup, 9001); pcs = PCS(gcs, 9804, setup, 9001);
} else if (!proj.compare("TRANSVERSE MERCATOR", Qt::CaseInsensitive)) { } else if (!proj.compare("TRANSVERSE MERCATOR", Qt::CaseInsensitive)) {
Projection::Setup setup(0, params[1], params[2], 0, 0, NAN, NAN); Projection::Setup setup(0, params[1], params[2], 0, 0, NAN, NAN);

5
src/map/bsbmap.h
View File

@ -37,11 +37,12 @@ private:
bool parseKNP(const QByteArray &line, QString &datum, QString &proj, bool parseKNP(const QByteArray &line, QString &datum, QString &proj,
double &pp); double &pp);
bool parseKNQ(const QByteArray &line, double params[9]); bool parseKNQ(const QByteArray &line, double params[9]);
bool parseREF(const QByteArray &line, QList<ReferencePoint> &points); bool parseREF(const QByteArray &line, const QString &datum,
const QString &proj, double params[9], QList<ReferencePoint> &points);
bool parseRGB(const QByteArray &line); bool parseRGB(const QByteArray &line);
bool readHeader(QFile &file); bool readHeader(QFile &file);
bool createProjection(const QString &datum, const QString &proj, bool createProjection(const QString &datum, const QString &proj,
double params[9]); double params[9], const Coordinates &c);
bool createTransform(QList<ReferencePoint> &points); bool createTransform(QList<ReferencePoint> &points);
QImage readImage(); QImage readImage();
bool readRow(QFile &file, char bits, uchar *buf); bool readRow(QFile &file, char bits, uchar *buf);