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

[search] Update name score with IATA airport code.

Browse source
This commit is contained in:
tatiana-yan 2018-10-10 13:28:12 +03:00 • committed by mpimenov
parent 2ece0f456f
commit f5529809dd
2 changed files with 56 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
search/ranker.cpp
View file

@ -13,6 +13,7 @@
#include "indexer/data_source.hpp"
#include "indexer/feature_algo.hpp"
#include "indexer/ftypes_matcher.hpp"
#include "indexer/search_string_utils.hpp"
#include "platform/preferred_languages.hpp"
@ -77,6 +78,13 @@ NameScores GetNameScores(FeatureType & ft, Geocoder::Params const & params,
if (type == Model::TYPE_BUILDING)
UpdateNameScores(ft.GetHouseNumber(), sliceNoCategories, bestScores);
if (ftypes::IsAirportChecker::Instance()(ft))
{
string const iata = ft.GetMetadata().Get(feature::Metadata::FMD_AIRPORT_IATA);
if (!iata.empty())
UpdateNameScores(iata, sliceNoCategories, bestScores);
}
return bestScores;
}

48
search/search_integration_tests/processor_test.cpp
View file

@ -92,6 +92,29 @@ public:
private:
string m_cuisine;
};
class TestAirport : public TestPOI
{
public:
TestAirport(m2::PointD const & center, string const & name, string const & lang, string const & iata)
: TestPOI(center, name, lang), m_iata(iata)
{
SetTypes({{"aeroway", "aerodrome"}});
}
// TestPOI overrides:
void Serialize(FeatureBuilder1 & fb) const override
{
TestPOI::Serialize(fb);
auto & metadata = fb.GetMetadataForTesting();
metadata.Set(feature::Metadata::FMD_AIRPORT_IATA, m_iata);
}
private:
string m_iata;
};
class ProcessorTest : public SearchTest
{
};
@ -1503,5 +1526,30 @@ UNIT_CLASS_TEST(ProcessorTest, CuisineMetadataTest)
TEST(ResultsMatch("tapas ", "en", rules), ());
}
}
UNIT_CLASS_TEST(ProcessorTest, AirportTest)
{
string const countryName = "Wonderland";
TestAirport vko(m2::PointD(1.0, 1.0), "Useless name", "en", "VKO");
TestAirport svo(m2::PointD(1.0, 1.0), "Useless name", "en", "SVO");
auto countryId = BuildCountry(countryName, [&](TestMwmBuilder & builder) {
builder.Add(vko);
builder.Add(svo);
});
SetViewport(m2::RectD(-1, -1, 1, 1));
{
TRules rules{ExactMatch(countryId, vko)};
TEST(ResultsMatch("vko ", "en", rules), ());
}
{
TRules rules{ExactMatch(countryId, svo)};
TEST(ResultsMatch("svo ", "en", rules), ());
}
}
} // namespace
} // namespace search