Added flatbuffers output support to the 'Route' service.

src/engine/api/json_factory.cpp

@@ -20,7 +20,6 @@
 #include <vector>
 
 namespace TurnType = osrm::guidance::TurnType;
-namespace DirectionModifier = osrm::guidance::DirectionModifier;
 using TurnInstruction = osrm::guidance::TurnInstruction;
 
 namespace osrm
@@ -34,18 +33,6 @@ namespace json
 namespace detail
 {
 
-// Check whether to include a modifier in the result of the API
-inline bool isValidModifier(const guidance::StepManeuver maneuver)
-{
-    return (maneuver.waypoint_type == guidance::WaypointType::None ||
-            maneuver.instruction.direction_modifier != DirectionModifier::UTurn);
-}
-
-inline bool hasValidLanes(const guidance::IntermediateIntersection &intersection)
-{
-    return intersection.lanes.lanes_in_turn > 0;
-}
-
 inline util::json::Array toJSON(const extractor::TurnLaneType::Mask lane_type)
 {
     util::json::Array result;

src/engine/plugins/viaroute.cpp

@@ -32,8 +32,6 @@ Status ViaRoutePlugin::HandleRequest(const RoutingAlgorithmsInterface &algorithm
 {
     BOOST_ASSERT(route_parameters.IsValid());
 
-    auto& json_result = result.get<util::json::Object>();
-
     if (!algorithms.HasShortestPathSearch() && route_parameters.coordinates.size() > 2)
     {
         return Error("NotImplemented",
@@ -164,7 +162,7 @@ Status ViaRoutePlugin::HandleRequest(const RoutingAlgorithmsInterface &algorithm
             }
         }
 
-        route_api.MakeResponse(routes, start_end_nodes, json_result);
+        route_api.MakeResponse(routes, start_end_nodes, result);
     }
     else
     {

src/server/service/route_service.cpp

@@ -66,6 +66,12 @@ RouteService::RunQuery(std::size_t prefix_length, std::string &query, osrm::engi
     }
     BOOST_ASSERT(parameters->IsValid());
 
+    if (parameters->format)
+    {
+        if (parameters->format == engine::api::BaseParameters::OutputFormatType::FLATBUFFERS) {
+            result = flatbuffers::FlatBufferBuilder();
+        }
+    }
     return BaseService::routing_machine.Route(*parameters, result);
 }
 }