From 7329b3fc81a17a0ce2a96a25909b428556d07239 Mon Sep 17 00:00:00 2001
From: Viktor Govako <viktor.govako@gmail.com>
Date: Tue, 25 Jan 2022 18:18:19 +0300
Subject: [PATCH] [routing] Use "avoid roads" setting for all vehicle types
 (car, bicycle, pedestrian).

Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
---
 routing/index_graph_loader.cpp         | 2 +-
 routing/index_router.cpp               | 9 +++------
 routing/single_vehicle_world_graph.hpp | 2 +-
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/routing/index_graph_loader.cpp b/routing/index_graph_loader.cpp
index 56f3e9177e..d3100aba1f 100644
--- a/routing/index_graph_loader.cpp
+++ b/routing/index_graph_loader.cpp
@@ -64,7 +64,7 @@ private:
   unordered_map<NumMwmId, map<SegmentCoord, vector<RouteSegment::SpeedCamera>>> m_cachedCameras;
   decltype(m_cachedCameras)::iterator ReceiveSpeedCamsFromMwm(NumMwmId numMwmId);
 
-  RoutingOptions m_avoidRoutingOptions = RoutingOptions();
+  RoutingOptions m_avoidRoutingOptions;
   std::function<time_t()> m_currentTimeGetter = [time = GetCurrentTimestamp()]() {
     return time;
   };
diff --git a/routing/index_router.cpp b/routing/index_router.cpp
index 6a59079120..92059a54c6 100644
--- a/routing/index_router.cpp
+++ b/routing/index_router.cpp
@@ -954,12 +954,9 @@ RouterResultCode IndexRouter::AdjustRoute(Checkpoints const & checkpoints,
 
 unique_ptr<WorldGraph> IndexRouter::MakeWorldGraph()
 {
-  RoutingOptions routingOptions;
-  if (m_vehicleType == VehicleType::Car)
-  {
-    routingOptions = RoutingOptions::LoadCarOptionsFromSettings();
-    LOG(LINFO, ("Avoid next roads:", routingOptions));
-  }
+  // Use saved routing options for all types (car, bicycle, pedestrian).
+  RoutingOptions const routingOptions = RoutingOptions::LoadCarOptionsFromSettings();
+  LOG(LINFO, ("Avoid next roads:", routingOptions));
 
   auto crossMwmGraph = make_unique<CrossMwmGraph>(
       m_numMwmIds, m_numMwmTree, m_vehicleModelFactory,
diff --git a/routing/single_vehicle_world_graph.hpp b/routing/single_vehicle_world_graph.hpp
index 59c1e8f183..7456ab99ff 100644
--- a/routing/single_vehicle_world_graph.hpp
+++ b/routing/single_vehicle_world_graph.hpp
@@ -129,7 +129,7 @@ private:
   std::unique_ptr<CrossMwmGraph> m_crossMwmGraph;
   std::unique_ptr<IndexGraphLoader> m_loader;
   std::shared_ptr<EdgeEstimator> m_estimator;
-  RoutingOptions m_avoidRoutingOptions = RoutingOptions();
+  RoutingOptions m_avoidRoutingOptions;
   WorldGraphMode m_mode = WorldGraphMode::NoLeaps;
 
   template <typename Vertex>