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-10-22 07:43:42 +02:00
parent b348ad6288
commit 5b5e00038f
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/map/IMG/rastertile.cpp
View File

@ -466,8 +466,7 @@ MatrixD RasterTile::elevation(int extend) const
int top = _rect.top() - extend; int top = _rect.top() - extend;
int bottom = _rect.bottom() + extend; int bottom = _rect.bottom() + extend;
Matrix<Coordinates> ll(_rect.height() + 2 * extend, MatrixC ll(_rect.height() + 2 * extend, _rect.width() + 2 * extend);
_rect.width() + 2 * extend);
for (int y = top, i = 0; y <= bottom; y++) for (int y = top, i = 0; y <= bottom; y++)
for (int x = left; x <= right; x++, i++) for (int x = left; x <= right; x++, i++)
ll.at(i) = xy2ll(QPointF(x, y)); ll.at(i) = xy2ll(QPointF(x, y));
@ -486,7 +485,6 @@ MatrixD RasterTile::elevation(int extend) const
DEMTree tree(tiles); DEMTree tree(tiles);
MatrixD m(ll.h(), ll.w()); MatrixD m(ll.h(), ll.w());
for (int i = 0; i < ll.size(); i++) for (int i = 0; i < ll.size(); i++)
m.at(i) = tree.elevation(ll.at(i)); m.at(i) = tree.elevation(ll.at(i));

5
src/map/dem.cpp
View File

@ -46,7 +46,6 @@ static double value(int col, int row, int samples, const QByteArray &data)
return (val == -32768) ? NAN : val; return (val == -32768) ? NAN : val;
} }
QMutex DEM::_lock;
DEM::Entry::Entry(const QByteArray &data) : _data(data) DEM::Entry::Entry(const QByteArray &data) : _data(data)
{ {
@ -70,6 +69,8 @@ QString DEM::Tile::fileName() const
return QString("%1%2.hgt").arg(latStr(), lonStr()); return QString("%1%2.hgt").arg(latStr(), lonStr());
} }
QMutex DEM::_lock;
QString DEM::_dir; QString DEM::_dir;
DEM::TileCache DEM::_data; DEM::TileCache DEM::_data;
@ -170,7 +171,7 @@ double DEM::elevationLockFree(const Coordinates &c)
return ele; return ele;
} }
MatrixD DEM::elevation(const Matrix<Coordinates> &m) MatrixD DEM::elevation(const MatrixC &m)
{ {
if (_dir.isEmpty()) if (_dir.isEmpty())
return MatrixD(m.h(), m.w(), NAN); return MatrixD(m.h(), m.w(), NAN);

4
src/map/dem.h
View File

@ -9,8 +9,6 @@
#include "data/area.h" #include "data/area.h"
#include "matrix.h" #include "matrix.h"
class Coordinates;
class DEM class DEM
{ {
public: public:
@ -39,7 +37,7 @@ public:
static void clearCache(); static void clearCache();
static double elevation(const Coordinates &c); static double elevation(const Coordinates &c);
static MatrixD elevation(const Matrix<Coordinates> &m); static MatrixD elevation(const MatrixC &m);
static QList<Area> tiles(); static QList<Area> tiles();

3
src/map/mapsforge/rastertile.cpp
View File

@ -475,8 +475,7 @@ MatrixD RasterTile::elevation(int extend) const
int top = _rect.top() - extend; int top = _rect.top() - extend;
int bottom = _rect.bottom() + extend; int bottom = _rect.bottom() + extend;
Matrix<Coordinates> ll(_rect.height() + 2 * extend, MatrixC ll(_rect.height() + 2 * extend, _rect.width() + 2 * extend);
_rect.width() + 2 * extend);
for (int y = top, i = 0; y <= bottom; y++) for (int y = top, i = 0; y <= bottom; y++)
for (int x = left; x <= right; x++, i++) for (int x = left; x <= right; x++, i++)
ll.at(i) = xy2ll(QPointF(x, y)); ll.at(i) = xy2ll(QPointF(x, y));

4
src/map/matrix.h
View File

@ -5,6 +5,8 @@
#include <QVector> #include <QVector>
#include <QDebug> #include <QDebug>
class Coordinates;
template <class T> template <class T>
class Matrix class Matrix
{ {
@ -39,6 +41,8 @@ public:
MatrixD augemented(const MatrixD &M) const; MatrixD augemented(const MatrixD &M) const;
}; };
typedef Matrix<Coordinates> MatrixC;
#ifndef QT_NO_DEBUG #ifndef QT_NO_DEBUG
template <class T> template <class T>
inline QDebug operator<<(QDebug dbg, const Matrix<T> &matrix) inline QDebug operator<<(QDebug dbg, const Matrix<T> &matrix)