From 52b3873423b4af4444d0e685494c6014e0562b2b Mon Sep 17 00:00:00 2001 From: VladiMihaylenko Date: Mon, 19 Dec 2016 13:10:50 +0300 Subject: [PATCH] [omim] Filling feature's countryId in single place. --- map/framework.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/map/framework.cpp b/map/framework.cpp index 30e3d359dc..9ea3434ec5 100644 --- a/map/framework.cpp +++ b/map/framework.cpp @@ -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