Revert suppressSegregated routing.

This commit is contained in:
vng
2017-10-26 17:55:41 +03:00
committed by Michael Krasnyk
parent 9eae1de9bc
commit 92c4a228e1
6 changed files with 2 additions and 65 deletions
-1
View File
@@ -177,7 +177,6 @@ class RouteAPI : public BaseAPI
leg.steps = guidance::anticipateLaneChange(std::move(leg.steps));
leg.steps = guidance::buildIntersections(std::move(leg.steps));
leg.steps = guidance::suppressShortNameSegments(std::move(leg.steps));
leg.steps = guidance::suppressSegregated(std::move(leg.steps));
leg.steps = guidance::assignRelativeLocations(std::move(leg.steps),
leg_geometry,
phantoms.source_phantom,
@@ -140,8 +140,6 @@ void combineRouteSteps(RouteStep &step_at_turn_location,
// alias for suppressing a step, using CombineRouteStep with NoModificationStrategy only
void suppressStep(RouteStep &step_at_turn_location, RouteStep &step_after_turn_location);
std::vector<RouteStep> suppressSegregated(std::vector<RouteStep> steps);
} /* namespace guidance */
} /* namespace osrm */
} /* namespace osrm */
+1 -1
View File
@@ -165,7 +165,7 @@ inline RouteStep &RouteStep::ElongateBy(const RouteStep &following_step)
following_step.intersections.begin(),
following_step.intersections.end());
is_segregated = false;
/// @todo Process is_segregated flag
return *this;
}
@@ -165,8 +165,6 @@ void annotatePath(const FacadeT &facade,
const auto node_id = *node_from; // edge-based graph node index
const auto name_index = facade.GetNameIndex(node_id);
const bool is_segregated = facade.IsSegregated(node_id);
if (is_segregated)
util::Log() << "111 Segregated node";
const auto turn_instruction = facade.GetTurnInstructionForEdgeID(turn_id);
const extractor::TravelMode travel_mode = facade.GetTravelMode(node_id);
const auto classes = facade.GetClassData(node_id);