kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

Merge pull request #3577 from mpimenov/feature-is-housenumber

Browse source 
[search] Removed one aggressive house number check and replaced another.
This commit is contained in:
ygorshenin 2016-06-16 12:17:40 +03:00 • committed by GitHub
commit 01db5017dc
4 changed files with 54 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
search/features_layer_matcher.hpp
View file

@ -255,12 +255,6 @@ private:
if (m_postcodes && !m_postcodes->GetBit(id))
return false;
// HouseNumbersMatch() calls are expensive, so following code
// tries to reduce the number of calls. The most important
// optimization: as first tokens from the house-number part of
// the query and feature's house numbers must be numbers, their
// first symbols must be the same.
if (!loaded)
{
GetByIndex(id, feature);
@ -271,8 +265,6 @@ private:
return false;
strings::UniString const houseNumber(strings::MakeUniString(feature.GetHouseNumber()));
if (!feature::IsHouseNumber(houseNumber))
return false;
return house_numbers::HouseNumbersMatch(houseNumber, queryParse);
};

3
search/geocoder.cpp
View file

@ -1095,7 +1095,8 @@ void Geocoder::GreedilyMatchStreets()
if (IsStreetSynonymPrefix(token))
continue;
if (feature::IsHouseNumber(token))
bool const isPrefix = curToken >= m_params.m_tokens.size();
if (house_numbers::LooksLikeHouseNumber(token, isPrefix))
{
CreateStreetsLayerAndMatchLowerLayers(startToken, curToken, allFeatures);
lastStopToken = curToken;

48
search/search_integration_tests/processor_test.cpp
View file

@ -366,6 +366,54 @@ UNIT_CLASS_TEST(ProcessorTest, TestRankingInfo)
}
}
UNIT_CLASS_TEST(ProcessorTest, TestHouseNumbers)
{
string const countryName = "HouseNumberLand";
TestCity greenCity(m2::PointD(0, 0), "Зеленоград", "ru", 100 /* rank */);
TestStreet street(
vector<m2::PointD>{m2::PointD(0.0, -10.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");
BuildWorld([&](TestMwmBuilder & builder) { builder.Add(greenCity); });
auto countryId = BuildCountry(countryName, [&](TestMwmBuilder & builder) {
builder.Add(street);
builder.Add(building0);
builder.Add(building1);
builder.Add(building2);
});
{
TRules rules{ExactMatch(countryId, building0)};
TEST(ResultsMatch("Зеленоград генералова к100", "ru", rules), ());
}
{
TRules rules{ExactMatch(countryId, building1)};
TEST(ResultsMatch("Зеленоград генералова к200", "ru", rules), ());
}
{
TRules rules{ExactMatch(countryId, building1)};
TEST(ResultsMatch("Зеленоград к200 генералова", "ru", rules), ());
}
{
TRules rules{ExactMatch(countryId, building2)};
TEST(ResultsMatch("Зеленоград 300 строение 400 генералова", "ru", rules), ());
}
{
TRules rules{};
TEST(ResultsMatch("Зеленоград генералова строе 300", "ru", rules), ());
}
{
TRules rules{ExactMatch(countryId, building2)};
TEST(ResultsMatch("Зеленоград генералова 300 строе", "ru", rules), ());
}
}
UNIT_CLASS_TEST(ProcessorTest, TestPostcodes)
{
string const countryName = "Russia";

4
search/search_tests/house_numbers_matcher_test.cpp
View file

@ -157,6 +157,10 @@ UNIT_TEST(LooksLikeHouseNumber_Smoke)
TEST(LooksLikeHouseNumber("39 строе", true /* isPrefix */), ());
TEST(!LooksLikeHouseNumber("39 строе", false /* isPrefix */), ());
TEST(LooksLikeHouseNumber("39", true /* isPrefix */), ());
TEST(LooksLikeHouseNumber("39", false /* isPrefix */), ());
TEST(LooksLikeHouseNumber("строе", true /* isPrefix */), ());
TEST(!LooksLikeHouseNumber("строе", false /* isPrefix */), ());
TEST(LooksLikeHouseNumber("дом ", true /* isPrefix */), ());
TEST(LooksLikeHouseNumber("дом ", false /* isPrefix */), ());