From 4594fae4328e3921a76be04b9cccbd4b789de4c1 Mon Sep 17 00:00:00 2001 From: Maxim Pimenov Date: Fri, 22 Jan 2016 19:04:41 +0300 Subject: [PATCH] Review fixes. --- indexer/ftypes_matcher.hpp | 3 +-- search/v2/geocoder.cpp | 7 ++++++- search/v2/search_model.cpp | 3 ++- search/v2/search_model.hpp | 1 + 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/indexer/ftypes_matcher.hpp b/indexer/ftypes_matcher.hpp index 400ef14499..5597589238 100644 --- a/indexer/ftypes_matcher.hpp +++ b/indexer/ftypes_matcher.hpp @@ -86,9 +86,8 @@ public: class IsVillageChecker : public BaseChecker { -public: IsVillageChecker(); - +public: template void ForEachType(TFn && fn) const { diff --git a/search/v2/geocoder.cpp b/search/v2/geocoder.cpp index 3504e07924..76a26f1e59 100644 --- a/search/v2/geocoder.cpp +++ b/search/v2/geocoder.cpp @@ -523,7 +523,12 @@ void Geocoder::GoImpl(vector> & infos, bool inViewport) m_streets = LoadStreets(*m_context); m_villages = LoadVillages(*m_context); + auto citiesFromWorld = m_cities; FillVillageLocalities(); + MY_SCOPE_GUARD(remove_villages, [&]() + { + m_cities = citiesFromWorld; + }); m_usedTokens.assign(m_numTokens, false); MatchRegions(REGION_TYPE_COUNTRY); @@ -764,7 +769,7 @@ void Geocoder::FillVillageLocalities() switch (m_model.GetSearchType(ft)) { - case SearchModel::SEARCH_TYPE_CITY: + case SearchModel::SEARCH_TYPE_VILLAGE: { if (numVillages < kMaxNumVillages && ft.GetFeatureType() == feature::GEOM_POINT) { diff --git a/search/v2/search_model.cpp b/search/v2/search_model.cpp index 5bafd79c22..51f6077ad2 100644 --- a/search/v2/search_model.cpp +++ b/search/v2/search_model.cpp @@ -89,8 +89,9 @@ SearchModel::SearchType SearchModel::GetSearchType(FeatureType const & feature) return SEARCH_TYPE_COUNTRY; case CITY: case TOWN: - case VILLAGE: return SEARCH_TYPE_CITY; + case VILLAGE: + return SEARCH_TYPE_VILLAGE; case LOCALITY_COUNT: return SEARCH_TYPE_COUNT; } diff --git a/search/v2/search_model.hpp b/search/v2/search_model.hpp index dc15abdfb7..5144dc8253 100644 --- a/search/v2/search_model.hpp +++ b/search/v2/search_model.hpp @@ -27,6 +27,7 @@ public: SEARCH_TYPE_POI, SEARCH_TYPE_BUILDING, SEARCH_TYPE_STREET, + SEARCH_TYPE_VILLAGE, SEARCH_TYPE_CITY, SEARCH_TYPE_STATE, // US or Canadian states SEARCH_TYPE_COUNTRY,