Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
Signed-off-by: Takayuki Murooka <takayuki5168@gmail.com>
  • Loading branch information
takayuki5168 committed Aug 6, 2023
1 parent c272f90 commit 32eaee2
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,16 @@ class DynamicAvoidanceModule : public SceneModuleInterface
}
return object_map_.at(uuid);
}
void updateObject(
const std::string & uuid, const MinMaxValue & lon_offset_to_avoid,
const MinMaxValue & lat_offset_to_avoid, const bool is_collision_left,
const bool should_be_avoided)
{
if (object_map_.count(uuid) != 0) {
object_map_.at(uuid).update(
lon_offset_to_avoid, lat_offset_to_avoid, is_collision_left, should_be_avoided);
}
}

std::vector<std::string> current_uuids_;
// NOTE: positive is for meeting entrying condition, and negative is for exiting.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ void DynamicAvoidanceModule::updateTargetObjects()
target_objects_manager_.finalize();

// 2. Precise filtering of target objects and check if they should be avoided
for (auto & object : target_objects_manager_.getValidObjects()) {
for (const auto & object : target_objects_manager_.getValidObjects()) {
const auto obj_uuid = object.uuid;
const auto prev_object = getObstacleFromUuid(prev_objects, obj_uuid);
const auto obj_path = *std::max_element(
Expand Down Expand Up @@ -505,7 +505,8 @@ void DynamicAvoidanceModule::updateTargetObjects()
*path_points_for_object_polygon, obj_points, is_collision_left, prev_object);

const bool should_be_avoided = true;
object.update(lon_offset_to_avoid, lat_offset_to_avoid, is_collision_left, should_be_avoided);
target_objects_manager_.updateObject(
obj_uuid, lon_offset_to_avoid, lat_offset_to_avoid, is_collision_left, should_be_avoided);
}
}

Expand Down

0 comments on commit 32eaee2

Please sign in to comment.