gpesquero/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[generator] Fixed ordering.

Browse source
This commit is contained in:
Maksim Andrianov 2021-03-10 05:57:03 +03:00 • committed by Tatiana Yan
parent 528855f969
commit ae5445d609
1 changed files with 9 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
generator/collector_camera.cpp
View file

@ -170,39 +170,17 @@ void CameraProcessor::Save(std::string const & filename)
void CameraProcessor::OrderCollectedData(std::string const & filename)
{
std::vector<CameraProcessor::CameraInfo> collectedData;
{
std::vector<CameraProcessor::CameraInfo> collectedData;
{
FileReader reader(filename);
ReaderSource src(reader);
while (src.Size() > 0)
collectedData.emplace_back(CameraInfo::Read(src));
}
std::sort(std::begin(collectedData), std::end(collectedData));
FileWriter writer(filename);
for (auto const & camera : collectedData)
CameraInfo::Write(writer, camera);
}
{
std::vector<std::pair<uint64_t, std::vector<uint64_t>>> collectedData;
{
FileReader reader(m_waysFilename);
ReaderSource src(reader);
while (src.Size() > 0)
{
collectedData.push_back({});
src.Read(&collectedData.back().first, sizeof(collectedData.back().first));
rw::ReadVectorOfPOD(src, collectedData.back().second);
}
}
std::sort(std::begin(collectedData), std::end(collectedData));
FileWriter writer(m_waysFilename);
for (auto const & p : collectedData)
{
WriteToSink(writer, p.first);
rw::WriteVectorOfPOD(writer, p.second);
}
FileReader reader(filename);
ReaderSource src(reader);
while (src.Size() > 0)
collectedData.emplace_back(CameraInfo::Read(src));
}
std::sort(std::begin(collectedData), std::end(collectedData));
FileWriter writer(filename);
for (auto const & camera : collectedData)
CameraInfo::Write(writer, camera);
}
CameraCollector::CameraCollector(std::string const & filename) :