Skip to content

Commit bed7b54

Browse files
authored
Merge branch 'main' into feature/smooth_ndt_map_update
2 parents 99b9f25 + c9e6dda commit bed7b54

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

.cspell-partial.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
"perception/bytetrack/lib/**"
66
],
77
"ignoreRegExpList": [],
8-
"words": ["dltype", "tvmgen", "quantizer", "imageio", "mimsave"]
8+
"words": ["dltype", "tvmgen"]
99
}

perception/map_based_prediction/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ If there are a reachable crosswalk entry points within the `prediction_time_hori
193193

194194
This module takes into account the corresponding traffic light information.
195195
When RED signal is indicated, we assume the target object will not walk across.
196-
In additon, if the target object is stopping (not moving) against GREEN signal, we assume the target object will not walk across either.
196+
In addition, if the target object is stopping (not moving) against GREEN signal, we assume the target object will not walk across either.
197197
This prediction comes from the assumption that the object should move if the traffic light is green and the object is intended to cross.
198198

199199
<div align="center">

perception/map_based_prediction/include/map_based_prediction/map_based_prediction_node.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ class MapBasedPredictionNode : public rclcpp::Node
268268
const PredictedPath & predicted_path, const std::vector<PredictedPath> & predicted_paths);
269269
std::optional<lanelet::Id> getTrafficSignalId(const lanelet::ConstLanelet & way_lanelet);
270270
std::optional<TrafficSignalElement> getTrafficSignalElement(const lanelet::Id & id);
271-
bool calcIntentionToCrossWithTrafficSgnal(
271+
bool calcIntentionToCrossWithTrafficSignal(
272272
const TrackedObject & object, const lanelet::ConstLanelet & crosswalk,
273273
const lanelet::Id & signal_id);
274274

perception/map_based_prediction/src/map_based_prediction_node.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1240,7 +1240,7 @@ PredictedObject MapBasedPredictionNode::getPredictedObjectAsCrosswalkUser(
12401240
for (const auto & crosswalk : crosswalks_) {
12411241
const auto crosswalk_signal_id_opt = getTrafficSignalId(crosswalk);
12421242
if (crosswalk_signal_id_opt.has_value() && use_crosswalk_signal_) {
1243-
if (!calcIntentionToCrossWithTrafficSgnal(
1243+
if (!calcIntentionToCrossWithTrafficSignal(
12441244
object, crosswalk, crosswalk_signal_id_opt.value())) {
12451245
continue;
12461246
}
@@ -2292,7 +2292,7 @@ std::optional<TrafficSignalElement> MapBasedPredictionNode::getTrafficSignalElem
22922292
return std::nullopt;
22932293
}
22942294

2295-
bool MapBasedPredictionNode::calcIntentionToCrossWithTrafficSgnal(
2295+
bool MapBasedPredictionNode::calcIntentionToCrossWithTrafficSignal(
22962296
const TrackedObject & object, const lanelet::ConstLanelet & crosswalk,
22972297
const lanelet::Id & signal_id)
22982298
{

planning/external_velocity_limit_selector/src/external_velocity_limit_selector_node.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ ExternalVelocityLimitSelectorNode::ExternalVelocityLimitSelectorNode(
112112
// Params
113113
{
114114
auto & p = node_param_;
115-
p.max_velocity = this->declare_parameter<double>("max_velocity");
115+
p.max_velocity = this->declare_parameter<double>("max_vel");
116116
p.normal_min_acc = this->declare_parameter<double>("normal.min_acc");
117117
p.normal_max_acc = this->declare_parameter<double>("normal.max_acc");
118118
p.normal_min_jerk = this->declare_parameter<double>("normal.min_jerk");

0 commit comments

Comments
 (0)