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

Code cleanup

Browse Source
This commit is contained in:
Martin Tůma 2024-11-01 09:16:32 +01:00
parent 244a7670e7
commit b721a829b2
1 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/map/dem.cpp
View File

@ -139,30 +139,6 @@ DEM::Entry *DEM::loadTile(const Tile &tile)
} }
} }
double DEM::elevation(const Coordinates &c)
{
if (_dir.isEmpty())
return NAN;
Tile tile(floor(c.lon()), floor(c.lat()));
_lock.lock();
Entry *e = _data.object(tile);
double ele;
if (!e) {
e = loadTile(tile);
ele = height(c, e);
_data.insert(tile, e, e->data().size() / 1024);
} else
ele = height(c, e);
_lock.unlock();
return ele;
}
double DEM::elevationLockFree(const Coordinates &c) double DEM::elevationLockFree(const Coordinates &c)
{ {
Tile tile(floor(c.lon()), floor(c.lat())); Tile tile(floor(c.lon()), floor(c.lat()));
@ -179,6 +155,18 @@ double DEM::elevationLockFree(const Coordinates &c)
return ele; return ele;
} }
double DEM::elevation(const Coordinates &c)
{
if (_dir.isEmpty())
return NAN;
_lock.lock();
double ele = elevationLockFree(c);
_lock.unlock();
return ele;
}
MatrixD DEM::elevation(const MatrixC &m) MatrixD DEM::elevation(const MatrixC &m)
{ {
if (_dir.isEmpty()) if (_dir.isEmpty())