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

Remove the "my position" route mark before inserting of another "my position" mark.

Browse source
This commit is contained in:
Daria Volvenkova 2017-08-31 17:51:13 +03:00 • committed by Vladimir Byko-Ianko
parent a66f468812
commit a51279bbde
3 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
map/routing_manager.cpp
View file

@ -590,6 +590,13 @@ void RoutingManager::AddRoutePoint(RouteMarkData && markData)
if (markData.m_pointType == RouteMarkType::Start || markData.m_pointType == RouteMarkType::Finish)
routePoints.RemoveRoutePoint(markData.m_pointType);
if (markData.m_isMyPosition)
{
RouteMarkPoint * mark = routePoints.GetMyPositionPoint();
if (mark != nullptr)
routePoints.RemoveRoutePoint(mark->GetRoutePointType(), mark->GetIntermediateIndex());
}
markData.m_isVisible = !markData.m_isMyPosition;
routePoints.AddRoutePoint(move(markData));
ReorderIntermediatePoints();

11
map/routing_mark.cpp
View file

@ -305,6 +305,17 @@ RouteMarkPoint * RoutePointsLayout::GetRoutePoint(RouteMarkType type, size_t int
return nullptr;
}
RouteMarkPoint * RoutePointsLayout::GetMyPositionPoint()
{
for (size_t i = 0, sz = m_routeMarks.GetUserMarkCount(); i < sz; ++i)
{
RouteMarkPoint * mark = GetRouteMarkForEdit(i);
if (mark->IsMyPosition())
return mark;
}
return nullptr;
}
std::vector<RouteMarkPoint *> RoutePointsLayout::GetRoutePoints()
{
std::vector<RouteMarkPoint *> points;

1
map/routing_mark.hpp
View file

@ -88,6 +88,7 @@ public:
RouteMarkPoint * AddRoutePoint(RouteMarkData && data);
RouteMarkPoint * GetRoutePoint(RouteMarkType type, size_t intermediateIndex = 0);
RouteMarkPoint * GetMyPositionPoint();
std::vector<RouteMarkPoint *> GetRoutePoints();
size_t GetRoutePointsCount() const;
bool RemoveRoutePoint(RouteMarkType type, size_t intermediateIndex = 0);