kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

[cherry] [FABRIC-7708] Fixed special search marks for local ads and tinkoff objects.

Browse source 
# Conflicts:
#	map/framework.cpp
This commit is contained in:
Ilya Grechuhin 2017-05-25 16:04:28 +03:00
parent 311f736b66
commit 917eb4f5a5
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
map/framework.cpp
View file

@ -1748,7 +1748,8 @@ void Framework::FillSearchResultsMarks(search::Results::ConstIter begin,
SearchMarkPoint * mark =
static_cast<SearchMarkPoint *>(guard.m_controller.CreateUserMark(r.GetFeatureCenter()));
ASSERT_EQUAL(mark->GetMarkType(), UserMark::Type::SEARCH, ());
if (r.GetResultType() == search::Result::RESULT_FEATURE)
auto const isFeature = r.GetResultType() == search::Result::RESULT_FEATURE;
if (isFeature)
mark->SetFoundFeature(r.GetFeatureID());
mark->SetMatchedName(r.GetString());
@ -1756,7 +1757,7 @@ void Framework::FillSearchResultsMarks(search::Results::ConstIter begin,
mark->SetCustomSymbol("search-booking");
else if (r.m_metadata.m_isSponsoredBank)
mark->SetCustomSymbol("search-tinkoff");
else if (m_localAdsManager.Contains(r.GetFeatureID()))
else if (isFeature && m_localAdsManager.Contains(r.GetFeatureID()))
mark->SetCustomSymbol("search-adv");
}
}