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

Check activation index of EntryClass and warn if activation failed

Browse Source
This commit is contained in:
Michael Krasnyk
2017-07-11 11:06:56 +02:00
committed by Patrick Niklaus
parent 58b61c68a3
commit b2ed46efb5
6 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/extractor/guidance/turn_classification.cpp
+12 -3
View File
@@ -12,7 +12,7 @@ namespace guidance
{
std::pair<util::guidance::EntryClass, util::guidance::BearingClass>
classifyIntersection(Intersection intersection)
classifyIntersection(Intersection intersection, const osrm::util::Coordinate &location)
{
if (intersection.empty())
return {};
@@ -56,7 +56,12 @@ classifyIntersection(Intersection intersection)
for (const auto &road : intersection)
{
if (road.entry_allowed)
entry_class.activate(number);
{
if (!entry_class.activate(number))
util::Log(logWARNING) << "Road " << number << " was not activated at "
<< location;
}
auto discrete_bearing_class =
util::guidance::BearingClass::getDiscreteBearing(std::round(road.bearing));
bearing_class.add(std::round(discrete_bearing_class *
@@ -69,7 +74,11 @@ classifyIntersection(Intersection intersection)
for (const auto &road : intersection)
{
if (road.entry_allowed)
entry_class.activate(number);
{
if (!entry_class.activate(number))
util::Log(logWARNING) << "Road " << number << " was not activated at "
<< location;
}
bearing_class.add(std::round(road.bearing));
++number;
}