organicmaps/organicmaps-tmp
Archived
13
Fork 1
Code Issues 2.7k Pull requests 182 Projects Releases 65 Wiki Activity Actions

Fixed filling of feature info in the place page.

Browse source
This commit is contained in:
Daria Volvenkova 2019-12-05 17:21:21 +03:00 • committed by Arsentiy Milchakov
parent 4f056354ee
commit aebf0da8a7
1 changed files with 11 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
map/framework.cpp
View file

@ -2560,23 +2560,19 @@ std::optional<place_page::Info> Framework::BuildPlacePageInfo(
selectedFeature = FindBuildingAtPoint(buildInfo.m_mercator);
bool showMapSelection = false;
if (buildInfo.m_isLongTap || buildInfo.m_source != place_page::BuildInfo::Source::User)
{
if (isFeatureMatchingEnabled)
{
FillPointInfo(outInfo, buildInfo.m_mercator, {});
if (!outInfo.IsFeature() && selectedFeature.IsValid())
FillFeatureInfo(selectedFeature, outInfo);
}
else
{
FillNotMatchedPlaceInfo(outInfo, buildInfo.m_mercator, {});
}
showMapSelection = true;
}
else if (selectedFeature.IsValid())
if (selectedFeature.IsValid())
{
FillFeatureInfo(selectedFeature, outInfo);
if (buildInfo.m_isLongTap)
outInfo.SetMercator(buildInfo.m_mercator);
showMapSelection = true;
}
else if (buildInfo.m_isLongTap || buildInfo.m_source != place_page::BuildInfo::Source::User)
{
if (isFeatureMatchingEnabled)
FillPointInfo(outInfo, buildInfo.m_mercator, {});
else
FillNotMatchedPlaceInfo(outInfo, buildInfo.m_mercator, {});
showMapSelection = true;
}