Skip to content

Commit

Permalink
refactor(ar_tag_based_localizer): add prefix "autoware_" to ar_tag_ba…
Browse files Browse the repository at this point in the history
…sed_localizer (#7483)

* Added prefix "autoware_" to ar_tag_based_localizer

Signed-off-by: Shintaro Sakoda <shintaro.sakoda@tier4.jp>

* style(pre-commit): autofix

* Fixed localization_launch

Signed-off-by: Shintaro Sakoda <shintaro.sakoda@tier4.jp>

* style(pre-commit): autofix

---------

Signed-off-by: Shintaro Sakoda <shintaro.sakoda@tier4.jp>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
  • Loading branch information
SakodaShintaro and pre-commit-ci[bot] committed Jun 17, 2024
1 parent 2de41ba commit 507e3f4
Show file tree
Hide file tree
Showing 23 changed files with 17 additions and 17 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<group>
<arg name="input_image"/>

<include file="$(find-pkg-share ar_tag_based_localizer)/launch/ar_tag_based_localizer.launch.xml">
<include file="$(find-pkg-share autoware_ar_tag_based_localizer)/launch/ar_tag_based_localizer.launch.xml">
<arg name="input_lanelet2_map" value="/map/vector_map"/>
<arg name="input_image" value="$(var input_image)"/>
<arg name="input_camera_info" value="/sensing/camera/traffic_light/camera_info"/>
Expand Down
2 changes: 1 addition & 1 deletion launch/tier4_localization_launch/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
<buildtool_depend>ament_cmake_auto</buildtool_depend>
<buildtool_depend>autoware_cmake</buildtool_depend>

<exec_depend>ar_tag_based_localizer</exec_depend>
<exec_depend>automatic_pose_initializer</exec_depend>
<exec_depend>autoware_ar_tag_based_localizer</exec_depend>
<exec_depend>eagleye_geo_pose_fusion</exec_depend>
<exec_depend>eagleye_gnss_converter</exec_depend>
<exec_depend>eagleye_rt</exec_depend>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.14)
project(ar_tag_based_localizer)
project(autoware_ar_tag_based_localizer)

find_package(autoware_cmake REQUIRED)
autoware_package()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<launch>
<arg name="param_file" default="$(find-pkg-share ar_tag_based_localizer)/config/ar_tag_based_localizer.param.yaml"/>
<arg name="param_file" default="$(find-pkg-share autoware_ar_tag_based_localizer)/config/ar_tag_based_localizer.param.yaml"/>
<arg name="node_name" default="ar_tag_based_localizer"/>

<!-- Topic names -->
Expand All @@ -14,7 +14,7 @@
<arg name="debug_mapped_tag" default="~/debug/mapped_tag"/>
<arg name="debug_detected_tag" default="~/debug/detected_tag"/>

<node pkg="ar_tag_based_localizer" exec="ar_tag_based_localizer_node" name="$(var node_name)" output="both">
<node pkg="autoware_ar_tag_based_localizer" exec="autoware_ar_tag_based_localizer_node" name="$(var node_name)" output="both">
<remap from="~/input/lanelet2_map" to="$(var input_lanelet2_map)"/>
<remap from="~/input/image" to="$(var input_image)"/>
<remap from="~/input/camera_info" to="$(var input_camera_info)"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0"?>
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>ar_tag_based_localizer</name>
<name>autoware_ar_tag_based_localizer</name>
<version>0.0.0</version>
<description>The ar_tag_based_localizer package</description>
<description>The autoware_ar_tag_based_localizer package</description>
<maintainer email="shintaro.sakoda@tier4.jp">Shintaro Sakoda</maintainer>
<maintainer email="masahiro.sakamoto@tier4.jp">Masahiro Sakamoto</maintainer>
<maintainer email="yamato.ando@tier4.jp">Yamato Ando</maintainer>
Expand All @@ -18,9 +18,9 @@

<depend>ament_index_cpp</depend>
<depend>aruco</depend>
<depend>autoware_landmark_manager</depend>
<depend>cv_bridge</depend>
<depend>diagnostic_msgs</depend>
<depend>landmark_manager</depend>
<depend>lanelet2_extension</depend>
<depend>localization_util</depend>
<depend>rclcpp</depend>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
#ifndef AR_TAG_BASED_LOCALIZER_HPP_
#define AR_TAG_BASED_LOCALIZER_HPP_

#include "landmark_manager/landmark_manager.hpp"
#include "autoware/landmark_manager/landmark_manager.hpp"
#include "localization_util/smart_pose_buffer.hpp"

#include <rclcpp/rclcpp.hpp>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class TestArTagBasedLocalizer : public ::testing::Test
void SetUp() override
{
const std::string yaml_path =
ament_index_cpp::get_package_share_directory("ar_tag_based_localizer") +
ament_index_cpp::get_package_share_directory("autoware_ar_tag_based_localizer") +
"/config/ar_tag_based_localizer.param.yaml";

rcl_params_t * params_st = rcl_yaml_node_struct_init(rcl_get_default_allocator());
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.14)
project(landmark_manager)
project(autoware_landmark_manager)

find_package(autoware_cmake REQUIRED)
autoware_package()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef LANDMARK_MANAGER__LANDMARK_MANAGER_HPP_
#define LANDMARK_MANAGER__LANDMARK_MANAGER_HPP_
#ifndef AUTOWARE__LANDMARK_MANAGER__LANDMARK_MANAGER_HPP_
#define AUTOWARE__LANDMARK_MANAGER__LANDMARK_MANAGER_HPP_

#include "lanelet2_extension/localization/landmark.hpp"

Expand Down Expand Up @@ -61,4 +61,4 @@ class LandmarkManager

} // namespace landmark_manager

#endif // LANDMARK_MANAGER__LANDMARK_MANAGER_HPP_
#endif // AUTOWARE__LANDMARK_MANAGER__LANDMARK_MANAGER_HPP_
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0"?>
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>landmark_manager</name>
<name>autoware_landmark_manager</name>
<version>0.0.0</version>
<description>The landmark_manager package</description>
<description>The autoware_landmark_manager package</description>
<maintainer email="shintaro.sakoda@tier4.jp">Shintaro Sakoda</maintainer>
<maintainer email="masahiro.sakamoto@tier4.jp">Masahiro Sakamoto</maintainer>
<maintainer email="yamato.ando@tier4.jp">Yamato Ando</maintainer>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include "landmark_manager/landmark_manager.hpp"
#include "autoware/landmark_manager/landmark_manager.hpp"

#include "lanelet2_extension/utility/message_conversion.hpp"
#include "localization_util/util_func.hpp"
Expand Down

0 comments on commit 507e3f4

Please sign in to comment.