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

[search] Fix per the PVS-Studio report.

Browse source
This commit is contained in:
tatiana-yan 2020-05-08 14:56:30 +03:00 • committed by mpimenov
parent ff582ea91f
commit 4918b10ae3
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
search/geocoder.cpp
View file

@ -1521,7 +1521,7 @@ void Geocoder::FindPaths(BaseContext & ctx)
m_matcher->SetPostcodes(&m_postcodes.m_countryFeatures);
auto isExactMatch = [](BaseContext const & context, IntersectionResult const & result) {
bool regionsChecked = false;
bool haveRegion = false;
for (size_t i = 0; i < context.m_tokens.size(); ++i)
{
auto const tokenType = context.m_tokens[i];
@ -1545,15 +1545,18 @@ void Geocoder::FindPaths(BaseContext & ctx)
auto const isRegion = tokenType == BaseContext::TokenType::TOKEN_TYPE_STATE ||
tokenType == BaseContext::TokenType::TOKEN_TYPE_COUNTRY;
if (isRegion && !regionsChecked)
if (isRegion)
haveRegion = true;
}
if (haveRegion)
{
for (auto const & region : context.m_regions)
{
for (auto const & region : context.m_regions)
{
if (!region->m_exactMatch)
return false;
}
if (!region->m_exactMatch)
return false;
}
}
return true;
};