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

Review fixes.

Browse source
This commit is contained in:
Yuri Gorshenin 2016-01-19 13:38:58 +03:00 • committed by Sergey Yershov
parent cb8089c6ab
commit 1ee6af51df
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
search/v2/search_model.cpp
View file

@ -19,20 +19,17 @@ public:
OneLevelPOIChecker() : ftypes::BaseChecker(1 /* level */)
{
Classificator const & c = classif();
m_types.push_back(c.GetTypeByPath({"amenity"}));
m_types.push_back(c.GetTypeByPath({"historic"}));
m_types.push_back(c.GetTypeByPath({"office"}));
m_types.push_back(c.GetTypeByPath({"railway"}));
m_types.push_back(c.GetTypeByPath({"shop"}));
m_types.push_back(c.GetTypeByPath({"sport"}));
m_types.push_back(c.GetTypeByPath({"tourism"}));
auto paths = {"amenity", "historic", "office", "railway", "shop", "sport", "tourism"};
for (auto const & path : paths)
m_types.push_back(c.GetTypeByPath({path}));
}
};
class TwoLevelsPOIChecker : public ftypes::BaseChecker
class TwoLevelPOIChecker : public ftypes::BaseChecker
{
public:
TwoLevelsPOIChecker() : ftypes::BaseChecker(2 /* level */)
TwoLevelPOIChecker() : ftypes::BaseChecker(2 /* level */)
{
Classificator const & c = classif();
m_types.push_back(c.GetTypeByPath({"highway", "bus_stop"}));
@ -50,11 +47,11 @@ public:
return inst;
}
bool operator()(FeatureType const & ft) const { return m_oneLevel(ft) || m_twoLevels(ft); }
bool operator()(FeatureType const & ft) const { return m_oneLevel(ft) || m_twoLevel(ft); }
private:
OneLevelPOIChecker const m_oneLevel;
TwoLevelsPOIChecker const m_twoLevels;
TwoLevelPOIChecker const m_twoLevel;
};
} // namespace
@ -84,6 +81,8 @@ SearchModel::SearchType SearchModel::GetSearchType(FeatureType const & feature)
switch (type)
{
case NONE:
ASSERT(false, ("Unknown locality."));
return SEARCH_TYPE_COUNT;
case STATE:
return SEARCH_TYPE_COUNT;
case COUNTRY: