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

Broken subdivs are more common than one would expect...

Browse Source
This commit is contained in:
Martin Tůma 2020-11-02 20:16:02 +01:00
parent 1225d350d4
commit 0644bb72a0
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -202,22 +202,18 @@ bool TREFile::load(int idx)
double min[2], max[2]; double min[2], max[2];
RectC bounds(Coordinates(LB(lon - width), toWGS24(lat + height)), RectC bounds(Coordinates(LB(lon - width), toWGS24(lat + height)),
Coordinates(RB(lon + width), toWGS24(lat - height))); Coordinates(RB(lon + width), toWGS24(lat - height)));
if (!bounds.isValid()) {
qWarning("%s: invalid subdiv bounds (level %d; pos %f,%f; size %fx%f)",
qPrintable(fileName()), level.level, toWGS24(lon), toWGS24(lat),
toWGS24(width), toWGS24(height));
/* mkgmap produces invalid (zero width or/and zero height) subdiv
bounds in some cases. Allow such bounds as they should not break
things. */
if (!(!width || !height))
goto error;
}
min[0] = bounds.left(); min[0] = bounds.left();
min[1] = bounds.bottom(); min[1] = bounds.bottom();
max[0] = bounds.right(); max[0] = bounds.right();
max[1] = bounds.top(); max[1] = bounds.top();
/* both mkgmap and cGPSmapper generate all kinds of broken subdiv bounds
(zero lat/lon, zero width/height, ...) so we check only that the
subdiv item does not break the rtree, not for full bounds validity. */
if (!(min[0] <= max[0] && min[1] <= max[1]))
goto error;
tree->Insert(min, max, s); tree->Insert(min, max, s);
} }