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

remove an unneeded check in JSONDescriptor

Browse Source
This commit is contained in:
Dennis Luxen 2014-08-01 15:59:45 +02:00
parent 9c03f919a3
commit 759449b4be
1 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Descriptors/JSONDescriptor.h
View File

@ -39,6 +39,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "../Util/StringUtil.h" #include "../Util/StringUtil.h"
#include "../Util/TimingUtil.h" #include "../Util/TimingUtil.h"
#include <boost/range/irange.hpp>
#include <algorithm> #include <algorithm>
template <class DataFacadeT> class JSONDescriptor : public BaseDescriptor<DataFacadeT> template <class DataFacadeT> class JSONDescriptor : public BaseDescriptor<DataFacadeT>
@ -118,14 +120,14 @@ template <class DataFacadeT> class JSONDescriptor : public BaseDescriptor<DataFa
json_result.values["status_message"] = "Found route between points"; json_result.values["status_message"] = "Found route between points";
// for each unpacked segment add the leg to the description // for each unpacked segment add the leg to the description
for (unsigned i = 0; i < raw_route.unpacked_path_segments.size(); ++i) for (const auto i : boost::irange((std::size_t)0, raw_route.unpacked_path_segments.size()))
{ {
#ifndef NDEBUG #ifndef NDEBUG
const int added_segments = const int added_segments =
#endif #endif
DescribeLeg(raw_route.unpacked_path_segments[i], DescribeLeg(raw_route.unpacked_path_segments[i],
raw_route.segment_end_coordinates[i], raw_route.segment_end_coordinates[i],
raw_route.target_traversed_in_reverse[i]); raw_route.target_traversed_in_reverse[i]);
BOOST_ASSERT(0 < added_segments); BOOST_ASSERT(0 < added_segments);
} }
description_factory.Run(facade, config.zoom_level); description_factory.Run(facade, config.zoom_level);
@ -276,7 +278,7 @@ template <class DataFacadeT> class JSONDescriptor : public BaseDescriptor<DataFa
json_hint_object.values["checksum"] = raw_route.check_sum; json_hint_object.values["checksum"] = raw_route.check_sum;
JSON::Array json_location_hint_array; JSON::Array json_location_hint_array;
std::string hint; std::string hint;
for (unsigned i = 0; i < raw_route.segment_end_coordinates.size(); ++i) for (const auto i : boost::irange((std::size_t)0, raw_route.segment_end_coordinates.size()))
{ {
EncodeObjectToBase64(raw_route.segment_end_coordinates[i].source_phantom, hint); EncodeObjectToBase64(raw_route.segment_end_coordinates[i].source_phantom, hint);
json_location_hint_array.values.push_back(hint); json_location_hint_array.values.push_back(hint);
@ -365,21 +367,17 @@ template <class DataFacadeT> class JSONDescriptor : public BaseDescriptor<DataFa
} }
} }
// TODO: check if this in an invariant JSON::Array json_last_instruction_row;
if (INVALID_EDGE_WEIGHT != route_length) temp_instruction = IntToString(as_integer(TurnInstruction::ReachedYourDestination));
{ json_last_instruction_row.values.push_back(temp_instruction);
JSON::Array json_last_instruction_row; json_last_instruction_row.values.push_back("");
temp_instruction = IntToString(as_integer(TurnInstruction::ReachedYourDestination)); json_last_instruction_row.values.push_back(0);
json_last_instruction_row.values.push_back(temp_instruction); json_last_instruction_row.values.push_back(necessary_segments_running_index - 1);
json_last_instruction_row.values.push_back(""); json_last_instruction_row.values.push_back(0);
json_last_instruction_row.values.push_back(0); json_last_instruction_row.values.push_back("0m");
json_last_instruction_row.values.push_back(necessary_segments_running_index - 1); json_last_instruction_row.values.push_back(Azimuth::Get(0.0));
json_last_instruction_row.values.push_back(0); json_last_instruction_row.values.push_back(0.);
json_last_instruction_row.values.push_back("0m"); json_instruction_array.values.push_back(json_last_instruction_row);
json_last_instruction_row.values.push_back(Azimuth::Get(0.0));
json_last_instruction_row.values.push_back(0.);
json_instruction_array.values.push_back(json_last_instruction_row);
}
} }
}; };