committed by
GitHub
parent
59953172e8
commit
3d2db20777
@@ -12,10 +12,12 @@
|
||||
#include "osrm/status.hpp"
|
||||
|
||||
osrm::Status run_match_json(const osrm::OSRM &osrm,
|
||||
const MatchParameters ¶ms,
|
||||
json::Object &json_result,
|
||||
const osrm::MatchParameters ¶ms,
|
||||
osrm::json::Object &json_result,
|
||||
bool use_json_only_api)
|
||||
{
|
||||
using namespace osrm;
|
||||
|
||||
if (use_json_only_api)
|
||||
{
|
||||
return osrm.Match(params, json_result);
|
||||
|
||||
@@ -34,7 +34,7 @@ osrm::Status run_tile(const osrm::OSRM &osrm,
|
||||
}
|
||||
|
||||
#define CHECK_EQUAL_RANGE(R1, R2) \
|
||||
BOOST_CHECK_EQUAL_COLLECTIONS(R1.begin(), R1.end(), R2.begin(), R2.end());
|
||||
BOOST_CHECK_EQUAL_COLLECTIONS((R1).begin(), (R1).end(), (R2).begin(), (R2).end());
|
||||
|
||||
BOOST_AUTO_TEST_SUITE(tile)
|
||||
|
||||
|
||||
@@ -6,10 +6,10 @@
|
||||
#include "osrm/json_container.hpp"
|
||||
#include "util/exception.hpp"
|
||||
|
||||
using namespace osrm;
|
||||
|
||||
inline bool waypoint_check(json::Value waypoint)
|
||||
inline bool waypoint_check(osrm::json::Value waypoint)
|
||||
{
|
||||
using namespace osrm;
|
||||
|
||||
if (!waypoint.is<mapbox::util::recursive_wrapper<util::json::Object>>())
|
||||
{
|
||||
throw util::exception("Must pass in a waypoint object");
|
||||
@@ -24,6 +24,8 @@ inline bool waypoint_check(json::Value waypoint)
|
||||
|
||||
inline bool waypoint_check(const osrm::engine::api::fbresult::Waypoint *const waypoint)
|
||||
{
|
||||
using namespace osrm;
|
||||
|
||||
util::FloatLongitude lon{waypoint->location()->longitude()};
|
||||
util::FloatLatitude lat{waypoint->location()->latitude()};
|
||||
util::Coordinate location_coordinate(lon, lat);
|
||||
|
||||
Reference in New Issue
Block a user