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

This commit is contained in:
Denis Chaplygin
2019-08-02 17:40:55 +03:00
parent f6f86b2a52
commit 75aadb0f3f
32 changed files with 136 additions and 99 deletions
+7 -6
View File
@@ -30,6 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "osrm/osrm_fwd.hpp"
#include "osrm/status.hpp"
#include "engine/api/base_result.hpp"
#include <memory>
#include <string>
@@ -83,7 +84,7 @@ class OSRM final
* \return Status indicating success for the query or failure
* \see Status, RouteParameters and json::Object
*/
Status Route(const RouteParameters &parameters, json::Object &result) const;
Status Route(const RouteParameters &parameters, osrm::engine::api::ResultT &result) const;
/**
* Distance tables for coordinates.
@@ -92,7 +93,7 @@ class OSRM final
* \return Status indicating success for the query or failure
* \see Status, TableParameters and json::Object
*/
Status Table(const TableParameters &parameters, json::Object &result) const;
Status Table(const TableParameters &parameters, osrm::engine::api::ResultT &result) const;
/**
* Nearest street segment for coordinate.
@@ -101,7 +102,7 @@ class OSRM final
* \return Status indicating success for the query or failure
* \see Status, NearestParameters and json::Object
*/
Status Nearest(const NearestParameters &parameters, json::Object &result) const;
Status Nearest(const NearestParameters &parameters, osrm::engine::api::ResultT &result) const;
/**
* Trip: shortest round trip between coordinates.
@@ -110,7 +111,7 @@ class OSRM final
* \return Status indicating success for the query or failure
* \see Status, TripParameters and json::Object
*/
Status Trip(const TripParameters &parameters, json::Object &result) const;
Status Trip(const TripParameters &parameters, osrm::engine::api::ResultT &result) const;
/**
* Match: snaps noisy coordinate traces to the road network
@@ -119,7 +120,7 @@ class OSRM final
* \return Status indicating success for the query or failure
* \see Status, MatchParameters and json::Object
*/
Status Match(const MatchParameters &parameters, json::Object &result) const;
Status Match(const MatchParameters &parameters, osrm::engine::api::ResultT &result) const;
/**
* Tile: vector tiles with internal graph representation
@@ -128,7 +129,7 @@ class OSRM final
* \return Status indicating success for the query or failure
* \see Status, TileParameters and json::Object
*/
Status Tile(const TileParameters &parameters, std::string &result) const;
Status Tile(const TileParameters &parameters, osrm::engine::api::ResultT &result) const;
private:
std::unique_ptr<engine::EngineInterface> engine_;