From 4558081e8e881222cdab23097d316df768d476fe Mon Sep 17 00:00:00 2001 From: tatiana-yan Date: Tue, 30 Jul 2019 18:54:34 +0300 Subject: [PATCH] [search] Allow housenumber prefix matching in both directions. --- search/house_numbers_matcher.cpp | 3 +- .../processor_test.cpp | 60 +++++++++++++++---- .../house_numbers_matcher_test.cpp | 9 ++- 3 files changed, 57 insertions(+), 15 deletions(-) diff --git a/search/house_numbers_matcher.cpp b/search/house_numbers_matcher.cpp index 2e48c07174..16dea94340 100644 --- a/search/house_numbers_matcher.cpp +++ b/search/house_numbers_matcher.cpp @@ -553,7 +553,8 @@ bool HouseNumbersMatch(strings::UniString const & houseNumber, vector con if (parse.empty()) continue; if (parse[0] == queryParse[0] && - IsSubsequence(parse.begin() + 1, parse.end(), queryParse.begin() + 1, queryParse.end())) + (IsSubsequence(parse.begin() + 1, parse.end(), queryParse.begin() + 1, queryParse.end()) || + IsSubsequence(queryParse.begin() + 1, queryParse.end(), parse.begin() + 1, parse.end()))) { return true; } diff --git a/search/search_integration_tests/processor_test.cpp b/search/search_integration_tests/processor_test.cpp index 1e2107f42a..10c17f66b0 100644 --- a/search/search_integration_tests/processor_test.cpp +++ b/search/search_integration_tests/processor_test.cpp @@ -595,35 +595,41 @@ UNIT_CLASS_TEST(ProcessorTest, TestHouseNumbers) TestCity greenCity(m2::PointD(0, 0), "Зеленоград", "ru", 100 /* rank */); TestStreet street( - vector{m2::PointD(0.0, -10.0), m2::PointD(0, 0), m2::PointD(5.0, 5.0)}, + vector{m2::PointD(-5.0, -5.0), m2::PointD(0, 0), m2::PointD(5.0, 5.0)}, "Генерала Генералова", "ru"); - TestBuilding building0(m2::PointD(2.0, 2.0), "", "100", "en"); - TestBuilding building1(m2::PointD(3.0, 3.0), "", "к200", "ru"); - TestBuilding building2(m2::PointD(4.0, 4.0), "", "300 строение 400", "ru"); + TestBuilding building100(m2::PointD(2.0, 2.0), "", "100", "en"); + TestBuilding building200(m2::PointD(3.0, 3.0), "", "к200", "ru"); + TestBuilding building300(m2::PointD(4.0, 4.0), "", "300 строение 400", "ru"); + TestBuilding building115(m2::PointD(1.0, 1.0), "", "115", "en"); + TestBuilding building115k1(m2::PointD(-1.0, -1.0), "", "115к1", "en"); BuildWorld([&](TestMwmBuilder & builder) { builder.Add(greenCity); }); auto countryId = BuildCountry(countryName, [&](TestMwmBuilder & builder) { builder.Add(street); - builder.Add(building0); - builder.Add(building1); - builder.Add(building2); + builder.Add(building100); + builder.Add(building200); + builder.Add(building300); + builder.Add(building115); + builder.Add(building115k1); }); + SetViewport(m2::RectD(m2::PointD(-1.0, -1.0), m2::PointD(1.0, 1.0))); + { - Rules rules{ExactMatch(countryId, building0), ExactMatch(countryId, street)}; + Rules rules{ExactMatch(countryId, building100), ExactMatch(countryId, street)}; TEST(ResultsMatch("Зеленоград генералова к100 ", "ru", rules), ()); } { - Rules rules{ExactMatch(countryId, building1), ExactMatch(countryId, street)}; + Rules rules{ExactMatch(countryId, building200), ExactMatch(countryId, street)}; TEST(ResultsMatch("Зеленоград генералова к200 ", "ru", rules), ()); } { - Rules rules{ExactMatch(countryId, building1), ExactMatch(countryId, street)}; + Rules rules{ExactMatch(countryId, building200), ExactMatch(countryId, street)}; TEST(ResultsMatch("Зеленоград к200 генералова ", "ru", rules), ()); } { - Rules rules{ExactMatch(countryId, building2), ExactMatch(countryId, street)}; + Rules rules{ExactMatch(countryId, building300), ExactMatch(countryId, street)}; TEST(ResultsMatch("Зеленоград 300 строение 400 генералова ", "ru", rules), ()); } { @@ -631,9 +637,37 @@ UNIT_CLASS_TEST(ProcessorTest, TestHouseNumbers) TEST(ResultsMatch("Зеленоград генералова строе 300", "ru", rules), ()); } { - Rules rules{ExactMatch(countryId, building2), ExactMatch(countryId, street)}; + Rules rules{ExactMatch(countryId, building300), ExactMatch(countryId, street)}; TEST(ResultsMatch("Зеленоград генералова 300 строе", "ru", rules), ()); } + { + auto request = MakeRequest("Зеленоград Генерала Генералова 115 ", "ru"); + + // Test exact matching result ranked first. + auto const & results = request->Results(); + TEST_GREATER(results.size(), 0, (results)); + TEST(ResultMatches(results[0], ExactMatch(countryId, building115)), (results)); + + Rules rules{ExactMatch(countryId, building115), ExactMatch(countryId, building115k1), + ExactMatch(countryId, street)}; + TEST(ResultsMatch(results, rules), ()); + } + { + auto request = MakeRequest("Зеленоград Генерала Генералова 115к1 ", "ru"); + + // Test exact matching result ranked first. + auto const & results = request->Results(); + TEST_GREATER(results.size(), 0, (results)); + TEST(ResultMatches(results[0], ExactMatch(countryId, building115k1)), (results)); + + Rules rules{ExactMatch(countryId, building115k1), ExactMatch(countryId, building115), + ExactMatch(countryId, street)}; + TEST(ResultsMatch(results, rules), ()); + } + { + Rules rules{ExactMatch(countryId, building115), ExactMatch(countryId, street)}; + TEST(ResultsMatch("Зеленоград Генерала Генералова 115к2 ", "ru", rules), ()); + } } UNIT_CLASS_TEST(ProcessorTest, TestPostcodes) @@ -2267,7 +2301,7 @@ UNIT_CLASS_TEST(ProcessorTest, StreetPostcodes) { Rules rules{ExactMatch(countryId, building4), ExactMatch(countryId, street)}; // Test that we do not require the building to have a postcode if the street has. - TEST(ResultsMatch("Rue des Serpents 4 67390 ", "ru", rules), ()); + TEST(ResultsMatch("4 Rue des Serpents 67390 ", "ru", rules), ()); } { Rules rules{ExactMatch(countryId, street)}; diff --git a/search/search_tests/house_numbers_matcher_test.cpp b/search/search_tests/house_numbers_matcher_test.cpp index e467528278..29dea8d741 100644 --- a/search/search_tests/house_numbers_matcher_test.cpp +++ b/search/search_tests/house_numbers_matcher_test.cpp @@ -126,9 +126,16 @@ UNIT_TEST(HouseNumbersMatcher_Smoke) TEST(HouseNumbersMatch("3/7 с1Б", "3/7 строение 1 Б", false /* queryIsPrefix */), ()); TEST(!HouseNumbersMatch("3/7 с1Б", "3/7 с 1Д", false /* queryIsPrefix */), ()); - TEST(!HouseNumbersMatch("39", "39 с 79"), ()); + TEST(HouseNumbersMatch("39с80", "39"), ()); + TEST(HouseNumbersMatch("39", "39 с 80"), ()); + TEST(!HouseNumbersMatch("39 c 80", "39 с 79"), ()); + TEST(!HouseNumbersMatch("39 c 79", "39 с 80"), ()); + TEST(!HouseNumbersMatch("6 корпус 2", "7"), ()); TEST(!HouseNumbersMatch("10/42 корпус 2", "42"), ()); + + TEST(HouseNumbersMatch("22", "22к"), ()); + TEST(HouseNumbersMatch("22к", "22"), ()); TEST(!HouseNumbersMatch("22к", "22я"), ()); TEST(!HouseNumbersMatch("22к", "22л"), ());