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

[geocoder] Fix result items add

Browse source
This commit is contained in:
Anatoly Serdtcev 2019-01-31 12:51:04 +03:00 • committed by Sergey Yershov
parent 3482321180
commit cd9d7708ce
2 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
geocoder/geocoder.cpp
View file

@ -133,9 +133,9 @@ bool Geocoder::Context::IsTokenUsed(size_t id) const
bool Geocoder::Context::AllTokensUsed() const { return m_numUsedTokens == m_tokens.size(); }
void Geocoder::Context::AddResult(base::GeoObjectId const & osmId, double certainty, Type type,
vector<Type> && allTypes, bool allTokensUsed)
vector<Type> const & allTypes, bool allTokensUsed)
{
m_beam.Add(BeamKey(osmId, type, move(allTypes), allTokensUsed), certainty);
m_beam.Add(BeamKey(osmId, type, allTypes, allTokensUsed), certainty);
}
void Geocoder::Context::FillResults(vector<Result> & results) const
@ -271,10 +271,7 @@ void Geocoder::Go(Context & ctx, Type type) const
}
for (auto const & docId : curLayer.m_entries)
{
ctx.AddResult(m_index.GetDoc(docId).m_osmId, certainty, type, move(allTypes),
ctx.AllTokensUsed());
}
ctx.AddResult(m_index.GetDoc(docId).m_osmId, certainty, type, allTypes, ctx.AllTokensUsed());
ctx.GetLayers().emplace_back(move(curLayer));
SCOPE_GUARD(pop, [&] { ctx.GetLayers().pop_back(); });

4
geocoder/geocoder.hpp
View file

@ -52,7 +52,7 @@ public:
public:
struct BeamKey
{
BeamKey(base::GeoObjectId osmId, Type type, std::vector<Type> && allTypes, bool allTokensUsed)
BeamKey(base::GeoObjectId osmId, Type type, std::vector<Type> const & allTypes, bool allTokensUsed)
: m_osmId(osmId)
, m_type(type)
, m_allTypes(std::move(allTypes))
@ -88,7 +88,7 @@ public:
bool AllTokensUsed() const;
void AddResult(base::GeoObjectId const & osmId, double certainty, Type type,
std::vector<Type> && allTypes, bool allTokensUsed);
std::vector<Type> const & allTypes, bool allTokensUsed);
void FillResults(std::vector<Result> & results) const;