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

clang-format

Browse source
This commit is contained in:
Lev Dragunov 2015-12-11 15:38:14 +03:00 • committed by Sergey Yershov
parent 3d0e4b76df
commit 069f09b390
2 changed files with 25 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
indexer/displacement_manager.hpp
View file

@ -17,8 +17,8 @@
namespace
{
double constexpr kPOIperTileSizeCoint = 6;
double constexpr kPointLookupDeltaDegrees = 0.000001;
double constexpr kPOIperTileSizeCoint = 6;
double constexpr kPointLookupDeltaDegrees = 0.000001;
} // namespace
namespace covering
@ -84,7 +84,6 @@ class DisplacementManager
{
public:
DisplacementManager(TSorter & sorter) : m_sorter(sorter) {}
template <class TFeature>
void Add(vector<int64_t> const & cells, uint32_t bucket, TFeature const & ft, uint32_t index)
{
@ -102,7 +101,7 @@ public:
{
m4::Tree<DisplacableNode> acceptedNodes;
list<DisplacableNode> deferredNodes;
for(uint32_t zoom = 0; zoom < scales::GetUpperScale(); ++zoom)
for (uint32_t zoom = 0; zoom < scales::GetUpperScale(); ++zoom)
{
// Initialize queue.
priority_queue<DisplacableNode> displacableQueue;
@ -126,11 +125,12 @@ public:
m2::RectD const displacementRect(maxNode.center.x - delta, maxNode.center.y - delta,
maxNode.center.x + delta, maxNode.center.y + delta);
bool isDisplacing = false;
acceptedNodes.ForEachInRect(displacementRect,
[&isDisplacing, &maxNode, &delta, &zoom](DisplacableNode const & node){
if ((maxNode.center - node.center).Length() < delta && node.maxZoomLevel > zoom)
isDisplacing = true;
});
acceptedNodes.ForEachInRect(
displacementRect, [&isDisplacing, &maxNode, &delta, &zoom](DisplacableNode const & node)
{
if ((maxNode.center - node.center).Length() < delta && node.maxZoomLevel > zoom)
isDisplacing = true;
});
if (isDisplacing)
{
deferredNodes.push_back(maxNode);
@ -143,8 +143,7 @@ public:
acceptedNodes.Add(maxNode);
accepted++;
}
LOG(LINFO, ("Displacement for zoom", zoom,
"Features accepted:", accepted,
LOG(LINFO, ("Displacement for zoom", zoom, "Features accepted:", accepted,
"Features discarted:", deferredNodes.size()));
}
}
@ -160,9 +159,10 @@ private:
uint32_t priority;
DisplacableNode() : index(0), maxZoomLevel(0), priority(0) {}
template<class TFeature>
DisplacableNode(vector<int64_t> const & cells, TFeature const & ft, uint32_t index, int zoomLevel): index(index), center(ft.GetCenter()), cells(cells)
template <class TFeature>
DisplacableNode(vector<int64_t> const & cells, TFeature const & ft, uint32_t index,
int zoomLevel)
: index(index), center(ft.GetCenter()), cells(cells)
{
feature::TypesHolder const types(ft);
auto scaleRange = feature::GetDrawableScaleRange(types);
@ -187,15 +187,8 @@ private:
priority = (static_cast<uint32_t>(d) << 8) || rank;
}
bool operator < (DisplacableNode const & node) const
{
return priority < node.priority;
}
bool operator == (DisplacableNode const & node) const
{
return index == node.index;
}
bool operator<(DisplacableNode const & node) const { return priority < node.priority; }
bool operator==(DisplacableNode const & node) const { return index == node.index; }
m2::RectD const GetLimitRect() const { return m2::RectD(center, center); }
};

17
indexer/scale_index_builder.hpp
View file

@ -33,13 +33,13 @@ class FeatureCoverer
public:
FeatureCoverer(feature::DataHeader const & header, TDisplacementManager & manager,
vector<uint32_t> & featuresInBucket, vector<uint32_t> & cellsInBucket)
: m_header(header),
m_scalesIdx(0),
m_bucketsCount(header.GetLastScale() + 1),
m_displacement(manager),
m_codingDepth(covering::GetCodingDepth(header.GetLastScale())),
m_featuresInBucket(featuresInBucket),
m_cellsInBucket(cellsInBucket)
: m_header(header)
, m_scalesIdx(0)
, m_bucketsCount(header.GetLastScale() + 1)
, m_displacement(manager)
, m_codingDepth(covering::GetCodingDepth(header.GetLastScale()))
, m_featuresInBucket(featuresInBucket)
, m_cellsInBucket(cellsInBucket)
{
m_featuresInBucket.resize(m_bucketsCount);
m_cellsInBucket.resize(m_bucketsCount);
@ -158,7 +158,8 @@ void IndexScales(feature::DataHeader const & header, TFeaturesVector const & fea
TDisplacementManager manager(sorter);
vector<uint32_t> featuresInBucket(bucketsCount);
vector<uint32_t> cellsInBucket(bucketsCount);
features.ForEach(FeatureCoverer<TDisplacementManager>(header, manager, featuresInBucket, cellsInBucket));
features.ForEach(
FeatureCoverer<TDisplacementManager>(header, manager, featuresInBucket, cellsInBucket));
manager.Displace();
sorter.SortAndFinish();