fly/flightgear
1
0
Fork 0
Code Activity

Incremental insert of NE data to the index.

Browse source
This commit is contained in:
James Turner 2016-08-09 09:38:54 +01:00
parent 7cebc76b9d
commit a60d07ea9c
3 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/GUI/QtLauncher.cxx
View file

@ -263,7 +263,8 @@ class NaturalEarthDataLoaderThread : public QThread
Q_OBJECT
public:
NaturalEarthDataLoaderThread()
NaturalEarthDataLoaderThread() :
m_lineInsertCount(0)
{
connect(this, &QThread::finished, this, &NaturalEarthDataLoaderThread::onFinished);
}
@ -284,15 +285,22 @@ protected:
loadNaturalEarthFile("ne_10m_urban_areas.shp", flightgear::PolyLine::URBAN, true);
qDebug() << "loading urban areas took:" << st.elapsedMSec();
}
private:
void onFinished()
{
flightgear::PolyLine::bulkAddToSpatialIndex(m_parsedLines);
qDebug() << "finished loading Natural Earth data";
deleteLater(); // commit suicide
flightgear::PolyLineList::const_iterator begin = m_parsedLines.begin() + m_lineInsertCount;
unsigned int numToAdd = std::min(1000UL, m_parsedLines.size() - m_lineInsertCount);
flightgear::PolyLineList::const_iterator end = begin + numToAdd;
flightgear::PolyLine::bulkAddToSpatialIndex(begin, end);
if (end == m_parsedLines.end()) {
deleteLater(); // commit suicide
} else {
m_lineInsertCount += 1000;
QTimer::singleShot(50, this, &NaturalEarthDataLoaderThread::onFinished);
}
}
void loadNaturalEarthFile(const std::string& aFileName,
@ -310,6 +318,7 @@ private:
}
flightgear::PolyLineList m_parsedLines;
unsigned int m_lineInsertCount;
};
} // of anonymous namespace

5
src/Navaids/PolyLine.cxx
View file

@ -101,11 +101,12 @@ PolyLineRef PolyLine::create(PolyLine::Type aTy, const SGGeodVec &aRawPoints)
return new PolyLine(aTy, aRawPoints);
}
void PolyLine::bulkAddToSpatialIndex(const PolyLineList &lines)
void PolyLine::bulkAddToSpatialIndex(PolyLineList::const_iterator begin,
PolyLineList::const_iterator end)
{
NavDataCache::Transaction txn( NavDataCache::instance());
flightgear::PolyLineList::const_iterator it;
for (it=lines.begin(); it != lines.end(); ++it) {
for (it=begin; it != end; ++it) {
(*it)->addToSpatialIndex();
}
txn.commit();

3
src/Navaids/PolyLine.hxx
View file

@ -91,7 +91,8 @@ public:
static PolyLineRef create(Type aTy, const SGGeodVec& aRawPoints);
static void bulkAddToSpatialIndex(const PolyLineList& lines);
static void bulkAddToSpatialIndex(PolyLineList::const_iterator begin,
PolyLineList::const_iterator end);
/**
* retrieve all the lines within a range of a search point.