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

fixes according to code review(2)

Browse source
This commit is contained in:
rachytski 2013-01-03 19:44:49 +03:00 • committed by Alex Zolotarev
parent 6087ee4774
commit 1878035520
1 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
map/framework.cpp
View file

@ -1426,30 +1426,29 @@ bool Framework::GetVisiblePOI(m2::PointD const & pxPoint, m2::PointD & pxPivot,
shared_ptr<ElementT> elem = GetClosestToPivot(candidates, pt);
/// cloning element to avoid it's modification after FrameUnlock.
ElementT::UserInfo ui;
if (elem)
elem.reset(elem->clone(math::Identity<double, 3>()));
ui = elem->userInfo();
m_renderPolicy->FrameUnlock();
if (elem)
if (ui.IsValid())
{
ElementT::UserInfo const & ui = elem->userInfo();
if (ui.IsValid())
{
Index::FeaturesLoaderGuard guard(m_model.GetIndex(), ui.m_mwmID);
Index::FeaturesLoaderGuard guard(m_model.GetIndex(), ui.m_mwmID);
FeatureType ft;
guard.GetFeature(ui.m_offset, ft);
FeatureType ft;
guard.GetFeature(ui.m_offset, ft);
// @TODO experiment with other pivots
ASSERT_NOT_EQUAL(ft.GetFeatureType(), feature::GEOM_LINE, ());
m2::PointD const center = feature::GetCenter(ft);
// @TODO experiment with other pivots
ASSERT_NOT_EQUAL(ft.GetFeatureType(), feature::GEOM_LINE, ());
m2::PointD const center = feature::GetCenter(ft);
GetAddressInfo(ft, center, info);
GetAddressInfo(ft, center, info);
pxPivot = GtoP(center);
return true;
}
pxPivot = GtoP(center);
return true;
}
return false;