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

Code cleanup

Browse Source
This commit is contained in:
Martin Tůma 2024-02-22 21:14:49 +01:00
parent d8f7089450
commit f1fd4f8bc9
2 changed files with 29 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/data/dem.cpp
View File

@ -91,11 +91,6 @@ QString DEM::Tile::baseName() const
QString DEM::_dir; QString DEM::_dir;
DEM::TileCache DEM::_data; DEM::TileCache DEM::_data;
QString DEM::fileName(const QString &baseName)
{
return QDir(_dir).absoluteFilePath(baseName);
}
void DEM::setCacheSize(int size) void DEM::setCacheSize(int size)
{ {
_data.setMaxCost(size * 1024); _data.setMaxCost(size * 1024);
@ -111,41 +106,43 @@ void DEM::clearCache()
_data.clear(); _data.clear();
} }
QByteArray *DEM::loadTile(const Tile &tile)
{
QString bn(tile.baseName());
QString fn(QDir(_dir).absoluteFilePath(bn));
QString zn(fn + ".zip");
if (QFileInfo::exists(zn)) {
QZipReader zip(zn, QIODevice::ReadOnly);
return new QByteArray(zip.fileData(bn));
} else {
QFile file(fn);
if (!file.open(QIODevice::ReadOnly)) {
qWarning("%s: %s", qPrintable(file.fileName()),
qPrintable(file.errorString()));
return new QByteArray();
} else
return new QByteArray(file.readAll());
}
}
double DEM::elevation(const Coordinates &c) double DEM::elevation(const Coordinates &c)
{ {
if (_dir.isEmpty()) if (_dir.isEmpty())
return NAN; return NAN;
Tile tile(qFloor(c.lon()), qFloor(c.lat())); Tile tile(qFloor(c.lon()), qFloor(c.lat()));
QByteArray *ba = _data.object(tile);
double ele;
QByteArray *ba = _data[tile];
if (!ba) { if (!ba) {
QString bn(tile.baseName()); ba = loadTile(tile);
QString fn(fileName(bn)); ele = height(c, ba);
QString zn(fn + ".zip"); _data.insert(tile, ba, ba->size());
if (QFileInfo::exists(zn)) {
QZipReader zip(zn, QIODevice::ReadOnly);
ba = new QByteArray(zip.fileData(bn));
double ele = height(c, ba);
_data.insert(tile, ba, ba->size());
return ele;
} else {
QFile file(fn);
if (!file.open(QIODevice::ReadOnly)) {
qWarning("%s: %s", qPrintable(file.fileName()),
qPrintable(file.errorString()));
_data.insert(tile, new QByteArray());
return NAN;
} else {
ba = new QByteArray(file.readAll());
double ele = height(c, ba);
_data.insert(tile, ba, ba->size());
return ele;
}
}
} else } else
return height(c, ba); ele = height(c, ba);
return ele;
} }
QList<Area> DEM::tiles() QList<Area> DEM::tiles()

2
src/data/dem.h
View File

@ -46,7 +46,7 @@ public:
private: private:
typedef QCache<DEM::Tile, QByteArray> TileCache; typedef QCache<DEM::Tile, QByteArray> TileCache;
static QString fileName(const QString &baseName); static QByteArray *loadTile(const Tile &tile);
static QString _dir; static QString _dir;
static TileCache _data; static TileCache _data;