Fix handling unexpected errors.

This commit is contained in:
Patrick Niklaus 2016-01-14 18:27:36 +01:00
parent e7d9e42a16
commit 6b15f29d7c

View File

@ -137,14 +137,15 @@ template <class DataFacadeT> class ViaRoutePlugin final : public BasePlugin
route_parameters.uturns, raw_route); route_parameters.uturns, raw_route);
} }
bool no_route = INVALID_EDGE_WEIGHT == raw_route.shortest_path_length;
auto generator = MakeApiResponseGenerator(facade);
generator.DescribeRoute(route_parameters, raw_route, json_result);
// we can only know this after the fact, different SCC ids still // we can only know this after the fact, different SCC ids still
// allow for connection in one direction. // allow for connection in one direction.
if (no_route) if (raw_route.is_valid())
{
auto generator = MakeApiResponseGenerator(facade);
generator.DescribeRoute(route_parameters, raw_route, json_result);
json_result.values["status_message"] = "Found route between points";
}
else
{ {
auto first_component_id = snapped_phantoms.front().component.id; auto first_component_id = snapped_phantoms.front().component.id;
auto not_in_same_component = auto not_in_same_component =
@ -153,15 +154,17 @@ template <class DataFacadeT> class ViaRoutePlugin final : public BasePlugin
{ {
return node.component.id != first_component_id; return node.component.id != first_component_id;
}); });
if (not_in_same_component) if (not_in_same_component)
{ {
json_result.values["status_message"] = "Impossible route between points"; json_result.values["status_message"] = "Impossible route between points";
return Status::EmptyResult; return Status::EmptyResult;
} }
} else
else {
{ json_result.values["status_message"] = "No route found between points";
json_result.values["status_message"] = "Found route between points"; return Status::Error;
}
} }
return Status::Ok; return Status::Ok;