map-per/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[search] [assessment-tool] Changed the display of the user's position.

Browse source 
We used to call Framework's methods (OnLocationUpdate/OnLocationError)
here but they come bundled with an unremovable heuristic that keeps the
old position for some time when the position is lost.
This resulted in sometimes showing wrong positions for the samples that
do not have position info (the search params worked correctly
and were not using the old pos).
This commit is contained in:
Maxim Pimenov 2019-04-10 18:40:28 +03:00 • committed by Tatiana Yan
parent b393f055e3
commit a3b07b35a8
2 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
search/search_quality/assessment_tool/sample_view.cpp
View file

@ -58,6 +58,9 @@ void SetVerticalStretch(QWidget & widget, int stretch)
SampleView::SampleView(QWidget * parent, Framework & framework)
: QWidget(parent), m_framework(framework)
{
m_framework.GetBookmarkManager().GetEditSession().SetIsVisible(UserMark::Type::SEARCH, true);
m_framework.GetBookmarkManager().GetEditSession().SetIsVisible(UserMark::Type::COLORED, true);
auto * mainLayout = BuildLayout<QVBoxLayout>(this /* parent */);
// When the dock for SampleView is attached to the right side of the
@ -242,8 +245,6 @@ void SampleView::ShowNonFoundResults(std::vector<search::Sample::Result> const &
{
CHECK_EQUAL(results.size(), entries.size(), ());
m_framework.GetBookmarkManager().GetEditSession().SetIsVisible(UserMark::Type::SEARCH, true);
m_nonFoundResults->Clear();
bool allDeleted = true;
@ -343,10 +344,21 @@ void SampleView::OnRemoveNonFoundResult(int row) { m_nonFoundResultsEdits->Delet
void SampleView::ShowUserPosition(m2::PointD const & position)
{
m_framework.OnLocationUpdate(qt::common::MakeGpsInfo(position));
// Clear the old position.
HideUserPosition();
auto es = m_framework.GetBookmarkManager().GetEditSession();
auto mark = es.CreateUserMark<ColoredMarkPoint>(position);
mark->SetColor(dp::Color(200, 100, 240, 255) /* purple */);
mark->SetRadius(8.0f);
m_positionMarkId = mark->GetId();
}
void SampleView::HideUserPosition()
{
m_framework.OnLocationError(location::EGPSIsOff);
if (m_positionMarkId == kml::kInvalidMarkId)
return;
m_framework.GetBookmarkManager().GetEditSession().DeleteUserMark(m_positionMarkId);
m_positionMarkId = kml::kInvalidMarkId;
}

4
search/search_quality/assessment_tool/sample_view.hpp
View file

@ -6,6 +6,8 @@
#include "geometry/point2d.hpp"
#include "kml/type_utils.hpp"
#include <boost/optional.hpp>
#include <QtCore/QMargins>
@ -90,5 +92,7 @@ private:
QMargins m_rightAreaMargins;
QMargins m_defaultMargins;
kml::MarkId m_positionMarkId = kml::kInvalidMarkId;
boost::optional<m2::PointD> m_position;
};