root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2025-06-27 03:29:16 +02:00
Code Issues Projects Releases Activity

Preserve directory structure when loading the POIs

Browse Source 
+ POI files handling optimization
This commit is contained in:
Martin Tůma
2021-03-21 20:23:20 +01:00
parent ce0d50e4aa
commit 2d329e65ee
8 changed files with 225 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

134
src/data/poi.cpp
View File

@ -10,19 +10,35 @@
#include "poi.h"
POI::File::File(int start, int end, const QVector<Waypoint> &data)
: _enabled(true)
{
qreal c[2];
for (int i = start; i <= end; i++) {
const Coordinates &p = data.at(i).coordinates();
c[0] = p.lon();
c[1] = p.lat();
_tree.Insert(c, c, i);
}
}
POI::POI(QObject *parent) : QObject(parent)
{
_errorLine = 0;
_radius = 1000;
}
POI::~POI()
{
qDeleteAll(_files);
}
bool POI::loadFile(const QString &path)
{
Data data(path);
FileIndex index;
index.enabled = true;
index.start = _data.size();
if (!data.isValid()) {
_errorString = data.errorString();
@ -30,42 +46,41 @@ bool POI::loadFile(const QString &path)
return false;
}
for (int i = 0; i < data.waypoints().size(); i++)
_data.append(data.waypoints().at(i));
index.end = _data.size() - 1;
int start = _data.size();
_data.append(data.waypoints());
for (int i = index.start; i <= index.end; i++) {
const Coordinates &p = _data.at(i).coordinates();
qreal c[2];
c[0] = p.lon();
c[1] = p.lat();
_tree.Insert(c, c, i);
}
_files.append(path);
_indexes.append(index);
_files.insert(path, new File(start, _data.size() - 1, _data));
emit pointsChanged();
return true;
}
void POI::loadDir(const QString &path)
TreeNode<QString> POI::loadDir(const QString &path)
{
QDir md(path);
md.setFilter(QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot);
md.setSorting(QDir::DirsFirst);
QFileInfoList fl = md.entryInfoList();
TreeNode<QString> tree(md.dirName());
for (int i = 0; i < fl.size(); i++) {
const QFileInfo &fi = fl.at(i);
if (fi.isDir())
loadDir(fi.absoluteFilePath());
else
if (!loadFile(fi.absoluteFilePath()))
if (fi.isDir()) {
TreeNode<QString> child(loadDir(fi.absoluteFilePath()));
if (!child.isEmpty())
tree.addChild(child);
} else {
if (loadFile(fi.absoluteFilePath()))
tree.addItem(fi.absoluteFilePath());
else
qWarning("%s: %s", qPrintable(fi.absoluteFilePath()),
qPrintable(_errorString));
}
}
return tree;
}
static bool cb(size_t data, void* context)
@ -80,24 +95,30 @@ void POI::search(const RectC &rect, QSet<int> &set) const
{
qreal min[2], max[2];
if (rect.left() > rect.right()) {
min[0] = rect.topLeft().lon();
min[1] = rect.bottomRight().lat();
max[0] = 180.0;
max[1] = rect.topLeft().lat();
_tree.Search(min, max, cb, &set);
for (ConstIterator it = _files.constBegin(); it != _files.constEnd(); ++it) {
const File *file = *it;
min[0] = -180.0;
min[1] = rect.bottomRight().lat();
max[0] = rect.bottomRight().lon();
max[1] = rect.topLeft().lat();
_tree.Search(min, max, cb, &set);
} else {
min[0] = rect.topLeft().lon();
min[1] = rect.bottomRight().lat();
max[0] = rect.bottomRight().lon();
max[1] = rect.topLeft().lat();
_tree.Search(min, max, cb, &set);
if (file->isEnabled()) {
if (rect.left() > rect.right()) {
min[0] = rect.topLeft().lon();
min[1] = rect.bottomRight().lat();
max[0] = 180.0;
max[1] = rect.topLeft().lat();
file->tree().Search(min, max, cb, &set);
min[0] = -180.0;
min[1] = rect.bottomRight().lat();
max[0] = rect.bottomRight().lon();
max[1] = rect.topLeft().lat();
file->tree().Search(min, max, cb, &set);
} else {
min[0] = rect.topLeft().lon();
min[1] = rect.bottomRight().lat();
max[0] = rect.bottomRight().lon();
max[1] = rect.topLeft().lat();
file->tree().Search(min, max, cb, &set);
}
}
}
}
@ -170,40 +191,17 @@ QList<Waypoint> POI::points(const RectC &rect) const
return ret;
}
void POI::enableFile(const QString &fileName, bool enable)
bool POI::enableFile(const QString &fileName, bool enable)
{
int i;
Iterator it = _files.find(fileName);
if (it == _files.end())
return false;
i = _files.indexOf(fileName);
Q_ASSERT(i >= 0);
_indexes[i].enabled = enable;
_tree.RemoveAll();
for (int i = 0; i < _indexes.count(); i++) {
FileIndex idx = _indexes.at(i);
if (!idx.enabled)
continue;
for (int j = idx.start; j <= idx.end; j++) {
const Coordinates &p = _data.at(j).coordinates();
qreal c[2];
c[0] = p.lon();
c[1] = p.lat();
_tree.Insert(c, c, j);
}
}
(*it)->enable(enable);
emit pointsChanged();
}
void POI::clear()
{
_tree.RemoveAll();
_data.clear();
_files.clear();
_indexes.clear();
emit pointsChanged();
return true;
}
void POI::setRadius(unsigned radius)

33
src/data/poi.h
View File

@ -6,6 +6,7 @@
#include <QString>
#include <QStringList>
#include "common/rtree.h"
#include "common/treenode.h"
#include "waypoint.h"
class Path;
@ -17,9 +18,10 @@ class POI : public QObject
public:
POI(QObject *parent = 0);
~POI();
bool loadFile(const QString &path);
void loadDir(const QString &path);
TreeNode<QString> loadDir(const QString &path);
const QString &errorString() const {return _errorString;}
int errorLine() const {return _errorLine;}
@ -30,28 +32,33 @@ public:
QList<Waypoint> points(const Waypoint &point) const;
QList<Waypoint> points(const RectC &rect) const;
const QStringList &files() const {return _files;}
void enableFile(const QString &fileName, bool enable);
void clear();
bool isLoaded(const QString &path) const {return _files.contains(path);}
bool enableFile(const QString &fileName, bool enable);
signals:
void pointsChanged();
private:
typedef RTree<size_t, qreal, 2> POITree;
struct FileIndex {
int start;
int end;
bool enabled;
};
class File {
public:
File(int start, int end, const QVector<Waypoint> &data);
const POITree &tree() const {return _tree;}
bool isEnabled() const {return _enabled;}
void enable(bool enable) {_enabled = enable;}
private:
bool _enabled;
POITree _tree;
};
typedef QHash<QString, File*>::const_iterator ConstIterator;
typedef QHash<QString, File*>::iterator Iterator;
bool loadFile(const QString &path, bool dir);
void search(const RectC &rect, QSet<int> &set) const;
POITree _tree;
QVector<Waypoint> _data;
QStringList _files;
QList<FileIndex> _indexes;
QHash<QString, File*> _files;
unsigned _radius;