diff --git a/search/intermediate_result.hpp b/search/intermediate_result.hpp index 1cd58fee76..1431f9f70b 100644 --- a/search/intermediate_result.hpp +++ b/search/intermediate_result.hpp @@ -115,6 +115,7 @@ public: inline FeatureID const & GetID() const { return m_id; } inline string const & GetName() const { return m_str; } inline feature::TypesHolder const & GetTypes() const { return m_types; } + inline m2::PointD GetCenter() const { return m_region.m_point; } private: bool IsEqualCommon(PreResult2 const & r) const; @@ -143,8 +144,6 @@ private: string GetRegionName(storage::CountryInfoGetter const & infoGetter, uint32_t fType) const; - m2::PointD GetCenter() const { return m_region.m_point; } - double m_distance; ResultType m_resultType; v2::RankingInfo m_info; diff --git a/search/search_integration_tests/search_query_v2_test.cpp b/search/search_integration_tests/search_query_v2_test.cpp index 1fbd71c49c..19d6262124 100644 --- a/search/search_integration_tests/search_query_v2_test.cpp +++ b/search/search_integration_tests/search_query_v2_test.cpp @@ -23,6 +23,14 @@ namespace search { namespace { +void MakeDefaultTestParams(string const & query, SearchParams & params) +{ + params.m_query = query; + params.m_inputLocale = "en"; + params.SetMode(Mode::Everywhere); + params.SetSuggestsEnabled(false); +} + class SearchQueryV2Test : public SearchTest { }; @@ -267,7 +275,6 @@ UNIT_CLASS_TEST(SearchQueryV2Test, TestRankingInfo) string const countryName = "Wonderland"; TestCity sanFrancisco(m2::PointD(1, 1), "San Francisco", "en", 100 /* rank */); - // Golden Gate Bridge-bridge is located in this test on the Golden // Gate Bridge-street. Therefore, there are several valid parses of // the query "Golden Gate Bridge", and search engine must return @@ -277,24 +284,35 @@ UNIT_CLASS_TEST(SearchQueryV2Test, TestRankingInfo) vector{m2::PointD(-0.5, -0.5), m2::PointD(0, 0), m2::PointD(0.5, 0.5)}, "Golden Gate Bridge", "en"); TestPOI goldenGateBridge(m2::PointD(0, 0), "Golden Gate Bridge", "en"); + TestPOI lermontov(m2::PointD(1, 1), "Лермонтовъ", "en"); + lermontov.SetTypes({{"amenity", "cafe"}}); + + // A city with two noname cafes. + TestCity lermontovo(m2::PointD(-1, -1), "Лермонтово", "en", 100 /* rank */); + TestPOI cafe1(m2::PointD(-1.01, -1.01), "", "en"); + cafe1.SetTypes({{"amenity", "cafe"}}); + TestPOI cafe2(m2::PointD(-0.99, -0.99), "", "en"); + cafe2.SetTypes({{"amenity", "cafe"}}); + auto worldId = BuildMwm("testWorld", feature::DataHeader::world, [&](TestMwmBuilder & builder) { builder.Add(sanFrancisco); + builder.Add(lermontovo); }); auto wonderlandId = BuildMwm(countryName, feature::DataHeader::country, [&](TestMwmBuilder & builder) { - builder.Add(goldenGateStreet); + builder.Add(cafe1); + builder.Add(cafe2); builder.Add(goldenGateBridge); + builder.Add(goldenGateStreet); + builder.Add(lermontov); }); SetViewport(m2::RectD(m2::PointD(-0.5, -0.5), m2::PointD(0.5, 0.5))); { SearchParams params; - params.m_query = "golden gate bridge "; - params.m_inputLocale = "en"; - params.SetMode(Mode::Everywhere); - params.SetSuggestsEnabled(false); + MakeDefaultTestParams("golden gate bridge ", params); TestSearchRequest request(m_engine, params, m_viewport); request.Wait(); @@ -310,6 +328,25 @@ UNIT_CLASS_TEST(SearchQueryV2Test, TestRankingInfo) TEST(my::AlmostEqualAbs(1.0, info.m_nameCoverage, 1e-6), (info.m_nameCoverage)); } } + + // This test is quite important and must always pass. + { + SearchParams params; + MakeDefaultTestParams("cafe лермонтов", params); + + TestSearchRequest request(m_engine, params, m_viewport); + request.Wait(); + + auto const & results = request.Results(); + + TRules rules{ExactMatch(wonderlandId, cafe1), ExactMatch(wonderlandId, cafe2), + ExactMatch(wonderlandId, lermontov)}; + TEST(MatchResults(m_engine, rules, results), ()); + + TEST_EQUAL(3, results.size(), ("Unexpected number of retrieved cafes.")); + auto const & top = results.front(); + TEST(MatchResults(m_engine, {ExactMatch(wonderlandId, lermontov)}, {top}), ()); + } } } // namespace } // namespace search diff --git a/search/search_query.cpp b/search/search_query.cpp index 08b55f88b5..413f575887 100644 --- a/search/search_query.cpp +++ b/search/search_query.cpp @@ -125,16 +125,25 @@ class IndexedValue : public search::IndexedValueBase shared_ptr m_val; double m_rank; + double m_distanceToPivot; public: explicit IndexedValue(unique_ptr v) - : m_val(move(v)), m_rank(m_val ? m_val->GetRankingInfo().GetLinearModelRank() : 0) + : m_val(move(v)), m_rank(0), m_distanceToPivot(numeric_limits::max()) { + if (!m_val) + return; + + auto const & info = m_val->GetRankingInfo(); + m_rank = info.GetLinearModelRank(); + m_distanceToPivot = info.m_distanceToPivot; } impl::PreResult2 const & operator*() const { return *m_val; } inline double GetRank() const { return m_rank; } + + inline double GetDistanceToPivot() const { return m_distanceToPivot; } }; string DebugPrint(IndexedValue const & value) @@ -523,15 +532,17 @@ void Query::FlushViewportResults(v2::Geocoder::Params const & params, Results & vector streets; MakePreResult2(params, indV, streets); + RemoveDuplicatingLinear(indV); if (indV.empty()) return; - RemoveDuplicatingLinear(indV); + sort(indV.begin(), indV.end(), my::CompareBy(&IndexedValue::GetDistanceToPivot)); for (size_t i = 0; i < indV.size(); ++i) { if (IsCancelled()) break; + res.AddResultNoChecks((*(indV[i])).GenerateFinalResult(m_infoGetter, &m_categories, &m_prefferedTypes, m_currentLocaleCode, m_reverseGeocoder)); } @@ -781,6 +792,9 @@ void Query::MakePreResult2(v2::Geocoder::Params const & params, vector & cont if (!p) continue; + if (params.m_mode == Mode::Viewport && !params.m_pivot.IsPointInside(p->GetCenter())) + continue; + if (p->IsStreet()) streets.push_back(p->GetID()); @@ -796,12 +810,10 @@ void Query::FlushResults(v2::Geocoder::Params const & params, Results & res, boo vector streets; MakePreResult2(params, indV, streets); - + RemoveDuplicatingLinear(indV); if (indV.empty()) return; - RemoveDuplicatingLinear(indV); - sort(indV.rbegin(), indV.rend(), my::CompareBy(&IndexedValue::GetRank)); // Do not process suggestions in additional search. diff --git a/search/search_tests_support/test_feature.cpp b/search/search_tests_support/test_feature.cpp index ffba68bcf0..a7dde4a388 100644 --- a/search/search_tests_support/test_feature.cpp +++ b/search/search_tests_support/test_feature.cpp @@ -52,7 +52,8 @@ void TestFeature::Serialize(FeatureBuilder1 & fb) const fb.SetTestId(m_id); if (m_hasCenter) fb.SetCenter(m_center); - CHECK(fb.AddName(m_lang, m_name), ("Can't set feature name:", m_name, "(", m_lang, ")")); + if (!m_name.empty()) + CHECK(fb.AddName(m_lang, m_name), ("Can't set feature name:", m_name, "(", m_lang, ")")); } // TestCountry ------------------------------------------------------------------------------------- @@ -155,13 +156,17 @@ string TestStreet::ToString() const TestPOI::TestPOI(m2::PointD const & center, string const & name, string const & lang) : TestFeature(center, name, lang) { + m_types = {{"railway", "station"}}; } void TestPOI::Serialize(FeatureBuilder1 & fb) const { TestFeature::Serialize(fb); auto const & classificator = classif(); - fb.SetType(classificator.GetTypeByPath({"railway", "station"})); + + for (auto const & path : m_types) + fb.SetType(classificator.GetTypeByPath(path)); + if (!m_houseNumber.empty()) fb.AddHouseNumber(m_houseNumber); if (!m_streetName.empty()) diff --git a/search/search_tests_support/test_feature.hpp b/search/search_tests_support/test_feature.hpp index 70c91944d5..242c1c0eba 100644 --- a/search/search_tests_support/test_feature.hpp +++ b/search/search_tests_support/test_feature.hpp @@ -94,10 +94,12 @@ public: inline void SetHouseNumber(string const & houseNumber) { m_houseNumber = houseNumber; } inline void SetStreet(TestStreet const & street) { m_streetName = street.GetName(); } + inline void SetTypes(vector> const & types) { m_types = types; } private: string m_houseNumber; string m_streetName; + vector> m_types; }; class TestBuilding : public TestFeature diff --git a/search/v2/geocoder.cpp b/search/v2/geocoder.cpp index 42ebc4c9e8..ef367a622b 100644 --- a/search/v2/geocoder.cpp +++ b/search/v2/geocoder.cpp @@ -548,7 +548,7 @@ void Geocoder::GoImpl(vector> & infos, bool inViewport) // found. size_t const numIntersectingMaps = OrderCountries(m_params.m_pivot, infos); - // MatchViewportAndPosition() should always be matched in mwms + // MatchAroundPivot() should always be matched in mwms // intersecting with position and viewport. auto const & cancellable = static_cast(*this); auto processCountry = [&](size_t index, unique_ptr context) diff --git a/search/v2/search_query_v2.cpp b/search/v2/search_query_v2.cpp index d623711c2b..02040088eb 100644 --- a/search/v2/search_query_v2.cpp +++ b/search/v2/search_query_v2.cpp @@ -59,6 +59,7 @@ void SearchQueryV2::SearchViewportPoints(Results & res) Geocoder::Params params; InitParams(false /* localitySearch */, params); params.m_pivot = m_viewport[CURRENT_V]; + params.m_accuratePivotCenter = params.m_pivot.Center(); params.m_maxNumResults = kPreResultsCount; m_geocoder.SetParams(params);