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

[omim] Filling feature's countryId in single place.

Browse source
This commit is contained in:
VladiMihaylenko 2016-12-19 13:10:50 +03:00
parent ffecd1d9c1
commit 52b3873423
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
map/framework.cpp
View file

@ -760,7 +760,6 @@ bool Framework::DeleteBmCategory(size_t index)
void Framework::FillBookmarkInfo(Bookmark const & bmk, BookmarkAndCategory const & bac, place_page::Info & info) const
{
FillPointInfo(bmk.GetPivot(), string(), info);
info.m_countryId = m_infoGetter->GetRegionCountryId(info.GetMercator());
info.m_bac = bac;
BookmarkCategory * cat = GetBmCategory(bac.m_categoryIndex);
@ -794,8 +793,6 @@ void Framework::FillFeatureInfo(FeatureID const & fid, place_page::Info & info)
if (info.GetTypes().Has(placeContinentType))
return;
info.m_countryId = m_infoGetter->GetRegionCountryId(info.GetMercator());
uint32_t const placeCountryType = classif().GetTypeByPath({"place", "country"});
uint32_t const placeStateType = classif().GetTypeByPath({"place", "state"});
@ -2144,6 +2141,7 @@ void Framework::OnTapEvent(TapEvent const & tapEvent)
GetPlatform().GetMarketingService().SendMarketingEvent(marketing::kPlacepageHotelBook, {{"provider", "booking.com"}});
}
info.m_countryId = m_infoGetter->GetRegionCountryId(info.GetMercator());
ActivateMapSelection(true, selection, info);
}
else