fly/flightgear
1
0
Fork 0
Code Activity

Launcher: remove obsolete variable

Browse source 
Also imrpvoe abandoning behaviour of the natural earth loader.
This commit is contained in:
James Turner 2021-08-04 09:51:23 +01:00
parent f72983e1a6
commit fc40caf40e
1 changed files with 21 additions and 7 deletions

28
src/GUI/QtLauncher.cxx
View file

@ -212,8 +212,7 @@ class NaturalEarthDataLoaderThread : public QThread
Q_OBJECT Q_OBJECT
public: public:
NaturalEarthDataLoaderThread() : NaturalEarthDataLoaderThread()
m_lineInsertCount(0)
{ {
connect(this, &QThread::finished, this, &NaturalEarthDataLoaderThread::onFinished); connect(this, &QThread::finished, this, &NaturalEarthDataLoaderThread::onFinished);
} }
@ -225,10 +224,26 @@ public:
protected: protected:
void run() override void run() override
{ {
loadNaturalEarthFile("ne_10m_coastline.shp", flightgear::PolyLine::COASTLINE, false); struct FileAndType {
loadNaturalEarthFile("ne_10m_rivers_lake_centerlines.shp", flightgear::PolyLine::RIVER, false); std::string file;
loadNaturalEarthFile("ne_10m_lakes.shp", flightgear::PolyLine::LAKE, true); flightgear::PolyLine::Type type;
loadNaturalEarthFile("ne_10m_urban_areas.shp", flightgear::PolyLine::URBAN, true); bool closed = false;
};
const std::initializer_list<FileAndType> files = {
{"ne_10m_coastline.shp", flightgear::PolyLine::COASTLINE, false},
{"ne_10m_rivers_lake_centerlines.shp", flightgear::PolyLine::RIVER, false},
{"ne_10m_lakes.shp", flightgear::PolyLine::LAKE, true},
{"ne_10m_urban_areas.shp", flightgear::PolyLine::URBAN, true}
};
for (const auto& d : files) {
if (m_abandoned) {
break;
}
loadNaturalEarthFile(d.file, d.type, d.closed);
}
} }
private: private:
@ -256,7 +271,6 @@ private:
} }
flightgear::PolyLineList m_parsedLines; flightgear::PolyLineList m_parsedLines;
unsigned int m_lineInsertCount;
bool m_abandoned = false; bool m_abandoned = false;
}; };