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

Review fixes.

Browse source
This commit is contained in:
vng 2016-03-18 13:15:08 +03:00 • committed by Sergey Yershov
parent f2f6dd9cf9
commit b7ec276112
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
search/locality_finder.cpp
View file

@ -122,8 +122,8 @@ void LocalityFinder::UpdateCache(Cache & cache, m2::PointD const & pt) const
for (auto const & info : mwmsInfo)
{
Index::MwmHandle handle = m_pIndex->GetMwmHandleById(info);
MwmValue const * pMwm = handle.GetValue<MwmValue>();
if (pMwm && pMwm->GetHeader().GetType() == feature::DataHeader::world)
MwmValue const * value = handle.GetValue<MwmValue>();
if (handle.IsAlive() && value->GetHeader().GetType() == feature::DataHeader::world)
{
cache.m_rect = rect;
v2::MwmContext(move(handle)).ForEachFeature(rect, DoLoader(*this, cache));
@ -134,19 +134,19 @@ void LocalityFinder::UpdateCache(Cache & cache, m2::PointD const & pt) const
void LocalityFinder::GetLocality(m2::PointD const & pt, string & name)
{
Cache * pWorking = nullptr;
Cache * working = nullptr;
// Find suitable cache that includes needed point.
for (auto & cache : m_caches)
{
if (cache.m_rect.IsPointInside(pt))
{
pWorking = &cache;
working = &cache;
break;
}
}
if (pWorking == nullptr)
if (working == nullptr)
{
// Find most unused cache.
size_t minUsage = numeric_limits<size_t>::max();
@ -154,17 +154,17 @@ void LocalityFinder::GetLocality(m2::PointD const & pt, string & name)
{
if (cache.m_usage < minUsage)
{
pWorking = &cache;
working = &cache;
minUsage = cache.m_usage;
}
}
pWorking->Clear();
ASSERT(working, ());
working->Clear();
}
ASSERT(pWorking, ());
UpdateCache(*pWorking, pt);
pWorking->GetLocality(pt, name);
UpdateCache(*working, pt);
working->GetLocality(pt, name);
}
void LocalityFinder::ClearCache()