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

some renaming of member functions to remove ambiguity

Browse Source
This commit is contained in:
Dennis Luxen 2014-09-15 14:23:43 +02:00
parent 8e72c3d81e
commit 392c07951e
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Descriptors/DescriptionFactory.cpp
View File

@ -109,7 +109,7 @@ void DescriptionFactory::AppendSegment(const FixedPointCoordinate &coordinate,
path_point.travel_mode); path_point.travel_mode);
} }
JSON::Value DescriptionFactory::AppendEncodedPolylineString(const bool return_encoded) JSON::Value DescriptionFactory::AppendGeometryString(const bool return_encoded)
{ {
if (return_encoded) if (return_encoded)
{ {

15
Descriptors/DescriptionFactory.h
View File

@ -80,9 +80,11 @@ class DescriptionFactory
void AppendSegment(const FixedPointCoordinate &coordinate, const PathData &data); void AppendSegment(const FixedPointCoordinate &coordinate, const PathData &data);
void BuildRouteSummary(const double distance, const unsigned time); void BuildRouteSummary(const double distance, const unsigned time);
void SetStartSegment(const PhantomNode &start_phantom, const bool traversed_in_reverse); void SetStartSegment(const PhantomNode &start_phantom, const bool traversed_in_reverse);
void SetEndSegment(const PhantomNode &start_phantom, const bool traversed_in_reverse, const bool is_via_location = false); void SetEndSegment(const PhantomNode &start_phantom,
JSON::Value AppendEncodedPolylineString(const bool return_encoded); const bool traversed_in_reverse,
std::vector<unsigned> const & GetViaIndices() const; const bool is_via_location = false);
JSON::Value AppendGeometryString(const bool return_encoded);
std::vector<unsigned> const &GetViaIndices() const;
template <class DataFacadeT> void Run(const DataFacadeT *facade, const unsigned zoomLevel) template <class DataFacadeT> void Run(const DataFacadeT *facade, const unsigned zoomLevel)
{ {
@ -198,14 +200,15 @@ class DescriptionFactory
{ {
++necessary_pieces; ++necessary_pieces;
if (path_description[i].is_via_location) if (path_description[i].is_via_location)
{ //mark the end of a leg { // mark the end of a leg
via_indices.push_back(necessary_pieces); via_indices.push_back(necessary_pieces);
} }
const double angle = path_description[i+1].location.GetBearing(path_description[i].location); const double angle =
path_description[i + 1].location.GetBearing(path_description[i].location);
path_description[i].bearing = static_cast<unsigned>(angle * 10); path_description[i].bearing = static_cast<unsigned>(angle * 10);
} }
} }
via_indices.push_back(necessary_pieces+1); via_indices.push_back(necessary_pieces + 1);
BOOST_ASSERT(via_indices.size() >= 2); BOOST_ASSERT(via_indices.size() >= 2);
// BOOST_ASSERT(0 != necessary_pieces || path_description.empty()); // BOOST_ASSERT(0 != necessary_pieces || path_description.empty());
return; return;

5
Descriptors/JSONDescriptor.h
View File

@ -137,7 +137,7 @@ template <class DataFacadeT> class JSONDescriptor : public BaseDescriptor<DataFa
if (config.geometry) if (config.geometry)
{ {
JSON::Value route_geometry = JSON::Value route_geometry =
description_factory.AppendEncodedPolylineString(config.encode_geometry); description_factory.AppendGeometryString(config.encode_geometry);
json_result.values["route_geometry"] = route_geometry; json_result.values["route_geometry"] = route_geometry;
} }
if (config.instructions) if (config.instructions)
@ -213,8 +213,7 @@ template <class DataFacadeT> class JSONDescriptor : public BaseDescriptor<DataFa
if (config.geometry) if (config.geometry)
{ {
JSON::Value alternate_geometry_string = JSON::Value alternate_geometry_string =
alternate_description_factory.AppendEncodedPolylineString( alternate_description_factory.AppendGeometryString(config.encode_geometry);
config.encode_geometry);
JSON::Array json_alternate_geometries_array; JSON::Array json_alternate_geometries_array;
json_alternate_geometries_array.values.push_back(alternate_geometry_string); json_alternate_geometries_array.values.push_back(alternate_geometry_string);
json_result.values["alternative_geometries"] = json_alternate_geometries_array; json_result.values["alternative_geometries"] = json_alternate_geometries_array;