Skip to content

Commit

Permalink
Fix bug when spawning a vehicle with rolename other than ego_vehicle (#…
Browse files Browse the repository at this point in the history
…552)

Fixes a bug when spawning a vehicle with rolename other than ego_vehicle.
  • Loading branch information
joel-mb committed Jun 15, 2021
1 parent 153fb48 commit c9f33e0
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ class CarlaSpawnObjects(CompatibleNode):
def __init__(self):
super(CarlaSpawnObjects, self).__init__('carla_spawn_objects')

self.objects_definition_file = self.get_param('objects_definition_file')
self.spawn_sensors_only = self.get_param('spawn_sensors_only', None)
self.objects_definition_file = self.get_param('objects_definition_file', '')
self.spawn_sensors_only = self.get_param('spawn_sensors_only', False)

self.players = []
self.vehicles_sensors = []
Expand Down
8 changes: 3 additions & 5 deletions ros_compatibility/src/ros_compatibility/node.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class CompatibleNode(object):
def __init__(self, name, **kwargs):
pass

def get_param(self, name, alternative_value=None, alternative_name=None):
def get_param(self, name, alternative_value=None):
if name.startswith('/'):
raise RuntimeError("Only private parameters are supported.")
return rospy.get_param("~" + name, alternative_value)
Expand Down Expand Up @@ -142,12 +142,10 @@ def __init__(self, name, **kwargs):
parameter_overrides=[param],
**kwargs)

def get_param(self, name, alternative_value=None, alternative_name=None):
if alternative_name is None:
alternative_name = name
def get_param(self, name, alternative_value=None):
return self.get_parameter_or(
name,
Parameter(alternative_name, value=alternative_value)).value
Parameter(name, value=alternative_value)).value

def get_time(self):
t = self.get_clock().now()
Expand Down

0 comments on commit c9f33e0

Please sign in to comment.