Big Restructuring / Cleanup

include/engine/api/json_factory.hpp

@@ -1,7 +1,7 @@
 #ifndef ENGINE_RESPONSE_OBJECTS_HPP_
 #define ENGINE_RESPONSE_OBJECTS_HPP_
 
-#include "engine/guidance/turn_instruction.hpp"
+#include "extractor/guidance/turn_instruction.hpp"
 #include "extractor/travel_mode.hpp"
 #include "engine/polyline_compressor.hpp"
 #include "engine/guidance/route_step.hpp"
@@ -32,8 +32,8 @@ namespace json
 namespace detail
 {
 
-std::string instructionTypeToString(guidance::TurnType type);
-std::string instructionModifierToString(guidance::DirectionModifier modifier);
+std::string instructionTypeToString(extractor::guidance::TurnType type);
+std::string instructionModifierToString(extractor::guidance::DirectionModifier modifier);
 
 util::json::Array coordinateToLonLat(const util::Coordinate coordinate);
 

include/engine/api/match_api.hpp

@@ -39,8 +39,7 @@ class MatchAPI final : public RouteAPI
             auto route = MakeRoute(sub_routes[index].segment_end_coordinates,
                                    sub_routes[index].unpacked_path_segments,
                                    sub_routes[index].source_traversed_in_reverse,
-                                   sub_routes[index].target_traversed_in_reverse,
-                                   nullptr);
+                                   sub_routes[index].target_traversed_in_reverse, nullptr);
             route.values["confidence"] = sub_matchings[index].confidence;
             routes.values.push_back(std::move(route));
         }

include/engine/api/route_api.hpp

@@ -152,6 +152,7 @@ class RouteAPI : public BaseAPI
                         leg_geometry.locations.begin() + step.geometry_end));
                 });
         }
+
         return json::makeRoute(route,
                                json::makeRouteLegs(std::move(legs), std::move(step_geometries)),
                                std::move(json_overview));

include/engine/api/trip_api.hpp

@@ -29,7 +29,7 @@ class TripAPI final : public RouteAPI
                       const std::vector<InternalRouteResult> &sub_routes,
                       const std::vector<PhantomNode> &phantoms,
                       util::json::Object &response,
-                      const std::vector<std::vector<util::Coordinate>> * const coordinates) const
+                      const std::vector<std::vector<util::Coordinate>> *const coordinates) const
     {
         auto number_of_routes = sub_trips.size();
         util::json::Array routes;