From 386e99b8c9ff6d1e64b1d42225d96567b9ccef51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A1bio=20Gomes?= Date: Thu, 25 Apr 2024 10:45:47 +0100 Subject: [PATCH] [routing] Update m_replaceWithMyPosition variable name Change name to m_replaceWithMyPositionAfterRestart in accordance to what was suggested in my previous PR MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Fábio Gomes --- map/routing_manager.cpp | 10 +++++----- map/routing_mark.hpp | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/map/routing_manager.cpp b/map/routing_manager.cpp index d59fb69abc..537a35e463 100644 --- a/map/routing_manager.cpp +++ b/map/routing_manager.cpp @@ -103,7 +103,7 @@ RouteMarkData GetLastPassedPoint(BookmarkManager * bmManager, vectorMyPositionMark().GetPivot(); data.m_isMyPosition = false; - data.m_replaceWithMyPosition = true; + data.m_replaceWithMyPositionAfterRestart = true; } return data; @@ -117,7 +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); + ToJSONObject(*node, "replaceWithMyPosition", data.m_replaceWithMyPositionAfterRestart); } RouteMarkData DeserializeRoutePoint(json_t * node) @@ -135,7 +135,7 @@ 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); + FromJSONObject(node, "replaceWithMyPosition", data.m_replaceWithMyPositionAfterRestart); return data; } @@ -1409,10 +1409,10 @@ void RoutingManager::LoadRoutePoints(LoadRouteHandler const & handler) for (auto & p : points) { // Check if the saved route used the user's position - if (p.m_replaceWithMyPosition && p.m_pointType == RouteMarkType::Start) + if (p.m_replaceWithMyPositionAfterRestart && p.m_pointType == RouteMarkType::Start) routeUsedPosition = true; - if (p.m_replaceWithMyPosition && p.m_pointType == RouteMarkType::Start && myPosMark.HasPosition()) + if (p.m_replaceWithMyPositionAfterRestart && p.m_pointType == RouteMarkType::Start && myPosMark.HasPosition()) { RouteMarkData startPt; startPt.m_pointType = RouteMarkType::Start; diff --git a/map/routing_mark.hpp b/map/routing_mark.hpp index e2d0007add..a77764fefb 100644 --- a/map/routing_mark.hpp +++ b/map/routing_mark.hpp @@ -22,7 +22,7 @@ struct RouteMarkData bool m_isVisible = true; bool m_isMyPosition = false; bool m_isPassed = false; - bool m_replaceWithMyPosition = false; + bool m_replaceWithMyPositionAfterRestart = false; m2::PointD m_position; };