First round of lat,lng -> lng,lat switcheroo
This commit is contained in:
@@ -26,8 +26,7 @@ class BaseAPI
|
||||
{
|
||||
}
|
||||
|
||||
util::json::Array
|
||||
MakeWaypoints(const std::vector<PhantomNodes> &segment_end_coordinates) const
|
||||
util::json::Array MakeWaypoints(const std::vector<PhantomNodes> &segment_end_coordinates) const
|
||||
{
|
||||
BOOST_ASSERT(parameters.coordinates.size() > 0);
|
||||
BOOST_ASSERT(parameters.coordinates.size() == segment_end_coordinates.size() + 1);
|
||||
@@ -47,8 +46,8 @@ class BaseAPI
|
||||
}
|
||||
|
||||
protected:
|
||||
util::json::Object MakeWaypoint(const util::FixedPointCoordinate input_coordinate,
|
||||
const PhantomNode &phantom) const
|
||||
util::json::Object MakeWaypoint(const util::Coordinate input_coordinate,
|
||||
const PhantomNode &phantom) const
|
||||
{
|
||||
return json::makeWaypoint(phantom.location, facade.get_name_for_id(phantom.name_id),
|
||||
Hint{input_coordinate, phantom, facade.GetCheckSum()});
|
||||
|
||||
@@ -23,7 +23,7 @@ struct BaseParameters
|
||||
short range;
|
||||
};
|
||||
|
||||
std::vector<util::FixedPointCoordinate> coordinates;
|
||||
std::vector<util::Coordinate> coordinates;
|
||||
std::vector<boost::optional<Hint>> hints;
|
||||
std::vector<boost::optional<double>> radiuses;
|
||||
std::vector<boost::optional<Bearing>> bearings;
|
||||
|
||||
@@ -38,7 +38,7 @@ namespace detail
|
||||
|
||||
std::string instructionToString(extractor::TurnInstruction instruction);
|
||||
|
||||
util::json::Array coordinateToLonLat(const FixedPointCoordinate &coordinate);
|
||||
util::json::Array coordinateToLonLat(const util::Coordinate &coordinate);
|
||||
|
||||
std::string modeToString(const extractor::TravelMode mode);
|
||||
|
||||
@@ -58,7 +58,7 @@ util::json::Object makeGeoJSONLineString(ForwardIter begin, ForwardIter end)
|
||||
geojson.values["type"] = "LineString";
|
||||
util::json::Array coordinates;
|
||||
std::transform(begin, end, std::back_inserter(coordinates.values),
|
||||
[](const util::FixedPointCoordinate loc)
|
||||
[](const util::Coordinate loc)
|
||||
{
|
||||
return detail::coordinateToLonLat(loc);
|
||||
});
|
||||
@@ -76,7 +76,7 @@ util::json::Object makeRoute(const guidance::Route &route,
|
||||
boost::optional<util::json::Value> geometry);
|
||||
|
||||
util::json::Object
|
||||
makeWaypoint(const FixedPointCoordinate location, std::string &&name, const Hint &hint);
|
||||
makeWaypoint(const util::Coordinate location, std::string &&name, const Hint &hint);
|
||||
|
||||
util::json::Object makeRouteLeg(guidance::RouteLeg &&leg, util::json::Array &&steps);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user