root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2025-06-28 12:09:15 +02:00
Code Issues Projects Releases Activity

Fixed warious bounds wrapping issues

Browse Source
This commit is contained in:
Martin Tůma
2020-10-27 16:46:09 +01:00
parent fb4af33d89
commit f9abf21e6d
3 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/map/IMG/trefile.cpp
View File

@ -5,7 +5,12 @@
static inline double RB(qint32 val)
{
return (val == -0x800000 || val == 0x800000) ? 180.0 : toWGS24(val);
return (val == -0x800000 || val >= 0x800000) ? 180.0 : toWGS24(val);
}
static inline double LB(qint32 val)
{
return (val <= -0x800000) ? -180.0 : toWGS24(val);
}
static void demangle(quint8 *data, quint32 size, quint32 key)
@ -60,7 +65,8 @@ bool TREFile::init()
return false;
_bounds = RectC(Coordinates(toWGS24(west), toWGS24(north)),
Coordinates(RB(east), toWGS24(south)));
Q_ASSERT(_bounds.left() <= _bounds.right());
if (!_bounds.isValid())
return false;
// Levels & subdivs info
quint32 levelsOffset, levelsSize, subdivSize;
@ -193,9 +199,10 @@ bool TREFile::load(int idx)
sl.append(s);
double min[2], max[2];
RectC bounds(Coordinates(toWGS24(lon - width), toWGS24(lat + height)),
RectC bounds(Coordinates(LB(lon - width), toWGS24(lat + height)),
Coordinates(RB(lon + width), toWGS24(lat - height)));
Q_ASSERT(bounds.left() <= bounds.right());
if (!bounds.isValid())
goto error;
min[0] = bounds.left();
min[1] = bounds.bottom();