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

[iOS] Fixed point selection in new p2p mode

Browse source
This commit is contained in:
r.kuznetsov 2017-06-09 21:53:41 +03:00 • committed by Ilya Grechuhin
parent 3380a8f5a9
commit b0af73a13f
3 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
iphone/Maps/Core/Routing/MWMRouter.mm
View file

@ -165,6 +165,7 @@ m2::PointD getMercator(MWMRoutePoint * p)
auto points = rm.GetRoutePoints();
if (points.empty())
{
// No more than 1 point exist.
if (type == RouteMarkType::Start)
self.startPoint = zeroRoutePoint();
else if (type == RouteMarkType::Finish)
@ -172,8 +173,13 @@ m2::PointD getMercator(MWMRoutePoint * p)
}
else
{
self.startPoint = routePoint(points.front());
self.finishPoint = routePoint(points.back());
// At least 2 points exist, one of them may (or may not) be my position.
self.startPoint = rm.IsMyPosition(RouteMarkType::Start) ?
routePoint(points.front()) :
routePoint(points.front(), nil);
self.finishPoint = rm.IsMyPosition(RouteMarkType::Finish) ?
routePoint(points.back()) :
routePoint(points.back(), nil);
}
}

8
map/routing_manager.cpp
View file

@ -314,6 +314,14 @@ void RoutingManager::HideRoutePoint(RouteMarkType type, int8_t intermediateIndex
}
}
bool RoutingManager::IsMyPosition(RouteMarkType type, int8_t intermediateIndex)
{
UserMarkControllerGuard guard(*m_bmManager, UserMarkType::ROUTING_MARK);
RoutePointsLayout routePoints(guard.m_controller);
RouteMarkPoint * mark = routePoints.GetRoutePoint(type, intermediateIndex);
return mark != nullptr ? mark->IsMyPosition() : false;
}
std::vector<m2::PointD> RoutingManager::GetRoutePoints() const
{
std::vector<m2::PointD> result;

1
map/routing_manager.hpp
View file

@ -161,6 +161,7 @@ public:
RouteMarkType targetType, int8_t targetIntermediateIndex);
void HideRoutePoint(RouteMarkType type, int8_t intermediateIndex = 0);
bool CouldAddIntermediatePoint() const;
bool IsMyPosition(RouteMarkType type, int8_t intermediateIndex = 0);
void SetRouterImpl(routing::RouterType type);
void RemoveRoute(bool deactivateFollowing);