organicmaps/geocore
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

[geocoder] Fix for integration tests: stable order of equal rank candidates

Browse source
This commit is contained in:
Anatoly Serdtcev 2019-11-29 16:48:48 +03:00 • committed by LaGrunge
parent fd63ea617c
commit 6d388bc614
2 changed files with 11 additions and 7 deletions

14
geocoder/geocoder.cpp
View file

@ -153,15 +153,19 @@ strings::UniString MakeHouseNumber(Tokens const & tokens)
} // namespace
// Geocoder::Layer ---------------------------------------------------------------------------------
Geocoder::Layer::Layer(Type type)
: m_type{type}
Geocoder::Layer::Layer(Index const & index, Type type)
: m_index{index}, m_type{type}
{
}
void Geocoder::Layer::SetCandidates(std::vector<Candidate> && candidates)
{
std::sort(candidates.begin(), candidates.end(), [](auto const & a, auto const & b) {
return a.m_totalCertainty < b.m_totalCertainty;
std::sort(candidates.begin(), candidates.end(), [this](auto const & a, auto const & b) {
if (a.m_totalCertainty < b.m_totalCertainty)
return true;
if (a.m_totalCertainty > b.m_totalCertainty)
return false;
return m_index.GetDoc(a.m_entry).m_osmId < m_index.GetDoc(b.m_entry).m_osmId;
});
m_candidatesByCertainty = std::move(candidates);
}
@ -418,7 +422,7 @@ void Geocoder::Go(Context & ctx, Type type) const
subquery.push_back(ctx.GetToken(j));
subqueryTokenIds.push_back(j);
Layer curLayer{type};
Layer curLayer{m_index, type};
// Buildings are indexed separately.
if (type == Type::Building)

4
geocoder/geocoder.hpp
View file

@ -57,8 +57,7 @@ public:
class Layer
{
public:
Layer() = default;
Layer(Type type);
Layer(Index const & index, Type type);
Type GetType() const noexcept { return m_type; }
std::vector<Candidate> const & GetCandidatesByCertainty() const noexcept
@ -68,6 +67,7 @@ public:
void SetCandidates(std::vector<Candidate> && candidates);
private:
Index const & m_index;
Type m_type{Type::Count};
std::vector<Candidate> m_candidatesByCertainty;
};