Passed ResultT down to engine plugins, so now they can form replies in different formats.

src/server/service/match_service.cpp

@@ -42,7 +42,7 @@ std::string getWrongOptionHelp(const engine::api::MatchParameters &parameters)
 } // anon. ns
 
 engine::Status
-MatchService::RunQuery(std::size_t prefix_length, std::string &query, ResultT &result)
+MatchService::RunQuery(std::size_t prefix_length, std::string &query, osrm::engine::api::ResultT &result)
 {
     result = util::json::Object();
     auto &json_result = result.get<util::json::Object>();
@@ -68,7 +68,7 @@ MatchService::RunQuery(std::size_t prefix_length, std::string &query, ResultT &r
     }
     BOOST_ASSERT(parameters->IsValid());
 
-    return BaseService::routing_machine.Match(*parameters, json_result);
+    return BaseService::routing_machine.Match(*parameters, result);
 }
 }
 }

src/server/service/nearest_service.cpp

@@ -36,7 +36,7 @@ std::string getWrongOptionHelp(const engine::api::NearestParameters &parameters)
 } // anon. ns
 
 engine::Status
-NearestService::RunQuery(std::size_t prefix_length, std::string &query, ResultT &result)
+NearestService::RunQuery(std::size_t prefix_length, std::string &query, osrm::engine::api::ResultT &result)
 {
     result = util::json::Object();
     auto &json_result = result.get<util::json::Object>();
@@ -62,7 +62,7 @@ NearestService::RunQuery(std::size_t prefix_length, std::string &query, ResultT
     }
     BOOST_ASSERT(parameters->IsValid());
 
-    return BaseService::routing_machine.Nearest(*parameters, json_result);
+    return BaseService::routing_machine.Nearest(*parameters, result);
 }
 }
 }

src/server/service/route_service.cpp

@@ -40,7 +40,7 @@ std::string getWrongOptionHelp(const engine::api::RouteParameters &parameters)
 } // anon. ns
 
 engine::Status
-RouteService::RunQuery(std::size_t prefix_length, std::string &query, ResultT &result)
+RouteService::RunQuery(std::size_t prefix_length, std::string &query, osrm::engine::api::ResultT &result)
 {
     result = util::json::Object();
     auto &json_result = result.get<util::json::Object>();
@@ -66,7 +66,7 @@ RouteService::RunQuery(std::size_t prefix_length, std::string &query, ResultT &r
     }
     BOOST_ASSERT(parameters->IsValid());
 
-    return BaseService::routing_machine.Route(*parameters, json_result);
+    return BaseService::routing_machine.Route(*parameters, result);
 }
 }
 }

src/server/service/table_service.cpp

@@ -71,7 +71,7 @@ std::string getWrongOptionHelp(const engine::api::TableParameters &parameters)
 } // anon. ns
 
 engine::Status
-TableService::RunQuery(std::size_t prefix_length, std::string &query, ResultT &result)
+TableService::RunQuery(std::size_t prefix_length, std::string &query, osrm::engine::api::ResultT &result)
 {
     result = util::json::Object();
     auto &json_result = result.get<util::json::Object>();
@@ -97,7 +97,7 @@ TableService::RunQuery(std::size_t prefix_length, std::string &query, ResultT &r
     }
     BOOST_ASSERT(parameters->IsValid());
 
-    return BaseService::routing_machine.Table(*parameters, json_result);
+    return BaseService::routing_machine.Table(*parameters, result);
 }
 }
 }

src/server/service/tile_service.cpp

@@ -15,7 +15,7 @@ namespace server
 namespace service
 {
 
-engine::Status TileService::RunQuery(std::size_t prefix_length, std::string &query, ResultT &result)
+engine::Status TileService::RunQuery(std::size_t prefix_length, std::string &query, osrm::engine::api::ResultT &result)
 {
     auto query_iterator = query.begin();
     auto parameters =
@@ -43,8 +43,7 @@ engine::Status TileService::RunQuery(std::size_t prefix_length, std::string &que
     BOOST_ASSERT(parameters->IsValid());
 
     result = std::string();
-    auto &string_result = result.get<std::string>();
-    return BaseService::routing_machine.Tile(*parameters, string_result);
+    return BaseService::routing_machine.Tile(*parameters, result);
 }
 }
 }

src/server/service/trip_service.cpp

@@ -41,7 +41,7 @@ std::string getWrongOptionHelp(const engine::api::TripParameters &parameters)
 }
 } // anon. ns
 
-engine::Status TripService::RunQuery(std::size_t prefix_length, std::string &query, ResultT &result)
+engine::Status TripService::RunQuery(std::size_t prefix_length, std::string &query, osrm::engine::api::ResultT &result)
 {
     result = util::json::Object();
     auto &json_result = result.get<util::json::Object>();
@@ -69,7 +69,7 @@ engine::Status TripService::RunQuery(std::size_t prefix_length, std::string &que
     }
     BOOST_ASSERT(parameters->IsValid());
 
-    return BaseService::routing_machine.Trip(*parameters, json_result);
+    return BaseService::routing_machine.Trip(*parameters, result);
 }
 }
 }

src/server/service_handler.cpp

@@ -27,7 +27,7 @@ ServiceHandler::ServiceHandler(osrm::EngineConfig &config) : routing_machine(con
 }
 
 engine::Status ServiceHandler::RunQuery(api::ParsedURL parsed_url,
-                                        service::BaseService::ResultT &result)
+                                        osrm::engine::api::ResultT &result)
 {
     const auto &service_iter = service_map.find(parsed_url.service);
     if (service_iter == service_map.end())