@@ -641,7 +641,10 @@ void AvoidanceModule::fillDebugData(
641
641
const auto constant_distance = helper_->getFrontConstantDistance (o_front);
642
642
const auto & vehicle_width = planner_data_->parameters .vehicle_width ;
643
643
644
- const auto max_avoid_margin = object_parameter.lateral_hard_margin * o_front.distance_factor +
644
+ const auto lateral_hard_margin = o_front.is_parked
645
+ ? object_parameter.lateral_hard_margin_for_parked_vehicle
646
+ : object_parameter.lateral_hard_margin ;
647
+ const auto max_avoid_margin = lateral_hard_margin * o_front.distance_factor +
645
648
object_parameter.lateral_soft_margin + 0.5 * vehicle_width;
646
649
647
650
const auto avoidance_distance = helper_->getSharpAvoidanceDistance (
@@ -1431,7 +1434,10 @@ double AvoidanceModule::calcDistanceToStopLine(const ObjectData & object) const
1431
1434
const auto object_type = utils::getHighestProbLabel (object.object .classification );
1432
1435
const auto object_parameter = parameters_->object_parameters .at (object_type);
1433
1436
1434
- const auto avoid_margin = object_parameter.lateral_hard_margin * object.distance_factor +
1437
+ const auto lateral_hard_margin = object.is_parked
1438
+ ? object_parameter.lateral_hard_margin_for_parked_vehicle
1439
+ : object_parameter.lateral_hard_margin ;
1440
+ const auto avoid_margin = lateral_hard_margin * object.distance_factor +
1435
1441
object_parameter.lateral_soft_margin + 0.5 * vehicle_width;
1436
1442
const auto avoidance_distance = helper_->getMinAvoidanceDistance (
1437
1443
helper_->getShiftLength (object, utils::avoidance::isOnRight (object), avoid_margin));
@@ -1675,7 +1681,10 @@ void AvoidanceModule::insertPrepareVelocity(ShiftedPath & shifted_path) const
1675
1681
const auto & vehicle_width = planner_data_->parameters .vehicle_width ;
1676
1682
const auto object_type = utils::getHighestProbLabel (object.value ().object .classification );
1677
1683
const auto object_parameter = parameters_->object_parameters .at (object_type);
1678
- const auto avoid_margin = object_parameter.lateral_hard_margin * object.value ().distance_factor +
1684
+ const auto lateral_hard_margin = object.value ().is_parked
1685
+ ? object_parameter.lateral_hard_margin_for_parked_vehicle
1686
+ : object_parameter.lateral_hard_margin ;
1687
+ const auto avoid_margin = lateral_hard_margin * object.value ().distance_factor +
1679
1688
object_parameter.lateral_soft_margin + 0.5 * vehicle_width;
1680
1689
const auto shift_length = helper_->getShiftLength (
1681
1690
object.value (), utils::avoidance::isOnRight (object.value ()), avoid_margin);
0 commit comments