Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Provides ctor from base path for EngineConfig, fixes #2030

Browse Source
This commit is contained in:
Daniel J. Hofmann 2016-03-03 02:55:30 +01:00 committed by Patrick Niklaus
parent 58fb633df3
commit dc1b5d3424
2 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
example/example.cpp
View File

@ -26,49 +26,36 @@ int main(int argc, const char *argv[]) try
return EXIT_FAILURE; return EXIT_FAILURE;
} }
// Path to .osrm base file using namespace osrm;
std::string base{argv[1]};
// Configure routing machine // Configure based on a .osrm base path, and no datasets in shared mem from osrm-datastore
osrm::EngineConfig config; EngineConfig config{argv[1]};
// TODO(daniel-j-h): this is ugly, provide easier way for users
config.server_paths["ramindex"] = base + ".ramIndex";
config.server_paths["fileindex"] = base + ".fileIndex";
config.server_paths["hsgrdata"] = base + ".hsgr";
config.server_paths["nodesdata"] = base + ".nodes";
config.server_paths["edgesdata"] = base + ".edges";
config.server_paths["coredata"] = base + ".core";
config.server_paths["geometries"] = base + ".geometry";
config.server_paths["timestamp"] = base + ".timestamp";
config.server_paths["namesdata"] = base + ".names";
config.use_shared_memory = false; config.use_shared_memory = false;
// Routing machine with several services (such as Route, Table, Nearest, Trip, Match) // Routing machine with several services (such as Route, Table, Nearest, Trip, Match)
osrm::OSRM osrm{config}; OSRM osrm{config};
// The following shows how to use the Route service; configure this service // The following shows how to use the Route service; configure this service
osrm::RouteParameters params; RouteParameters params;
// Route is in Berlin. Latitude, Longitude // Rout in monaco
// TODO(daniel-j-h): use either coordinate_precision or better provide double,double-taking ctor params.coordinates.push_back({util::FloatLongitude(7.419758), util::FloatLatitude(43.731142)});
params.coordinates.push_back({osrm::util::FloatLongitude(7.419758), osrm::util::FloatLatitude(43.731142)}); params.coordinates.push_back({util::FloatLongitude(7.419505), util::FloatLatitude(43.736825)});
params.coordinates.push_back({osrm::util::FloatLongitude(7.419505), osrm::util::FloatLatitude(43.736825)});
// Response is in JSON format // Response is in JSON format
osrm::json::Object result; json::Object result;
// Execute routing request, this does the heavy lifting // Execute routing request, this does the heavy lifting
const auto status = osrm.Route(params, result); const auto status = osrm.Route(params, result);
if (status == osrm::Status::Ok) if (status == Status::Ok)
{ {
auto &routes = result.values["routes"].get<osrm::json::Array>(); auto &routes = result.values["routes"].get<json::Array>();
// Let's just use the first route // Let's just use the first route
auto &route = routes.values.at(0).get<osrm::json::Object>(); auto &route = routes.values.at(0).get<json::Object>();
const auto distance = route.values["distance"].get<osrm::json::Number>().value; const auto distance = route.values["distance"].get<json::Number>().value;
const auto duration = route.values["duration"].get<osrm::json::Number>().value; const auto duration = route.values["duration"].get<json::Number>().value;
// Warn users if extract does not contain the default Berlin coordinates from above // Warn users if extract does not contain the default Berlin coordinates from above
if (distance == 0 or duration == 0) if (distance == 0 or duration == 0)
@ -80,10 +67,10 @@ int main(int argc, const char *argv[]) try
std::cout << "Distance: " << distance << " meter\n"; std::cout << "Distance: " << distance << " meter\n";
std::cout << "Duration: " << duration << " seconds\n"; std::cout << "Duration: " << duration << " seconds\n";
} }
else if (status == osrm::Status::Error) else if (status == Status::Error)
{ {
const auto code = result.values["code"].get<osrm::json::String>().value; const auto code = result.values["code"].get<json::String>().value;
const auto message = result.values["message"].get<osrm::json::String>().value; const auto message = result.values["message"].get<json::String>().value;
std::cout << "Code: " << code << "\n"; std::cout << "Code: " << code << "\n";
std::cout << "Message: " << code << "\n"; std::cout << "Message: " << code << "\n";

16
include/engine/engine_config.hpp
View File

@ -41,6 +41,21 @@ namespace engine
struct EngineConfig struct EngineConfig
{ {
EngineConfig() = default;
EngineConfig(const boost::filesystem::path &base)
: server_paths{{"ramindex", base.string() + ".ramIndex"},
{"fileindex", base.string() + ".fileIndex"},
{"hsgrdata", base.string() + ".hsgr"},
{"nodesdata", base.string() + ".nodes"},
{"edgesdata", base.string() + ".edges"},
{"coredata", base.string() + ".core"},
{"geometries", base.string() + ".geometry"},
{"timestamp", base.string() + ".timestamp"},
{"namesdata", base.string() + ".names"}}
{
}
std::unordered_map<std::string, boost::filesystem::path> server_paths; std::unordered_map<std::string, boost::filesystem::path> server_paths;
int max_locations_trip = -1; int max_locations_trip = -1;
int max_locations_viaroute = -1; int max_locations_viaroute = -1;
@ -48,7 +63,6 @@ struct EngineConfig
int max_locations_map_matching = -1; int max_locations_map_matching = -1;
bool use_shared_memory = true; bool use_shared_memory = true;
}; };
} }
} }