Response to code review

- Bundle `RouteStrategy` together with `Waypoints` into new structure
  `RouteWaypoint`
- Using `std::vector<RouteWaypoint>` in `FollorRouteControlStrategy` for
  enhanced waypoints, allowing to specify a `RouteStrategy` for every
  single waypoint.

Signed-off-by: Rene Paris <rene.paris@in-tech.com>

**FIXUP THIS COMMIT BEFORE MERGE**

MantleAPI/include/MantleAPI/Traffic/control_strategy.h

 /*******************************************************************************
- * Copyright (c) 2021, Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+ * Copyright (c) 2021-2022 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
  *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
@@ -58,6 +58,14 @@ enum class RouteStrategy
   kShortest
 };
 
+/// @brief Groups a Waypoint with a RouteStrategy
+///        for the \ref FollowRouteControlStrategy
+struct RouteWaypoint
+{
+  mantle_api::Vec3<units::length::meter_t> waypoint{};
+  RouteStrategy route_strategy{RouteStrategy::kUndefined};
+};
+
 struct ControlStrategy
 {
   virtual ~ControlStrategy() = default;
@@ -153,8 +161,7 @@ struct FollowRouteControlStrategy : public ControlStrategy
     type = ControlStrategyType::kFollowRoute;
   }
 
-  std::vector<mantle_api::Vec3<units::length::meter_t>> waypoints;
-  RouteStrategy route_strategy{RouteStrategy::kUndefined};
+  std::vector<RouteWaypoint> route_waypoints;
 };
 
 enum class Dimension