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

reduce warnings when compiling tests, add constructor to base parameters, fixes gcc49 unit tests building

Browse Source
This commit is contained in:
Moritz Kobitzsch 2016-12-19 16:50:17 +01:00 committed by Karen Shea
parent 5ecd2e4c67
commit 1ba5ff44cc
2 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/engine/api/base_parameters.hpp
View File

@ -69,6 +69,16 @@ struct BaseParameters
// Adds hints to response which can be included in subsequent requests, see `hints` above. // Adds hints to response which can be included in subsequent requests, see `hints` above.
bool generate_hints = true; bool generate_hints = true;
BaseParameters(const std::vector<util::Coordinate> coordinates_ = {},
const std::vector<boost::optional<Hint>> hints_ = {},
std::vector<boost::optional<double>> radiuses_ = {},
std::vector<boost::optional<Bearing>> bearings_ = {},
bool generate_hints_ = true)
: coordinates(coordinates_), hints(hints_), radiuses(radiuses_), bearings(bearings_),
generate_hints(generate_hints_)
{
}
// FIXME add validation for invalid bearing values // FIXME add validation for invalid bearing values
bool IsValid() const bool IsValid() const
{ {

31
unit_tests/library/limits.cpp
View File

@ -15,6 +15,11 @@
#include "osrm/osrm.hpp" #include "osrm/osrm.hpp"
#include "osrm/status.hpp" #include "osrm/status.hpp"
namespace
{
osrm::util::Coordinate getZeroCoordinate() { return {osrm::util::FloatLongitude{0}, osrm::util::FloatLatitude{0}}; }
}
BOOST_AUTO_TEST_SUITE(limits) BOOST_AUTO_TEST_SUITE(limits)
BOOST_AUTO_TEST_CASE(test_trip_limits) BOOST_AUTO_TEST_CASE(test_trip_limits)
@ -32,9 +37,9 @@ BOOST_AUTO_TEST_CASE(test_trip_limits)
OSRM osrm{config}; OSRM osrm{config};
TripParameters params; TripParameters params;
params.coordinates.emplace_back(util::FloatLongitude{}, util::FloatLatitude{}); params.coordinates.emplace_back(getZeroCoordinate());
params.coordinates.emplace_back(util::FloatLongitude{}, util::FloatLatitude{}); params.coordinates.emplace_back(getZeroCoordinate());
params.coordinates.emplace_back(util::FloatLongitude{}, util::FloatLatitude{}); params.coordinates.emplace_back(getZeroCoordinate());
json::Object result; json::Object result;
@ -62,9 +67,9 @@ BOOST_AUTO_TEST_CASE(test_route_limits)
OSRM osrm{config}; OSRM osrm{config};
RouteParameters params; RouteParameters params;
params.coordinates.emplace_back(util::FloatLongitude{}, util::FloatLatitude{}); params.coordinates.emplace_back(getZeroCoordinate());
params.coordinates.emplace_back(util::FloatLongitude{}, util::FloatLatitude{}); params.coordinates.emplace_back(getZeroCoordinate());
params.coordinates.emplace_back(util::FloatLongitude{}, util::FloatLatitude{}); params.coordinates.emplace_back(getZeroCoordinate());
json::Object result; json::Object result;
@ -92,9 +97,9 @@ BOOST_AUTO_TEST_CASE(test_table_limits)
OSRM osrm{config}; OSRM osrm{config};
TableParameters params; TableParameters params;
params.coordinates.emplace_back(util::FloatLongitude{}, util::FloatLatitude{}); params.coordinates.emplace_back(getZeroCoordinate());
params.coordinates.emplace_back(util::FloatLongitude{}, util::FloatLatitude{}); params.coordinates.emplace_back(getZeroCoordinate());
params.coordinates.emplace_back(util::FloatLongitude{}, util::FloatLatitude{}); params.coordinates.emplace_back(getZeroCoordinate());
json::Object result; json::Object result;
@ -122,9 +127,9 @@ BOOST_AUTO_TEST_CASE(test_match_limits)
OSRM osrm{config}; OSRM osrm{config};
MatchParameters params; MatchParameters params;
params.coordinates.emplace_back(util::FloatLongitude{}, util::FloatLatitude{}); params.coordinates.emplace_back(getZeroCoordinate());
params.coordinates.emplace_back(util::FloatLongitude{}, util::FloatLatitude{}); params.coordinates.emplace_back(getZeroCoordinate());
params.coordinates.emplace_back(util::FloatLongitude{}, util::FloatLatitude{}); params.coordinates.emplace_back(getZeroCoordinate());
json::Object result; json::Object result;
@ -152,7 +157,7 @@ BOOST_AUTO_TEST_CASE(test_nearest_limits)
OSRM osrm{config}; OSRM osrm{config};
NearestParameters params; NearestParameters params;
params.coordinates.emplace_back(util::FloatLongitude{}, util::FloatLatitude{}); params.coordinates.emplace_back(getZeroCoordinate());
params.number_of_results = 10000; params.number_of_results = 10000;
json::Object result; json::Object result;