Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortatiana-yan <tatiana.kondakova@gmail.com>2021-04-14 10:24:56 +0300
committerOlga Khlopkova <mesozoic.drones@gmail.com>2021-04-22 09:54:35 +0300
commit1100e037aa20620e898a75009911d738eba7a07c (patch)
tree43ec655b5d444b76642eaf43f14e07377d8cb116
parent4840203dbc8f009b5ce99482b5fe6c7641ef4898 (diff)
[routing] Remove unused parameter.
-rw-r--r--routing/index_router.cpp9
-rw-r--r--routing/index_router.hpp5
2 files changed, 6 insertions, 8 deletions
diff --git a/routing/index_router.cpp b/routing/index_router.cpp
index 4d84384136..cab0fe7c1b 100644
--- a/routing/index_router.cpp
+++ b/routing/index_router.cpp
@@ -801,7 +801,7 @@ RouterResultCode IndexRouter::CalculateSubrouteJointsMode(
RoutingResult<Vertex, Weight> routingResult;
RouterResultCode const result =
- FindPath<Vertex, Edge, Weight>(params, {} /* mwmIds */, routingResult, WorldGraphMode::Joints);
+ FindPath<Vertex, Edge, Weight>(params, {} /* mwmIds */, routingResult);
if (result != RouterResultCode::NoError)
return result;
@@ -827,8 +827,7 @@ RouterResultCode IndexRouter::CalculateSubrouteNoLeapsMode(
RoutingResult<Vertex, Weight> routingResult;
set<NumMwmId> const mwmIds = starter.GetMwms();
- RouterResultCode const result =
- FindPath<Vertex, Edge, Weight>(params, mwmIds, routingResult, WorldGraphMode::NoLeaps);
+ RouterResultCode const result = FindPath<Vertex, Edge, Weight>(params, mwmIds, routingResult);
if (result != RouterResultCode::NoError)
return result;
@@ -863,7 +862,7 @@ RouterResultCode IndexRouter::CalculateSubrouteLeapsOnlyMode(
RoutingResult<Vertex, Weight> routingResult;
RouterResultCode const result =
- FindPath<Vertex, Edge, Weight>(params, {} /* mwmIds */, routingResult, WorldGraphMode::LeapsOnly);
+ FindPath<Vertex, Edge, Weight>(params, {} /* mwmIds */, routingResult);
progress->PushAndDropLastSubProgress();
@@ -1351,7 +1350,7 @@ RouterResultCode IndexRouter::ProcessLeapsJoints(vector<Segment> const & input,
nullptr /* prevRoute */, delegate.GetCancellable(), move(visitor),
AStarLengthChecker(starter));
- resultCode = FindPath<Vertex, Edge, Weight>(params, mwmIds, routingResult, mode);
+ resultCode = FindPath<Vertex, Edge, Weight>(params, mwmIds, routingResult);
return resultCode;
};
diff --git a/routing/index_router.hpp b/routing/index_router.hpp
index 8443991451..f5b5ecec1e 100644
--- a/routing/index_router.hpp
+++ b/routing/index_router.hpp
@@ -207,9 +207,8 @@ private:
}
template <typename Vertex, typename Edge, typename Weight, typename AStarParams>
- RouterResultCode FindPath(
- AStarParams & params, std::set<NumMwmId> const & mwmIds,
- RoutingResult<Vertex, Weight> & routingResult, WorldGraphMode mode) const
+ RouterResultCode FindPath(AStarParams & params, std::set<NumMwmId> const & mwmIds,
+ RoutingResult<Vertex, Weight> & routingResult) const
{
AStarAlgorithm<Vertex, Edge, Weight> algorithm;
return ConvertTransitResult(