Skip to content

Commit

Permalink
refactor(objects_of_interest_marker_interface)!: prefix package and n…
Browse files Browse the repository at this point in the history
…amespace with autoware (#7413)

Signed-off-by: Fumiya Watanabe <rej55.g@gmail.com>
  • Loading branch information
rej55 authored and KhalilSelyan committed Jul 22, 2024
1 parent e4861e8 commit e50efa3
Show file tree
Hide file tree
Showing 18 changed files with 52 additions and 52 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ planning/mission_planner/** isamu.takagi@tier4.jp kosuke.takeuchi@tier4.jp mamor
planning/motion_velocity_planner/autoware_motion_velocity_out_of_lane_module/** maxime.clement@tier4.jp shumpei.wakabayashi@tier4.jp takayuki.murooka@tier4.jp tomoya.kimura@tier4.jp
planning/motion_velocity_planner/autoware_motion_velocity_planner_common/** maxime.clement@tier4.jp
planning/motion_velocity_planner/autoware_motion_velocity_planner_node/** maxime.clement@tier4.jp
planning/objects_of_interest_marker_interface/** fumiya.watanabe@tier4.jp kosuke.takeuchi@tier4.jp zulfaqar.azmi@tier4.jp
planning/autoware_objects_of_interest_marker_interface/** fumiya.watanabe@tier4.jp kosuke.takeuchi@tier4.jp zulfaqar.azmi@tier4.jp
planning/obstacle_cruise_planner/** kosuke.takeuchi@tier4.jp satoshi.ota@tier4.jp takayuki.murooka@tier4.jp yuki.takagi@tier4.jp
planning/obstacle_stop_planner/** berkay@leodrive.ai bnk@leodrive.ai satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp taiki.tanaka@tier4.jp tomoya.kimura@tier4.jp
planning/obstacle_velocity_limiter/** maxime.clement@tier4.jp
Expand Down
2 changes: 1 addition & 1 deletion planning/.pages
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ nav:
- 'API and Library':
- 'Costmap Generator': planning/costmap_generator
- 'External Velocity Limit Selector': planning/autoware_external_velocity_limit_selector
- 'Objects of Interest Marker Interface': planning/objects_of_interest_marker_interface
- 'Objects of Interest Marker Interface': planning/autoware_objects_of_interest_marker_interface
- 'Route Handler': planning/route_handler
- 'RTC Interface': planning/autoware_rtc_interface
- 'Additional Tools':
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@

namespace behavior_path_planner
{
using autoware::objects_of_interest_marker_interface::ColorName;
using autoware::objects_of_interest_marker_interface::ObjectsOfInterestMarkerInterface;
using geometry_msgs::msg::Pose;
using geometry_msgs::msg::Twist;
using objects_of_interest_marker_interface::ColorName;
using objects_of_interest_marker_interface::ObjectsOfInterestMarkerInterface;
using tier4_planning_msgs::msg::PathWithLaneId;

class LaneChangeInterface : public SceneModuleInterface
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@

#include <autoware_behavior_path_planner_common/interface/steering_factor_interface.hpp>
#include <autoware_behavior_path_planner_common/turn_signal_decider.hpp>
#include <autoware_objects_of_interest_marker_interface/objects_of_interest_marker_interface.hpp>
#include <autoware_rtc_interface/rtc_interface.hpp>
#include <magic_enum.hpp>
#include <motion_utils/marker/marker_helper.hpp>
#include <motion_utils/trajectory/path_with_lane_id.hpp>
#include <motion_utils/trajectory/trajectory.hpp>
#include <objects_of_interest_marker_interface/objects_of_interest_marker_interface.hpp>
#include <rclcpp/rclcpp.hpp>
#include <route_handler/route_handler.hpp>
#include <tier4_autoware_utils/geometry/geometry.hpp>
Expand Down Expand Up @@ -56,11 +56,11 @@

namespace behavior_path_planner
{
using autoware::objects_of_interest_marker_interface::ColorName;
using autoware::objects_of_interest_marker_interface::ObjectsOfInterestMarkerInterface;
using autoware::rtc_interface::RTCInterface;
using autoware_adapi_v1_msgs::msg::PlanningBehavior;
using autoware_adapi_v1_msgs::msg::SteeringFactor;
using objects_of_interest_marker_interface::ColorName;
using objects_of_interest_marker_interface::ObjectsOfInterestMarkerInterface;
using steering_factor_interface::SteeringFactorInterface;
using tier4_autoware_utils::calcOffsetPose;
using tier4_autoware_utils::generateUUID;
Expand Down
2 changes: 1 addition & 1 deletion planning/autoware_behavior_path_planner_common/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
<depend>autoware_adapi_v1_msgs</depend>
<depend>autoware_freespace_planning_algorithms</depend>
<depend>autoware_lane_departure_checker</depend>
<depend>autoware_objects_of_interest_marker_interface</depend>
<depend>autoware_perception_msgs</depend>
<depend>autoware_planning_msgs</depend>
<depend>autoware_rtc_interface</depend>
Expand All @@ -55,7 +56,6 @@
<depend>magic_enum</depend>
<depend>motion_utils</depend>
<depend>object_recognition_utils</depend>
<depend>objects_of_interest_marker_interface</depend>
<depend>rclcpp</depend>
<depend>route_handler</depend>
<depend>tf2</depend>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
<buildtool_depend>eigen3_cmake_module</buildtool_depend>

<depend>autoware_behavior_path_planner_common</depend>
<depend>autoware_objects_of_interest_marker_interface</depend>
<depend>autoware_perception_msgs</depend>
<depend>autoware_rtc_interface</depend>
<depend>autoware_vehicle_info_utils</depend>
Expand All @@ -30,7 +31,6 @@
<depend>lanelet2_extension</depend>
<depend>magic_enum</depend>
<depend>motion_utils</depend>
<depend>objects_of_interest_marker_interface</depend>
<depend>pluginlib</depend>
<depend>rclcpp</depend>
<depend>route_handler</depend>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
#define AUTOWARE_BEHAVIOR_VELOCITY_PLANNER_COMMON__SCENE_MODULE_INTERFACE_HPP_

#include <autoware_behavior_velocity_planner_common/planner_data.hpp>
#include <autoware_objects_of_interest_marker_interface/objects_of_interest_marker_interface.hpp>
#include <autoware_rtc_interface/rtc_interface.hpp>
#include <builtin_interfaces/msg/time.hpp>
#include <motion_utils/factor/velocity_factor_interface.hpp>
#include <motion_utils/marker/virtual_wall_marker_creator.hpp>
#include <objects_of_interest_marker_interface/objects_of_interest_marker_interface.hpp>
#include <tier4_autoware_utils/ros/debug_publisher.hpp>
#include <tier4_autoware_utils/ros/parameter.hpp>

Expand Down Expand Up @@ -48,12 +48,12 @@
namespace autoware::behavior_velocity_planner
{

using autoware::objects_of_interest_marker_interface::ColorName;
using autoware::objects_of_interest_marker_interface::ObjectsOfInterestMarkerInterface;
using autoware::rtc_interface::RTCInterface;
using builtin_interfaces::msg::Time;
using motion_utils::PlanningBehavior;
using motion_utils::VelocityFactor;
using objects_of_interest_marker_interface::ColorName;
using objects_of_interest_marker_interface::ObjectsOfInterestMarkerInterface;
using tier4_autoware_utils::DebugPublisher;
using tier4_autoware_utils::getOrDeclareParameter;
using tier4_debug_msgs::msg::Float64Stamped;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

<depend>autoware_adapi_v1_msgs</depend>
<depend>autoware_map_msgs</depend>
<depend>autoware_objects_of_interest_marker_interface</depend>
<depend>autoware_perception_msgs</depend>
<depend>autoware_planning_msgs</depend>
<depend>autoware_rtc_interface</depend>
Expand All @@ -33,7 +34,6 @@
<depend>lanelet2_extension</depend>
<depend>motion_utils</depend>
<depend>nav_msgs</depend>
<depend>objects_of_interest_marker_interface</depend>
<depend>pcl_conversions</depend>
<depend>rclcpp</depend>
<depend>rclcpp_components</depend>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.5)
project(objects_of_interest_marker_interface)
project(autoware_objects_of_interest_marker_interface)

### Compile options
if(NOT CMAKE_CXX_STANDARD)
Expand All @@ -12,7 +12,7 @@ endif()
find_package(ament_cmake_auto REQUIRED)
ament_auto_find_build_dependencies()

ament_auto_add_library(objects_of_interest_marker_interface SHARED
ament_auto_add_library(autoware_objects_of_interest_marker_interface SHARED
src/coloring.cpp
src/objects_of_interest_marker_interface.cpp
src/marker_utils.cpp
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,20 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef OBJECTS_OF_INTEREST_MARKER_INTERFACE__COLORING_HPP_
#define OBJECTS_OF_INTEREST_MARKER_INTERFACE__COLORING_HPP_
#include "objects_of_interest_marker_interface/marker_data.hpp"
#ifndef AUTOWARE_OBJECTS_OF_INTEREST_MARKER_INTERFACE__COLORING_HPP_
#define AUTOWARE_OBJECTS_OF_INTEREST_MARKER_INTERFACE__COLORING_HPP_
#include "autoware_objects_of_interest_marker_interface/marker_data.hpp"

#include <tier4_autoware_utils/ros/marker_helper.hpp>

#include <std_msgs/msg/color_rgba.hpp>

namespace objects_of_interest_marker_interface::coloring
namespace autoware::objects_of_interest_marker_interface::coloring
{
std_msgs::msg::ColorRGBA getGreen(const float alpha);
std_msgs::msg::ColorRGBA getAmber(const float alpha);
std_msgs::msg::ColorRGBA getRed(const float alpha);
std_msgs::msg::ColorRGBA getGray(const float alpha);
} // namespace objects_of_interest_marker_interface::coloring
} // namespace autoware::objects_of_interest_marker_interface::coloring

#endif // OBJECTS_OF_INTEREST_MARKER_INTERFACE__COLORING_HPP_
#endif // AUTOWARE_OBJECTS_OF_INTEREST_MARKER_INTERFACE__COLORING_HPP_
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef OBJECTS_OF_INTEREST_MARKER_INTERFACE__MARKER_DATA_HPP_
#define OBJECTS_OF_INTEREST_MARKER_INTERFACE__MARKER_DATA_HPP_
#ifndef AUTOWARE_OBJECTS_OF_INTEREST_MARKER_INTERFACE__MARKER_DATA_HPP_
#define AUTOWARE_OBJECTS_OF_INTEREST_MARKER_INTERFACE__MARKER_DATA_HPP_

#include <autoware_perception_msgs/msg/predicted_object.hpp>
#include <geometry_msgs/msg/pose.hpp>
#include <std_msgs/msg/color_rgba.hpp>

namespace objects_of_interest_marker_interface
namespace autoware::objects_of_interest_marker_interface
{
struct ObjectMarkerData
{
Expand All @@ -29,6 +29,6 @@ struct ObjectMarkerData
};

enum class ColorName { GRAY, GREEN, AMBER, RED };
} // namespace objects_of_interest_marker_interface
} // namespace autoware::objects_of_interest_marker_interface

#endif // OBJECTS_OF_INTEREST_MARKER_INTERFACE__MARKER_DATA_HPP_
#endif // AUTOWARE_OBJECTS_OF_INTEREST_MARKER_INTERFACE__MARKER_DATA_HPP_
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef OBJECTS_OF_INTEREST_MARKER_INTERFACE__MARKER_UTILS_HPP_
#define OBJECTS_OF_INTEREST_MARKER_INTERFACE__MARKER_UTILS_HPP_
#include "objects_of_interest_marker_interface/coloring.hpp"
#include "objects_of_interest_marker_interface/marker_data.hpp"
#ifndef AUTOWARE_OBJECTS_OF_INTEREST_MARKER_INTERFACE__MARKER_UTILS_HPP_
#define AUTOWARE_OBJECTS_OF_INTEREST_MARKER_INTERFACE__MARKER_UTILS_HPP_
#include "autoware_objects_of_interest_marker_interface/coloring.hpp"
#include "autoware_objects_of_interest_marker_interface/marker_data.hpp"

#include <tier4_autoware_utils/geometry/boost_polygon_utils.hpp>
#include <tier4_autoware_utils/geometry/geometry.hpp>
Expand All @@ -30,7 +30,7 @@

#include <string>

namespace objects_of_interest_marker_interface::marker_utils
namespace autoware::objects_of_interest_marker_interface::marker_utils
{
/**
* @brief Create arrow marker from object marker data
Expand Down Expand Up @@ -81,6 +81,6 @@ visualization_msgs::msg::Marker createNameTextMarker(
visualization_msgs::msg::MarkerArray createTargetMarker(
const size_t id, const ObjectMarkerData & data, const std::string & name,
const double height_offset, const double arrow_length = 1.0, const double line_width = 0.1);
} // namespace objects_of_interest_marker_interface::marker_utils
} // namespace autoware::objects_of_interest_marker_interface::marker_utils

#endif // OBJECTS_OF_INTEREST_MARKER_INTERFACE__MARKER_UTILS_HPP_
#endif // AUTOWARE_OBJECTS_OF_INTEREST_MARKER_INTERFACE__MARKER_UTILS_HPP_
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef OBJECTS_OF_INTEREST_MARKER_INTERFACE__OBJECTS_OF_INTEREST_MARKER_INTERFACE_HPP_
#define OBJECTS_OF_INTEREST_MARKER_INTERFACE__OBJECTS_OF_INTEREST_MARKER_INTERFACE_HPP_
#include "objects_of_interest_marker_interface/coloring.hpp"
#include "objects_of_interest_marker_interface/marker_data.hpp"
#include "objects_of_interest_marker_interface/marker_utils.hpp"
#ifndef AUTOWARE_OBJECTS_OF_INTEREST_MARKER_INTERFACE__OBJECTS_OF_INTEREST_MARKER_INTERFACE_HPP_
#define AUTOWARE_OBJECTS_OF_INTEREST_MARKER_INTERFACE__OBJECTS_OF_INTEREST_MARKER_INTERFACE_HPP_
#include "autoware_objects_of_interest_marker_interface/coloring.hpp"
#include "autoware_objects_of_interest_marker_interface/marker_data.hpp"
#include "autoware_objects_of_interest_marker_interface/marker_utils.hpp"

#include <rclcpp/rclcpp.hpp>

Expand All @@ -28,7 +28,7 @@
#include <string>
#include <vector>

namespace objects_of_interest_marker_interface
namespace autoware::objects_of_interest_marker_interface
{
class ObjectsOfInterestMarkerInterface
{
Expand Down Expand Up @@ -98,6 +98,6 @@ class ObjectsOfInterestMarkerInterface
std::string topic_namespace_ = "/planning/debug/objects_of_interest";
};

} // namespace objects_of_interest_marker_interface
} // namespace autoware::objects_of_interest_marker_interface

#endif // OBJECTS_OF_INTEREST_MARKER_INTERFACE__OBJECTS_OF_INTEREST_MARKER_INTERFACE_HPP_
#endif // AUTOWARE_OBJECTS_OF_INTEREST_MARKER_INTERFACE__OBJECTS_OF_INTEREST_MARKER_INTERFACE_HPP_
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
<package format="3">
<name>objects_of_interest_marker_interface</name>
<name>autoware_objects_of_interest_marker_interface</name>
<version>0.1.0</version>
<description>The objects_of_interest_marker_interface package</description>
<description>The autoware_objects_of_interest_marker_interface package</description>

<maintainer email="fumiya.watanabe@tier4.jp">Fumiya Watanabe</maintainer>
<maintainer email="kosuke.takeuchi@tier4.jp">Kosuke Takeuchi</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 "objects_of_interest_marker_interface/coloring.hpp"
#include "autoware_objects_of_interest_marker_interface/coloring.hpp"

namespace
{
Expand All @@ -26,7 +26,7 @@ std_msgs::msg::ColorRGBA convertFromColorCode(const uint64_t code, const float a
}
} // namespace

namespace objects_of_interest_marker_interface::coloring
namespace autoware::objects_of_interest_marker_interface::coloring
{
std_msgs::msg::ColorRGBA getGreen(const float alpha)
{
Expand All @@ -51,4 +51,4 @@ std_msgs::msg::ColorRGBA getGray(const float alpha)
constexpr uint64_t code = 0xbdbdbd;
return convertFromColorCode(code, alpha);
}
} // namespace objects_of_interest_marker_interface::coloring
} // namespace autoware::objects_of_interest_marker_interface::coloring
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include "objects_of_interest_marker_interface/marker_utils.hpp"
#include "autoware_objects_of_interest_marker_interface/marker_utils.hpp"

namespace objects_of_interest_marker_interface::marker_utils
namespace autoware::objects_of_interest_marker_interface::marker_utils
{
using geometry_msgs::msg::Point;

Expand Down Expand Up @@ -111,4 +111,4 @@ MarkerArray createTargetMarker(

return marker_array;
}
} // namespace objects_of_interest_marker_interface::marker_utils
} // namespace autoware::objects_of_interest_marker_interface::marker_utils
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include "objects_of_interest_marker_interface/objects_of_interest_marker_interface.hpp"
#include "autoware_objects_of_interest_marker_interface/objects_of_interest_marker_interface.hpp"

#include <tier4_autoware_utils/geometry/geometry.hpp>
#include <tier4_autoware_utils/math/constants.hpp>
#include <tier4_autoware_utils/math/trigonometry.hpp>

namespace objects_of_interest_marker_interface
namespace autoware::objects_of_interest_marker_interface
{
using autoware_perception_msgs::msg::Shape;
using geometry_msgs::msg::Pose;
Expand Down Expand Up @@ -87,4 +87,4 @@ ColorRGBA ObjectsOfInterestMarkerInterface::getColor(
}
}

} // namespace objects_of_interest_marker_interface
} // namespace autoware::objects_of_interest_marker_interface

0 comments on commit e50efa3

Please sign in to comment.