Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: add autoware_ prefix to package names and namespaces #3

Merged
merged 14 commits into from
May 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
### Copied from .github/CODEOWNERS-manual ###

### Automatically generated from package.xml ###
lanelet2_extension/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
lanelet2_extension_python/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
autoware_lanelet2_extension/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
autoware_lanelet2_extension_python/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.14)
project(lanelet2_extension)
project(autoware_lanelet2_extension)

find_package(autoware_cmake REQUIRED)
autoware_package()
Expand Down Expand Up @@ -30,7 +30,7 @@ include_directories(

add_definitions(${GeographicLib_DEFINITIONS})

ament_auto_add_library(lanelet2_extension_lib SHARED
ament_auto_add_library(${PROJECT_NAME}_lib SHARED
lib/autoware_osm_parser.cpp
lib/autoware_traffic_light.cpp
lib/crosswalk.cpp
Expand All @@ -49,54 +49,54 @@ ament_auto_add_library(lanelet2_extension_lib SHARED
lib/visualization.cpp
lib/route_checker.cpp
)
target_link_libraries(lanelet2_extension_lib
target_link_libraries(${PROJECT_NAME}_lib
${GeographicLib_LIBRARIES}
)
get_target_property(lanelet2_core_INCLUDE_DIRECTORIES lanelet2_core::lanelet2_core INTERFACE_INCLUDE_DIRECTORIES)
target_include_directories(lanelet2_extension_lib
target_include_directories(${PROJECT_NAME}_lib
SYSTEM PRIVATE
${lanelet2_core_INCLUDE_DIRECTORIES}
)

ament_auto_add_executable(lanelet2_extension_sample src/sample_code.cpp)
add_dependencies(lanelet2_extension_sample lanelet2_extension_lib)
target_link_libraries(lanelet2_extension_sample
lanelet2_extension_lib
ament_auto_add_executable(${PROJECT_NAME}_sample src/sample_code.cpp)
add_dependencies(${PROJECT_NAME}_sample ${PROJECT_NAME}_lib)
target_link_libraries(${PROJECT_NAME}_sample
${PROJECT_NAME}_lib
)

ament_auto_add_executable(autoware_lanelet2_validation src/validation.cpp)
add_dependencies(autoware_lanelet2_validation lanelet2_extension_lib)
add_dependencies(autoware_lanelet2_validation ${PROJECT_NAME}_lib)
target_link_libraries(autoware_lanelet2_validation
${catkin_LIBRARIES}
${PUGIXML_LIBRARIES}
lanelet2_extension_lib
${PROJECT_NAME}_lib
)

ament_auto_add_executable(check_right_of_way src/check_right_of_way.cpp)
add_dependencies(check_right_of_way lanelet2_extension_lib)
add_dependencies(check_right_of_way ${PROJECT_NAME}_lib)
target_link_libraries(check_right_of_way
${catkin_LIBRARIES}
${PUGIXML_LIBRARIES}
lanelet2_extension_lib
${PROJECT_NAME}_lib
)

if(BUILD_TESTING)
ament_add_ros_isolated_gtest(message_conversion-test test/src/test_message_conversion.cpp)
target_link_libraries(message_conversion-test lanelet2_extension_lib)
target_link_libraries(message_conversion-test ${PROJECT_NAME}_lib)
ament_add_ros_isolated_gtest(projector-test test/src/test_projector.cpp)
target_link_libraries(projector-test lanelet2_extension_lib)
target_link_libraries(projector-test ${PROJECT_NAME}_lib)
ament_add_ros_isolated_gtest(query-test test/src/test_query.cpp)
target_link_libraries(query-test lanelet2_extension_lib)
target_link_libraries(query-test ${PROJECT_NAME}_lib)
ament_add_ros_isolated_gtest(regulatory_elements-test test/src/test_regulatory_elements.cpp)
target_link_libraries(regulatory_elements-test lanelet2_extension_lib)
target_link_libraries(regulatory_elements-test ${PROJECT_NAME}_lib)
ament_add_ros_isolated_gtest(utilities-test test/src/test_utilities.cpp)
target_link_libraries(utilities-test lanelet2_extension_lib)
target_link_libraries(utilities-test ${PROJECT_NAME}_lib)
target_include_directories(utilities-test
SYSTEM PRIVATE
${lanelet2_core_INCLUDE_DIRECTORIES}
)
ament_add_ros_isolated_gtest(route-test test/src/test_route_checker.cpp)
target_link_libraries(route-test lanelet2_extension_lib)
target_link_libraries(route-test ${PROJECT_NAME}_lib)
endif()

ament_auto_package()
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# lanelet2_extension package
# autoware_lanelet2_extension package

This package contains external library for Lanelet2 and is meant to ease the use of Lanelet2 in Autoware.

Expand Down Expand Up @@ -86,9 +86,9 @@ Currently it contains following conversions:

## Nodes

### lanelet2_extension_sample
### autoware_lanelet2_extension_sample

Code for this explains how this lanelet2_extension library is used.
Code for this explains how this autoware_lanelet2_extension library is used.
The executable is not meant to do anything.

### autoware_lanelet2_extension
Expand All @@ -97,5 +97,5 @@ This node checks if an .osm file follows the Autoware version of Lanelet2 format
You can check by running:

```sh
ros2 run lanelet2_extension autoware_lanelet2_validation --ros-args -p map_file:=<path/to/map.osm>
ros2 run autoware_lanelet2_extension autoware_lanelet2_validation --ros-args -p map_file:=<path/to/map.osm>
```
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

// NOLINTBEGIN(readability-identifier-naming)

#include <lanelet2_extension/regulatory_elements/Forward.hpp>
#include <autoware_lanelet2_extension/regulatory_elements/Forward.hpp>

#include <lanelet2_core/Forward.h>
#include <lanelet2_core/primitives/Lanelet.h>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

// NOLINTBEGIN(readability-identifier-naming)

#include <lanelet2_extension/regulatory_elements/Forward.hpp>
#include <autoware_lanelet2_extension/regulatory_elements/Forward.hpp>

#include <lanelet2_core/primitives/Lanelet.h>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

// NOLINTBEGIN(readability-identifier-naming)

#include <lanelet2_extension/regulatory_elements/Forward.hpp>
#include <autoware_lanelet2_extension/regulatory_elements/Forward.hpp>

#include <lanelet2_core/primitives/Lanelet.h>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

// NOLINTBEGIN(readability-identifier-naming)

#include <lanelet2_extension/regulatory_elements/Forward.hpp>
#include <autoware_lanelet2_extension/regulatory_elements/Forward.hpp>

#include <lanelet2_core/primitives/Lanelet.h>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

// NOLINTBEGIN(readability-identifier-naming)

#include <lanelet2_extension/regulatory_elements/Forward.hpp>
#include <autoware_lanelet2_extension/regulatory_elements/Forward.hpp>

#include <lanelet2_core/primitives/Lanelet.h>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

// NOLINTBEGIN(readability-identifier-naming)

#include <lanelet2_extension/regulatory_elements/Forward.hpp>
#include <autoware_lanelet2_extension/regulatory_elements/Forward.hpp>

#include <lanelet2_core/primitives/LineString.h>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

// NOLINTBEGIN(readability-identifier-naming)

#include <lanelet2_extension/regulatory_elements/Forward.hpp>
#include <autoware_lanelet2_extension/regulatory_elements/Forward.hpp>

#include <lanelet2_core/primitives/Lanelet.h>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

// NOLINTBEGIN(readability-identifier-naming)

#include <lanelet2_extension/regulatory_elements/Forward.hpp>
#include <autoware_lanelet2_extension/regulatory_elements/Forward.hpp>

#include <lanelet2_core/primitives/LineString.h>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@

// NOLINTBEGIN(readability-identifier-naming)

#include "lanelet2_extension/regulatory_elements/autoware_traffic_light.hpp"
#include "lanelet2_extension/regulatory_elements/crosswalk.hpp"
#include "lanelet2_extension/regulatory_elements/detection_area.hpp"
#include "lanelet2_extension/regulatory_elements/no_parking_area.hpp"
#include "lanelet2_extension/regulatory_elements/no_stopping_area.hpp"
#include "lanelet2_extension/regulatory_elements/speed_bump.hpp"
#include "autoware_lanelet2_extension/regulatory_elements/autoware_traffic_light.hpp"
#include "autoware_lanelet2_extension/regulatory_elements/crosswalk.hpp"
#include "autoware_lanelet2_extension/regulatory_elements/detection_area.hpp"
#include "autoware_lanelet2_extension/regulatory_elements/no_parking_area.hpp"
#include "autoware_lanelet2_extension/regulatory_elements/no_stopping_area.hpp"
#include "autoware_lanelet2_extension/regulatory_elements/speed_bump.hpp"

#include <geometry_msgs/msg/point.hpp>
#include <geometry_msgs/msg/pose.hpp>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@

// NOLINTBEGIN(readability-identifier-naming)

#include "lanelet2_extension/regulatory_elements/autoware_traffic_light.hpp"
#include "lanelet2_extension/regulatory_elements/no_parking_area.hpp"
#include "lanelet2_extension/regulatory_elements/no_stopping_area.hpp"
#include "lanelet2_extension/utility/query.hpp"
#include "autoware_lanelet2_extension/regulatory_elements/autoware_traffic_light.hpp"
#include "autoware_lanelet2_extension/regulatory_elements/no_parking_area.hpp"
#include "autoware_lanelet2_extension/regulatory_elements/no_stopping_area.hpp"
#include "autoware_lanelet2_extension/utility/query.hpp"

#include <rclcpp/rclcpp.hpp>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

// NOLINTBEGIN(readability-identifier-naming)

#include "lanelet2_extension/io/autoware_osm_parser.hpp"
#include "autoware_lanelet2_extension/io/autoware_osm_parser.hpp"

#include <lanelet2_core/geometry/LineString.h>
#include <lanelet2_io/io_handlers/Factory.h>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

// NOLINTBEGIN(readability-identifier-naming)

#include "lanelet2_extension/regulatory_elements/autoware_traffic_light.hpp"
#include "autoware_lanelet2_extension/regulatory_elements/autoware_traffic_light.hpp"

#include <boost/variant.hpp>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

// NOLINTBEGIN(readability-identifier-naming)

#include "lanelet2_extension/regulatory_elements/crosswalk.hpp"
#include "autoware_lanelet2_extension/regulatory_elements/crosswalk.hpp"

#include <boost/variant.hpp>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

// NOLINTBEGIN(readability-identifier-naming)

#include "lanelet2_extension/regulatory_elements/detection_area.hpp"
#include "autoware_lanelet2_extension/regulatory_elements/detection_area.hpp"

#include <boost/variant.hpp>

Expand Down
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 "lanelet2_extension/localization/landmark.hpp"
#include "autoware_lanelet2_extension/localization/landmark.hpp"

#include "lanelet2_extension/utility/message_conversion.hpp"
#include "autoware_lanelet2_extension/utility/message_conversion.hpp"

#include <Eigen/Core>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@

// NOLINTBEGIN(readability-identifier-naming)

#include "lanelet2_extension/utility/message_conversion.hpp"
#include "autoware_lanelet2_extension/utility/message_conversion.hpp"

#include "lanelet2_extension/projection/mgrs_projector.hpp"
#include "autoware_lanelet2_extension/projection/mgrs_projector.hpp"

#include <boost/archive/binary_iarchive.hpp>
#include <boost/archive/binary_oarchive.hpp>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

// NOLINTBEGIN(readability-identifier-naming)

#include "lanelet2_extension/projection/mgrs_projector.hpp"
#include "autoware_lanelet2_extension/projection/mgrs_projector.hpp"

#include <iostream>
#include <set>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

// NOLINTBEGIN(readability-identifier-naming)

#include "lanelet2_extension/regulatory_elements/no_parking_area.hpp"
#include "autoware_lanelet2_extension/regulatory_elements/no_parking_area.hpp"

#include <boost/variant.hpp>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

// NOLINTBEGIN(readability-identifier-naming)

#include "lanelet2_extension/regulatory_elements/no_stopping_area.hpp"
#include "autoware_lanelet2_extension/regulatory_elements/no_stopping_area.hpp"

#include <boost/variant.hpp>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@

// NOLINTBEGIN(readability-identifier-naming)

#include "lanelet2_extension/utility/query.hpp"

#include "lanelet2_extension/regulatory_elements/autoware_traffic_light.hpp"
#include "lanelet2_extension/regulatory_elements/crosswalk.hpp"
#include "lanelet2_extension/regulatory_elements/detection_area.hpp"
#include "lanelet2_extension/regulatory_elements/no_parking_area.hpp"
#include "lanelet2_extension/regulatory_elements/no_stopping_area.hpp"
#include "lanelet2_extension/regulatory_elements/speed_bump.hpp"
#include "lanelet2_extension/utility/message_conversion.hpp"
#include "lanelet2_extension/utility/utilities.hpp"
#include "autoware_lanelet2_extension/utility/query.hpp"

#include "autoware_lanelet2_extension/regulatory_elements/autoware_traffic_light.hpp"
#include "autoware_lanelet2_extension/regulatory_elements/crosswalk.hpp"
#include "autoware_lanelet2_extension/regulatory_elements/detection_area.hpp"
#include "autoware_lanelet2_extension/regulatory_elements/no_parking_area.hpp"
#include "autoware_lanelet2_extension/regulatory_elements/no_stopping_area.hpp"
#include "autoware_lanelet2_extension/regulatory_elements/speed_bump.hpp"
#include "autoware_lanelet2_extension/utility/message_conversion.hpp"
#include "autoware_lanelet2_extension/utility/utilities.hpp"

#include <Eigen/Eigen>
#include <autoware_utils/autoware_utils.hpp>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

// NOLINTBEGIN(readability-identifier-naming)

#include "lanelet2_extension/regulatory_elements/road_marking.hpp"
#include "autoware_lanelet2_extension/regulatory_elements/road_marking.hpp"

#include <boost/variant.hpp>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@

// NOLINTBEGIN(readability-identifier-naming)

#include "lanelet2_extension/utility/route_checker.hpp"
#include "autoware_lanelet2_extension/utility/route_checker.hpp"

#include <lanelet2_extension/utility/message_conversion.hpp>
#include <lanelet2_extension/utility/query.hpp>
#include <autoware_lanelet2_extension/utility/message_conversion.hpp>
#include <autoware_lanelet2_extension/utility/query.hpp>

#include <lanelet2_core/LaneletMap.h>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

// NOLINTBEGIN(readability-identifier-naming)

#include "lanelet2_extension/regulatory_elements/speed_bump.hpp"
#include "autoware_lanelet2_extension/regulatory_elements/speed_bump.hpp"

#include <boost/variant.hpp>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

// NOLINTBEGIN(readability-identifier-naming, cppcoreguidelines-pro-type-member-init)

#include "lanelet2_extension/projection/transverse_mercator_projector.hpp"
#include "autoware_lanelet2_extension/projection/transverse_mercator_projector.hpp"

#include <iostream>
#include <set>
Expand Down
Loading
Loading