Add support for tile plugin

include/server/service/base_service.hpp

@@ -5,6 +5,8 @@
 #include "util/coordinate.hpp"
 #include "osrm/osrm.hpp"
 
+#include <variant/variant.hpp>
+
 #include <string>
 #include <vector>
 
@@ -18,12 +20,12 @@ namespace service
 class BaseService
 {
   public:
+    using ResultT = mapbox::util::variant<util::json::Object, std::string>;
+
     BaseService(OSRM &routing_machine) : routing_machine(routing_machine) {}
     virtual ~BaseService() = default;
 
-    virtual engine::Status RunQuery(std::vector<util::Coordinate> coordinates,
-                                    std::string &options,
-                                    util::json::Object &json_result) = 0;
+    virtual engine::Status RunQuery(std::string &query, ResultT &result) = 0;
 
     virtual unsigned GetVersion() = 0;
 

include/server/service/match_service.hpp

@@ -22,9 +22,7 @@ class MatchService final : public BaseService
   public:
     MatchService(OSRM &routing_machine) : BaseService(routing_machine) {}
 
-    engine::Status RunQuery(std::vector<util::Coordinate> coordinates,
-                            std::string &options,
-                            util::json::Object &result) final override;
+    engine::Status RunQuery(std::string &query, ResultT &result) final override;
 
     unsigned GetVersion() final override { return 1; }
 };

include/server/service/nearest_service.hpp

@@ -22,9 +22,7 @@ class NearestService final : public BaseService
   public:
     NearestService(OSRM &routing_machine) : BaseService(routing_machine) {}
 
-    engine::Status RunQuery(std::vector<util::Coordinate> coordinates,
-                            std::string &options,
-                            util::json::Object &result) final override;
+    engine::Status RunQuery(std::string &query, ResultT &result) final override;
 
     unsigned GetVersion() final override { return 1; }
 };

include/server/service/route_service.hpp

@@ -22,9 +22,7 @@ class RouteService final : public BaseService
   public:
     RouteService(OSRM &routing_machine) : BaseService(routing_machine) {}
 
-    engine::Status RunQuery(std::vector<util::Coordinate> coordinates,
-                            std::string &options,
-                            util::json::Object &result) final override;
+    engine::Status RunQuery(std::string &query, ResultT &result) final override;
 
     unsigned GetVersion() final override { return 1; }
 };

include/server/service/table_service.hpp

@@ -22,9 +22,7 @@ class TableService final : public BaseService
   public:
     TableService(OSRM &routing_machine) : BaseService(routing_machine) {}
 
-    engine::Status RunQuery(std::vector<util::Coordinate> coordinates,
-                            std::string &options,
-                            util::json::Object &result) final override;
+    engine::Status RunQuery(std::string &query, ResultT &result) final override;
 
     unsigned GetVersion() final override { return 1; }
 };

include/server/service/tile_service.hpp

@@ -0,0 +1,33 @@
+#ifndef SERVER_SERVICE_TILE_SERVICE_HPP
+#define SERVER_SERVICE_TILE_SERVICE_HPP
+
+#include "server/service/base_service.hpp"
+
+#include "engine/status.hpp"
+#include "util/coordinate.hpp"
+#include "osrm/osrm.hpp"
+
+#include <string>
+#include <vector>
+
+namespace osrm
+{
+namespace server
+{
+namespace service
+{
+
+class TileService final : public BaseService
+{
+  public:
+    TileService(OSRM &routing_machine) : BaseService(routing_machine) {}
+
+    engine::Status RunQuery(std::string &query, ResultT &result) final override;
+
+    unsigned GetVersion() final override { return 1; }
+};
+}
+}
+}
+
+#endif

include/server/service/trip_service.hpp

@@ -22,9 +22,7 @@ class TripService final : public BaseService
   public:
     TripService(OSRM &routing_machine) : BaseService(routing_machine) {}
 
-    engine::Status RunQuery(std::vector<util::Coordinate> coordinates,
-                            std::string &options,
-                            util::json::Object &result) final override;
+    engine::Status RunQuery(std::string &query, ResultT &result) final override;
 
     unsigned GetVersion() final override { return 1; }
 };