kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

towns_dumper enhancement.

Browse source
This commit is contained in:
Lev Dragunov 2016-01-06 11:20:19 +03:00 • committed by Sergey Yershov
parent 800d215b55
commit 771d9af0f2
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
generator/towns_dumper.cpp
View file

@ -2,13 +2,14 @@
#include "coding/file_writer.hpp"
#include "geometry/distance_on_sphere.hpp"
#include "geometry/tree4d.hpp"
#include "base/logging.hpp"
#include "std/string.hpp"
#include "std/sstream.hpp"
#include "std/queue.hpp"
#include "std/string.hpp"
#include "std/vector.hpp"
namespace
{
@ -20,35 +21,35 @@ void TownsDumper::FilterTowns()
{
LOG(LINFO, ("Preprocessing started. Have", m_records.size(), "towns."));
m4::Tree<Town> resultTree;
priority_queue<Town> towns;
vector<Town> towns;
towns.reserve(m_records.size());
for (auto const & town : m_records)
{
if (town.capital)
resultTree.Add(town);
else
towns.push(town);
towns.push_back(town);
}
sort(towns.begin(), towns.end());
LOG(LINFO, ("Tree of capitals has size", resultTree.GetSize(), "towns has size:", towns.size()));
m_records.clear();
while (!towns.empty())
{
auto const & top = towns.top();
auto const & top = towns.back();
bool isUniq = true;
resultTree.ForEachInRect(
MercatorBounds::RectByCenterXYAndSizeInMeters(MercatorBounds::FromLatLon(top.point),
kTownsEqualityMeters),
[&top, &isUniq](Town const & candidate)
{
if (MercatorBounds::DistanceOnEarth(MercatorBounds::FromLatLon(top.point),
MercatorBounds::FromLatLon(candidate.point)) <
kTownsEqualityMeters)
if (ms::DistanceOnEarth(top.point, candidate.point) < kTownsEqualityMeters)
isUniq = false;
});
if (isUniq)
resultTree.Add(top);
towns.pop();
towns.pop_back();
}
resultTree.ForEach([this](Town const & town)