organicmaps/geocore
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

[generator] Delete unused class CalculateMidPoints

Browse source
This commit is contained in:
Anatoly Serdtcev 2019-12-16 19:05:43 +03:00 • committed by LaGrunge
parent 5ebb0ca11a
commit eaf07a172d
3 changed files with 0 additions and 96 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
generator/CMakeLists.txt
View file

@ -21,7 +21,6 @@ set(
feature_emitter_iface.hpp
feature_generator.cpp
feature_generator.hpp
feature_helpers.cpp
feature_helpers.hpp
feature_maker.cpp
feature_maker.hpp

66
generator/feature_helpers.cpp
View file

@ -1,66 +0,0 @@
#include "generator/feature_helpers.hpp"
#include "generator/feature_builder.hpp"
#include "coding/point_coding.hpp"
#include "base/stl_helpers.hpp"
#include <algorithm>
using namespace std;
namespace feature
{
CalculateMidPoints::CalculateMidPoints()
: CalculateMidPoints(static_cast<int (*)(TypesHolder const & types, m2::RectD limitRect)>(GetMinDrawableScale))
{ }
CalculateMidPoints::CalculateMidPoints(MinDrawableScalePolicy const & minDrawableScalePolicy)
: m_minDrawableScalePolicy{minDrawableScalePolicy}
{ }
void CalculateMidPoints::operator()(FeatureBuilder const & ft, uint64_t pos)
{
// Reset state.
m_midLoc = m2::PointD::Zero();;
m_locCount = 0;
ft.ForEachGeometryPoint(*this);
ASSERT_NOT_EQUAL(m_locCount, 0, ());
m_midLoc = m_midLoc / m_locCount;
uint64_t const pointAsInt64 = PointToInt64Obsolete(m_midLoc, m_coordBits);
int const minScale = m_minDrawableScalePolicy(ft.GetTypesHolder(), ft.GetLimitRect());
/// May be invisible if it's small area object with [0-9] scales.
/// @todo Probably, we need to keep that objects if 9 scale (as we do in 17 scale).
if (minScale != -1)
{
uint64_t const order = (static_cast<uint64_t>(minScale) << 59) | (pointAsInt64 >> 5);
m_vec.push_back(make_pair(order, pos));
}
}
bool CalculateMidPoints::operator()(m2::PointD const & p)
{
m_midLoc += p;
m_midAll += p;
++m_locCount;
++m_allCount;
return true;
}
m2::PointD CalculateMidPoints::GetCenter() const
{
if (m_allCount == 0)
return {};
return m_midAll / m_allCount;
}
void CalculateMidPoints::Sort()
{
sort(m_vec.begin(), m_vec.end(), base::LessBy(&CellAndOffset::first));
}
} // namespace feature

29
generator/feature_helpers.hpp
View file

@ -22,35 +22,6 @@
namespace feature
{
class FeatureBuilder;
class CalculateMidPoints
{
public:
using CellAndOffset = std::pair<uint64_t, uint64_t>;
using MinDrawableScalePolicy = std::function<int(TypesHolder const & types, m2::RectD limitRect)>;
CalculateMidPoints();
CalculateMidPoints(MinDrawableScalePolicy const & minDrawableScalePolicy);
void operator()(FeatureBuilder const & ft, uint64_t pos);
bool operator()(m2::PointD const & p);
m2::PointD GetCenter() const;
std::vector<CellAndOffset> const & GetVector() const { return m_vec; }
void Sort();
private:
m2::PointD m_midLoc;
m2::PointD m_midAll;
size_t m_locCount = 0;
size_t m_allCount = 0;
uint8_t m_coordBits = serial::GeometryCodingParams().GetCoordBits();
MinDrawableScalePolicy m_minDrawableScalePolicy;
std::vector<CellAndOffset> m_vec;
};
template <typename Point>
inline bool ArePointsEqual(Point const & p1, Point const & p2)
{