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

[indexer] ftypes_matcher minor refactoring.

Browse source
This commit is contained in:
tatiana-yan 2019-11-12 11:21:01 +03:00 • committed by mpimenov
parent 5f0d2fef6f
commit ba43ce6730
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
indexer/ftypes_matcher.cpp
View file

@ -256,9 +256,9 @@ IsWayChecker::IsWayChecker()
IsStreetOrSquareChecker::IsStreetOrSquareChecker()
{
for (auto const t : IsWayChecker::Instance().m_types)
for (auto const t : IsWayChecker::Instance().GetTypes())
m_types.push_back(t);
for (auto const t : IsSquareChecker::Instance().m_types)
for (auto const t : IsSquareChecker::Instance().GetTypes())
m_types.push_back(t);
}

5
indexer/ftypes_matcher.hpp
View file

@ -39,6 +39,8 @@ public:
virtual bool IsMatched(uint32_t type) const;
virtual void ForEachType(std::function<void(uint32_t)> && fn) const;
std::vector<uint32_t> const & GetTypes() const { return m_types; }
bool operator()(feature::TypesHolder const & types) const;
bool operator()(FeatureType & ft) const;
bool operator()(std::vector<uint32_t> const & types) const;
@ -109,7 +111,6 @@ public:
class IsSquareChecker : public BaseChecker
{
IsSquareChecker();
friend class IsStreetOrSquareChecker;
public:
DECLARE_CHECKER_INSTANCE(IsSquareChecker);
@ -126,7 +127,6 @@ public:
class IsWayChecker : public BaseChecker
{
IsWayChecker();
friend class IsStreetOrSquareChecker;
public:
DECLARE_CHECKER_INSTANCE(IsWayChecker);
@ -336,7 +336,6 @@ public:
DECLARE_CHECKER_INSTANCE(IsEatChecker);
std::vector<uint32_t> const & GetTypes() const { return m_types; }
Type GetType(uint32_t t) const;
private: