提交 64d62c55 编写于 作者: S siyangy 提交者: GitHub

Dreamview: Load default end when needed (#449)

上级 09dd0f83
......@@ -89,8 +89,8 @@ SimulationWorldUpdater::SimulationWorldUpdater(WebSocketHandler *websocket,
// Publish monitor message.
if (succeed) {
sim_world_service_.PublishMonitorMessage(
MonitorMessageItem::INFO, "Routing Request Sent");
sim_world_service_.PublishMonitorMessage(MonitorMessageItem::INFO,
"Routing Request Sent");
} else {
sim_world_service_.PublishMonitorMessage(
MonitorMessageItem::ERROR, "Failed to send routing request");
......@@ -126,13 +126,6 @@ bool SimulationWorldUpdater::ConstructRoutingRequest(
return false;
}
// Try to reload end point if it hasn't be loaded yet.
if (!default_end_point_.has_id() &&
!GetProtoFromASCIIFile(EndWayPointFile(), &default_end_point_)) {
AERROR << "Failed to load default end point from " << EndWayPointFile();
return false;
}
// set start point
auto start = json["start"];
if (start.find("x") == start.end() || start.find("y") == start.end()) {
......@@ -158,6 +151,13 @@ bool SimulationWorldUpdater::ConstructRoutingRequest(
// set end point
RoutingRequest::LaneWaypoint *endLane = routing_request->mutable_end();
if (json["sendDefaultRoute"]) {
// Try to reload end point if it hasn't been loaded yet.
if (!default_end_point_.has_id() &&
!GetProtoFromASCIIFile(EndWayPointFile(), &default_end_point_)) {
AERROR << "Failed to load default end point from " << EndWayPointFile();
return false;
}
endLane->set_id(default_end_point_.id());
endLane->set_s(default_end_point_.s());
auto *pose = endLane->mutable_pose();
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册