Skip to content

Commit 9c47b85

Browse files
authored
Merge pull request #1589 from tier4/fix/mics-objects-model3d
fix: add missing MiscObjectBehavior when calling spawn api
2 parents bb929cf + 56fd39e commit 9c47b85

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

openscenario/openscenario_interpreter/src/syntax/add_entity_action.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -146,24 +146,24 @@ try {
146146
applyAddEntityAction(
147147
entity_ref, static_cast<NativeWorldPosition>(position.as<WorldPosition>()),
148148
static_cast<traffic_simulator_msgs::msg::MiscObjectParameters>(misc_object),
149-
misc_object.model3d);
149+
traffic_simulator::MicsObjectBehavior::noBehavior(), misc_object.model3d);
150150
} else if (position.is<RelativeWorldPosition>()) {
151151
applyAddEntityAction(
152152
entity_ref,
153153
static_cast<NativeRelativeWorldPosition>(position.as<RelativeWorldPosition>()),
154154
static_cast<traffic_simulator_msgs::msg::MiscObjectParameters>(misc_object),
155-
misc_object.model3d);
155+
traffic_simulator::MicsObjectBehavior::noBehavior(), misc_object.model3d);
156156
} else if (position.is<RelativeObjectPosition>()) {
157157
applyAddEntityAction(
158158
entity_ref,
159159
static_cast<NativeRelativeWorldPosition>(position.as<RelativeObjectPosition>()),
160160
static_cast<traffic_simulator_msgs::msg::MiscObjectParameters>(misc_object),
161-
misc_object.model3d);
161+
traffic_simulator::MicsObjectBehavior::noBehavior(), misc_object.model3d);
162162
} else if (position.is<LanePosition>()) {
163163
applyAddEntityAction(
164164
entity_ref, static_cast<NativeLanePosition>(position.as<LanePosition>()),
165165
static_cast<traffic_simulator_msgs::msg::MiscObjectParameters>(misc_object),
166-
misc_object.model3d);
166+
traffic_simulator::MicsObjectBehavior::noBehavior(), misc_object.model3d);
167167
} else {
168168
throw common::Error(__FILE__);
169169
}

simulation/traffic_simulator/include/traffic_simulator/api/api.hpp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,15 @@ struct PedestrianBehavior : public entity::PedestrianEntity::BuiltinBehavior
4343
{
4444
};
4545

46+
struct MicsObjectBehavior
47+
{
48+
static auto noBehavior() noexcept -> const std::string &
49+
{
50+
static const std::string name = "";
51+
return name;
52+
}
53+
};
54+
4655
class API
4756
{
4857
public:

0 commit comments

Comments
 (0)