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

[search marks] renaming used -> visited

Browse source
This commit is contained in:
Arsentiy Milchakov 2020-08-04 14:11:41 +03:00 • committed by Anatoliy V. Tomilov
parent 3c85bb6b55
commit d0984bf97f
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
map/framework.cpp
View file

@ -1857,7 +1857,7 @@ void Framework::FillSearchResultsMarks(search::Results::ConstIter begin,
m_searchMarks.MarkUnavailableIfNeeded(mark);
}
if (isFeature && m_searchMarks.IsUsed(mark->GetFeatureID()))
if (isFeature && m_searchMarks.IsVisited(mark->GetFeatureID()))
mark->SetVisited(true);
if (fn)
@ -4008,7 +4008,7 @@ void Framework::ShowViewportSearchResults(search::Results const & results, bool
void Framework::ClearViewportSearchResults()
{
m_searchMarks.ClearUsed();
m_searchMarks.ClearVisited();
m_searchMarks.ClearUnavailable();
GetBookmarkManager().GetEditSession().ClearGroup(UserMark::Type::SEARCH);
}

10
map/search_mark.cpp
View file

@ -727,21 +727,21 @@ void SearchMarks::OnDeactivate(FeatureID const & featureId)
return;
mark->SetVisited(true);
m_used.insert(featureId);
m_visited.insert(featureId);
mark->SetAvailable(true);
mark->SetReason({});
});
}
bool SearchMarks::IsUsed(FeatureID const & id) const
bool SearchMarks::IsVisited(FeatureID const & id) const
{
return m_used.find(id) != m_used.cend();
return m_visited.find(id) != m_visited.cend();
}
void SearchMarks::ClearUsed()
void SearchMarks::ClearVisited()
{
m_used.clear();
m_visited.clear();
}
void SearchMarks::SetUnavailable(FeatureID const & id, std::string const & reason)

6
map/search_mark.hpp
View file

@ -117,8 +117,8 @@ public:
void OnActivate(FeatureID const & featureId);
void OnDeactivate(FeatureID const & featureId);
bool IsUsed(FeatureID const & id) const;
void ClearUsed();
bool IsVisited(FeatureID const & id) const;
void ClearVisited();
void SetUnavailable(FeatureID const & id, std::string const & reason);
bool IsUnavailable(FeatureID const & id) const;
@ -136,6 +136,6 @@ private:
static std::map<std::string, m2::PointF> m_searchMarksSizes;
std::set<FeatureID> m_used;
std::set<FeatureID> m_visited;
std::map<FeatureID, std::string> m_unavailable;
};