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

remove unused function parameters

Browse Source
This commit is contained in:
Dennis Luxen 2014-05-11 17:58:37 +02:00
parent 7e7aa6aaee
commit 24a61dc650
3 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Descriptors/DescriptionFactory.cpp
View File

@ -64,15 +64,13 @@ double DescriptionFactory::GetBearing(const FixedPointCoordinate &A, const Fixed
return result; return result;
} }
void DescriptionFactory::SetStartSegment(const PhantomNode &source, void DescriptionFactory::SetStartSegment(const PhantomNode &source)
const bool source_traversed_in_reverse)
{ {
start_phantom = source; start_phantom = source;
AppendSegment(source.location, PathData(0, source.name_id, TurnInstruction::HeadOn, source.forward_weight)); AppendSegment(source.location, PathData(0, source.name_id, TurnInstruction::HeadOn, source.forward_weight));
} }
void DescriptionFactory::SetEndSegment(const PhantomNode &target, void DescriptionFactory::SetEndSegment(const PhantomNode &target)
const bool target_traversed_in_reverse)
{ {
target_phantom = target; target_phantom = target;
path_description.emplace_back( path_description.emplace_back(

4
Descriptors/DescriptionFactory.h
View File

@ -83,8 +83,8 @@ class DescriptionFactory
void AppendUnencodedPolylineString(std::vector<std::string> &output) const; void AppendUnencodedPolylineString(std::vector<std::string> &output) const;
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 source_traversed_in_reverse); void SetStartSegment(const PhantomNode &start_phantom);
void SetEndSegment(const PhantomNode &start_phantom, const bool target_traversed_in_reverse); void SetEndSegment(const PhantomNode &start_phantom);
void AppendEncodedPolylineString(const bool return_encoded, std::vector<std::string> &output); void AppendEncodedPolylineString(const bool return_encoded, std::vector<std::string> &output);
template <class DataFacadeT> void Run(const DataFacadeT *facade, const unsigned zoomLevel) template <class DataFacadeT> void Run(const DataFacadeT *facade, const unsigned zoomLevel)

12
Descriptors/JSONDescriptor.h
View File

@ -95,7 +95,6 @@ template <class DataFacadeT> class JSONDescriptor : public BaseDescriptor<DataFa
description_factory.AppendSegment(current_coordinate, path_data); description_factory.AppendSegment(current_coordinate, path_data);
++added_element_count; ++added_element_count;
} }
// description_factory.SetEndSegment( leg_phantoms.target_phantom );
++added_element_count; ++added_element_count;
BOOST_ASSERT((route_leg.size() + 1) == added_element_count); BOOST_ASSERT((route_leg.size() + 1) == added_element_count);
return added_element_count; return added_element_count;
@ -127,8 +126,7 @@ template <class DataFacadeT> class JSONDescriptor : public BaseDescriptor<DataFa
BOOST_ASSERT(raw_route.unpacked_path_segments.size() == BOOST_ASSERT(raw_route.unpacked_path_segments.size() ==
raw_route.segment_end_coordinates.size()); raw_route.segment_end_coordinates.size());
description_factory.SetStartSegment(phantom_nodes.source_phantom, description_factory.SetStartSegment(phantom_nodes.source_phantom);
raw_route.source_traversed_in_reverse);
reply.content.emplace_back("0," reply.content.emplace_back("0,"
"\"status_message\": \"Found route between points\","); "\"status_message\": \"Found route between points\",");
@ -140,8 +138,7 @@ template <class DataFacadeT> class JSONDescriptor : public BaseDescriptor<DataFa
BOOST_ASSERT(0 < added_segments); BOOST_ASSERT(0 < added_segments);
shortest_leg_end_indices.emplace_back(added_segments + shortest_leg_end_indices.back()); shortest_leg_end_indices.emplace_back(added_segments + shortest_leg_end_indices.back());
} }
description_factory.SetEndSegment(phantom_nodes.target_phantom, description_factory.SetEndSegment(phantom_nodes.target_phantom);
raw_route.target_traversed_in_reverse);
description_factory.Run(facade, config.zoom_level); description_factory.Run(facade, config.zoom_level);
reply.content.emplace_back("\"route_geometry\": "); reply.content.emplace_back("\"route_geometry\": ");
@ -189,16 +186,13 @@ template <class DataFacadeT> class JSONDescriptor : public BaseDescriptor<DataFa
// only one alternative route is computed at this time, so this is hardcoded // only one alternative route is computed at this time, so this is hardcoded
if (raw_route.alternative_path_length != INVALID_EDGE_WEIGHT) if (raw_route.alternative_path_length != INVALID_EDGE_WEIGHT)
{ {
alternate_descriptionFactory.SetStartSegment(phantom_nodes.source_phantom, alternate_descriptionFactory.SetStartSegment(phantom_nodes.source_phantom);
raw_route.alt_source_traversed_in_reverse);
// Get all the coordinates for the computed route // Get all the coordinates for the computed route
for (const PathData &path_data : raw_route.unpacked_alternative) for (const PathData &path_data : raw_route.unpacked_alternative)
{ {
current = facade->GetCoordinateOfNode(path_data.node); current = facade->GetCoordinateOfNode(path_data.node);
alternate_descriptionFactory.AppendSegment(current, path_data); alternate_descriptionFactory.AppendSegment(current, path_data);
} }
alternate_descriptionFactory.SetEndSegment(phantom_nodes.target_phantom,
raw_route.alt_target_traversed_in_reverse);
} }
alternate_descriptionFactory.Run(facade, config.zoom_level); alternate_descriptionFactory.Run(facade, config.zoom_level);