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

Fix #2833: Routing mode resets origin point to current location when re-opening the app

Browse source 
The application replaced the origin point solely based on if it had found the user's location. Added a parameter to the RouteMarkData struct which is saved alongside the start point. This is used on start up to determine if the origin point of the route should be kept or replaced with the user's location (if one is found).

Signed-off-by: Fábio Gomes <gabriel.gomes@tecnico.ulisboa.pt>
This commit is contained in:
Fábio Gomes 2024-04-02 15:52:58 +01:00 • committed by Roman Tsisyk
parent f22cfe0c36
commit 3cdb79fccb
2 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
map/routing_manager.cpp
View file

@ -103,6 +103,7 @@ RouteMarkData GetLastPassedPoint(BookmarkManager * bmManager, vector<RouteMarkDa
{
data.m_position = bmManager->MyPositionMark().GetPivot();
data.m_isMyPosition = false;
data.m_replaceWithMyPosition = true;
}
return data;
@ -116,6 +117,7 @@ void SerializeRoutePoint(json_t * node, RouteMarkData const & data)
ToJSONObject(*node, "subtitle", data.m_subTitle);
ToJSONObject(*node, "x", data.m_position.x);
ToJSONObject(*node, "y", data.m_position.y);
ToJSONObject(*node, "replaceWithMyPosition", data.m_replaceWithMyPosition);
}
RouteMarkData DeserializeRoutePoint(json_t * node)
@ -133,6 +135,8 @@ RouteMarkData DeserializeRoutePoint(json_t * node)
FromJSONObject(node, "x", data.m_position.x);
FromJSONObject(node, "y", data.m_position.y);
FromJSONObject(node, "replaceWithMyPosition", data.m_replaceWithMyPosition);
return data;
}
@ -1397,13 +1401,18 @@ void RoutingManager::LoadRoutePoints(LoadRouteHandler const & handler)
[this, handler, points = std::move(points)]() mutable
{
ASSERT(m_bmManager != nullptr, ());
// If we have found my position, we use my position as start point.
// If we have found my position and the saved route used the user's position, we use my position as start point.
bool routeUsedPosition = false;
auto const & myPosMark = m_bmManager->MyPositionMark();
auto editSession = m_bmManager->GetEditSession();
editSession.ClearGroup(UserMark::Type::ROUTING);
for (auto & p : points)
{
if (p.m_pointType == RouteMarkType::Start && myPosMark.HasPosition())
// Check if the saved route used the user's position
if (p.m_replaceWithMyPosition && p.m_pointType == RouteMarkType::Start)
routeUsedPosition = true;
if (p.m_replaceWithMyPosition && p.m_pointType == RouteMarkType::Start && myPosMark.HasPosition())
{
RouteMarkData startPt;
startPt.m_pointType = RouteMarkType::Start;
@ -1417,9 +1426,9 @@ void RoutingManager::LoadRoutePoints(LoadRouteHandler const & handler)
}
}
// If we don't have my position, save loading timestamp. Probably
// we will get my position soon.
if (!myPosMark.HasPosition())
// If we don't have my position and the saved route used it, save loading timestamp.
// Probably we will get my position soon.
if (routeUsedPosition && !myPosMark.HasPosition())
m_loadRoutePointsTimestamp = chrono::steady_clock::now();
if (handler)

1
map/routing_mark.hpp
View file

@ -22,6 +22,7 @@ struct RouteMarkData
bool m_isVisible = true;
bool m_isMyPosition = false;
bool m_isPassed = false;
bool m_replaceWithMyPosition = false;
m2::PointD m_position;
};