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

Changed some assert to OSRM_ASSERT

Browse Source
This commit is contained in:
Michael Krasnyk 2017-05-16 16:32:50 +02:00 committed by Patrick Niklaus
parent 14db5f8d1f
commit e605917083
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/extractor/edge_based_graph_factory.cpp
View File

@ -8,6 +8,7 @@
#include "storage/io.hpp" #include "storage/io.hpp"
#include "util/assert.hpp"
#include "util/bearing.hpp" #include "util/bearing.hpp"
#include "util/coordinate.hpp" #include "util/coordinate.hpp"
#include "util/coordinate_calculation.hpp" #include "util/coordinate_calculation.hpp"
@ -419,7 +420,7 @@ void EdgeBasedGraphFactory::GenerateEdgeExpandedEdges(
auto intersection = turn_analysis.AssignTurnTypes( auto intersection = turn_analysis.AssignTurnTypes(
node_along_road_entering, incoming_edge, intersection_with_flags_and_angles); node_along_road_entering, incoming_edge, intersection_with_flags_and_angles);
BOOST_ASSERT(intersection.valid()); OSRM_ASSERT(intersection.valid(), m_coordinates[node_at_center_of_intersection]);
intersection = turn_lane_handler.assignTurnLanes( intersection = turn_lane_handler.assignTurnLanes(
node_along_road_entering, incoming_edge, std::move(intersection)); node_along_road_entering, incoming_edge, std::move(intersection));

6
src/extractor/guidance/intersection_generator.cpp
View File

@ -3,6 +3,7 @@
#include "extractor/geojson_debug_policies.hpp" #include "extractor/geojson_debug_policies.hpp"
#include "util/geojson_debug_logger.hpp" #include "util/geojson_debug_logger.hpp"
#include "util/assert.hpp"
#include "util/bearing.hpp" #include "util/bearing.hpp"
#include "util/coordinate_calculation.hpp" #include "util/coordinate_calculation.hpp"
#include "util/log.hpp" #include "util/log.hpp"
@ -369,8 +370,9 @@ IntersectionView IntersectionGenerator::TransformIntersectionShapeIntoView(
std::end(intersection_view), std::end(intersection_view),
std::mem_fn(&IntersectionViewData::CompareByAngle)); std::mem_fn(&IntersectionViewData::CompareByAngle));
BOOST_ASSERT(intersection_view[0].angle >= 0. && OSRM_ASSERT(intersection_view[0].angle >= 0. &&
intersection_view[0].angle < std::numeric_limits<double>::epsilon()); intersection_view[0].angle < std::numeric_limits<double>::epsilon(),
coordinates[node_at_intersection]);
return intersection_view; return intersection_view;
} }