diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 3be45ab..3457840 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,5 +1,5 @@ ### Copied from .github/CODEOWNERS-manual ### ### Automatically generated from package.xml ### -lanelet2_extension/** kosuke.takeuchi@tier4.jp mamoru.sobue@tier4.jp masahiro.sakamoto@tier4.jp ryohsuke.mitsudome@tier4.jp takayuki.murooka@tier4.jp yutaka.kondo@tier4.jp -lanelet2_extension_python/** kosuke.takeuchi@tier4.jp mamoru.sobue@tier4.jp masahiro.sakamoto@tier4.jp ryohsuke.mitsudome@tier4.jp takayuki.murooka@tier4.jp yutaka.kondo@tier4.jp +autoware_lanelet2_extension/** kosuke.takeuchi@tier4.jp mamoru.sobue@tier4.jp masahiro.sakamoto@tier4.jp ryohsuke.mitsudome@tier4.jp takayuki.murooka@tier4.jp yutaka.kondo@tier4.jp +autoware_lanelet2_extension_python/** kosuke.takeuchi@tier4.jp mamoru.sobue@tier4.jp masahiro.sakamoto@tier4.jp ryohsuke.mitsudome@tier4.jp takayuki.murooka@tier4.jp yutaka.kondo@tier4.jp diff --git a/lanelet2_extension/CMakeLists.txt b/autoware_lanelet2_extension/CMakeLists.txt similarity index 69% rename from lanelet2_extension/CMakeLists.txt rename to autoware_lanelet2_extension/CMakeLists.txt index f67e2bf..f7d085a 100644 --- a/lanelet2_extension/CMakeLists.txt +++ b/autoware_lanelet2_extension/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.14) -project(lanelet2_extension) +project(autoware_lanelet2_extension) find_package(autoware_cmake REQUIRED) autoware_package() @@ -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 @@ -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() diff --git a/lanelet2_extension/README.md b/autoware_lanelet2_extension/README.md similarity index 92% rename from lanelet2_extension/README.md rename to autoware_lanelet2_extension/README.md index 85e360b..2c7badc 100644 --- a/lanelet2_extension/README.md +++ b/autoware_lanelet2_extension/README.md @@ -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. @@ -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 @@ -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:= +ros2 run autoware_lanelet2_extension autoware_lanelet2_validation --ros-args -p map_file:= ``` diff --git a/lanelet2_extension/docs/crosswalk_regulatory_element.svg b/autoware_lanelet2_extension/docs/crosswalk_regulatory_element.svg similarity index 100% rename from lanelet2_extension/docs/crosswalk_regulatory_element.svg rename to autoware_lanelet2_extension/docs/crosswalk_regulatory_element.svg diff --git a/lanelet2_extension/docs/crosswalk_traffic_light.svg b/autoware_lanelet2_extension/docs/crosswalk_traffic_light.svg similarity index 100% rename from lanelet2_extension/docs/crosswalk_traffic_light.svg rename to autoware_lanelet2_extension/docs/crosswalk_traffic_light.svg diff --git a/lanelet2_extension/docs/detection_area.png b/autoware_lanelet2_extension/docs/detection_area.png similarity index 100% rename from lanelet2_extension/docs/detection_area.png rename to autoware_lanelet2_extension/docs/detection_area.png diff --git a/lanelet2_extension/docs/extra_lanelet_subtypes.md b/autoware_lanelet2_extension/docs/extra_lanelet_subtypes.md similarity index 100% rename from lanelet2_extension/docs/extra_lanelet_subtypes.md rename to autoware_lanelet2_extension/docs/extra_lanelet_subtypes.md diff --git a/lanelet2_extension/docs/extra_regulatory_elements.md b/autoware_lanelet2_extension/docs/extra_regulatory_elements.md similarity index 100% rename from lanelet2_extension/docs/extra_regulatory_elements.md rename to autoware_lanelet2_extension/docs/extra_regulatory_elements.md diff --git a/lanelet2_extension/docs/lanelet2_format_extension.md b/autoware_lanelet2_extension/docs/lanelet2_format_extension.md similarity index 100% rename from lanelet2_extension/docs/lanelet2_format_extension.md rename to autoware_lanelet2_extension/docs/lanelet2_format_extension.md diff --git a/lanelet2_extension/docs/light_bulbs.png b/autoware_lanelet2_extension/docs/light_bulbs.png similarity index 100% rename from lanelet2_extension/docs/light_bulbs.png rename to autoware_lanelet2_extension/docs/light_bulbs.png diff --git a/lanelet2_extension/docs/localization_landmark.drawio.svg b/autoware_lanelet2_extension/docs/localization_landmark.drawio.svg similarity index 100% rename from lanelet2_extension/docs/localization_landmark.drawio.svg rename to autoware_lanelet2_extension/docs/localization_landmark.drawio.svg diff --git a/lanelet2_extension/docs/pedestrian_lane.svg b/autoware_lanelet2_extension/docs/pedestrian_lane.svg similarity index 100% rename from lanelet2_extension/docs/pedestrian_lane.svg rename to autoware_lanelet2_extension/docs/pedestrian_lane.svg diff --git a/lanelet2_extension/docs/right_of_way.drawio.svg b/autoware_lanelet2_extension/docs/right_of_way.drawio.svg similarity index 100% rename from lanelet2_extension/docs/right_of_way.drawio.svg rename to autoware_lanelet2_extension/docs/right_of_way.drawio.svg diff --git a/lanelet2_extension/docs/road_mark.png b/autoware_lanelet2_extension/docs/road_mark.png similarity index 100% rename from lanelet2_extension/docs/road_mark.png rename to autoware_lanelet2_extension/docs/road_mark.png diff --git a/lanelet2_extension/docs/road_shoulder.svg b/autoware_lanelet2_extension/docs/road_shoulder.svg similarity index 100% rename from lanelet2_extension/docs/road_shoulder.svg rename to autoware_lanelet2_extension/docs/road_shoulder.svg diff --git a/lanelet2_extension/docs/speed_bump.png b/autoware_lanelet2_extension/docs/speed_bump.png similarity index 100% rename from lanelet2_extension/docs/speed_bump.png rename to autoware_lanelet2_extension/docs/speed_bump.png diff --git a/lanelet2_extension/docs/traffic_light.png b/autoware_lanelet2_extension/docs/traffic_light.png similarity index 100% rename from lanelet2_extension/docs/traffic_light.png rename to autoware_lanelet2_extension/docs/traffic_light.png diff --git a/lanelet2_extension/docs/traffic_light_regulatory_element.png b/autoware_lanelet2_extension/docs/traffic_light_regulatory_element.png similarity index 100% rename from lanelet2_extension/docs/traffic_light_regulatory_element.png rename to autoware_lanelet2_extension/docs/traffic_light_regulatory_element.png diff --git a/lanelet2_extension/docs/turn_direction.png b/autoware_lanelet2_extension/docs/turn_direction.png similarity index 100% rename from lanelet2_extension/docs/turn_direction.png rename to autoware_lanelet2_extension/docs/turn_direction.png diff --git a/lanelet2_extension/include/lanelet2_extension/io/autoware_osm_parser.hpp b/autoware_lanelet2_extension/include/autoware_lanelet2_extension/io/autoware_osm_parser.hpp similarity index 100% rename from lanelet2_extension/include/lanelet2_extension/io/autoware_osm_parser.hpp rename to autoware_lanelet2_extension/include/autoware_lanelet2_extension/io/autoware_osm_parser.hpp diff --git a/lanelet2_extension/include/lanelet2_extension/localization/landmark.hpp b/autoware_lanelet2_extension/include/autoware_lanelet2_extension/localization/landmark.hpp similarity index 100% rename from lanelet2_extension/include/lanelet2_extension/localization/landmark.hpp rename to autoware_lanelet2_extension/include/autoware_lanelet2_extension/localization/landmark.hpp diff --git a/lanelet2_extension/include/lanelet2_extension/projection/mgrs_projector.hpp b/autoware_lanelet2_extension/include/autoware_lanelet2_extension/projection/mgrs_projector.hpp similarity index 100% rename from lanelet2_extension/include/lanelet2_extension/projection/mgrs_projector.hpp rename to autoware_lanelet2_extension/include/autoware_lanelet2_extension/projection/mgrs_projector.hpp diff --git a/lanelet2_extension/include/lanelet2_extension/projection/transverse_mercator_projector.hpp b/autoware_lanelet2_extension/include/autoware_lanelet2_extension/projection/transverse_mercator_projector.hpp similarity index 100% rename from lanelet2_extension/include/lanelet2_extension/projection/transverse_mercator_projector.hpp rename to autoware_lanelet2_extension/include/autoware_lanelet2_extension/projection/transverse_mercator_projector.hpp diff --git a/lanelet2_extension/include/lanelet2_extension/regulatory_elements/Forward.hpp b/autoware_lanelet2_extension/include/autoware_lanelet2_extension/regulatory_elements/Forward.hpp similarity index 100% rename from lanelet2_extension/include/lanelet2_extension/regulatory_elements/Forward.hpp rename to autoware_lanelet2_extension/include/autoware_lanelet2_extension/regulatory_elements/Forward.hpp diff --git a/lanelet2_extension/include/lanelet2_extension/regulatory_elements/autoware_traffic_light.hpp b/autoware_lanelet2_extension/include/autoware_lanelet2_extension/regulatory_elements/autoware_traffic_light.hpp similarity index 97% rename from lanelet2_extension/include/lanelet2_extension/regulatory_elements/autoware_traffic_light.hpp rename to autoware_lanelet2_extension/include/autoware_lanelet2_extension/regulatory_elements/autoware_traffic_light.hpp index f175d23..9c5dfd9 100644 --- a/lanelet2_extension/include/lanelet2_extension/regulatory_elements/autoware_traffic_light.hpp +++ b/autoware_lanelet2_extension/include/autoware_lanelet2_extension/regulatory_elements/autoware_traffic_light.hpp @@ -19,7 +19,7 @@ // NOLINTBEGIN(readability-identifier-naming) -#include +#include #include #include diff --git a/lanelet2_extension/include/lanelet2_extension/regulatory_elements/crosswalk.hpp b/autoware_lanelet2_extension/include/autoware_lanelet2_extension/regulatory_elements/crosswalk.hpp similarity index 97% rename from lanelet2_extension/include/lanelet2_extension/regulatory_elements/crosswalk.hpp rename to autoware_lanelet2_extension/include/autoware_lanelet2_extension/regulatory_elements/crosswalk.hpp index f6cec39..f55af5f 100644 --- a/lanelet2_extension/include/lanelet2_extension/regulatory_elements/crosswalk.hpp +++ b/autoware_lanelet2_extension/include/autoware_lanelet2_extension/regulatory_elements/crosswalk.hpp @@ -17,7 +17,7 @@ // NOLINTBEGIN(readability-identifier-naming) -#include +#include #include diff --git a/lanelet2_extension/include/lanelet2_extension/regulatory_elements/detection_area.hpp b/autoware_lanelet2_extension/include/autoware_lanelet2_extension/regulatory_elements/detection_area.hpp similarity index 97% rename from lanelet2_extension/include/lanelet2_extension/regulatory_elements/detection_area.hpp rename to autoware_lanelet2_extension/include/autoware_lanelet2_extension/regulatory_elements/detection_area.hpp index 698ab38..4945a5d 100644 --- a/lanelet2_extension/include/lanelet2_extension/regulatory_elements/detection_area.hpp +++ b/autoware_lanelet2_extension/include/autoware_lanelet2_extension/regulatory_elements/detection_area.hpp @@ -19,7 +19,7 @@ // NOLINTBEGIN(readability-identifier-naming) -#include +#include #include diff --git a/lanelet2_extension/include/lanelet2_extension/regulatory_elements/no_parking_area.hpp b/autoware_lanelet2_extension/include/autoware_lanelet2_extension/regulatory_elements/no_parking_area.hpp similarity index 96% rename from lanelet2_extension/include/lanelet2_extension/regulatory_elements/no_parking_area.hpp rename to autoware_lanelet2_extension/include/autoware_lanelet2_extension/regulatory_elements/no_parking_area.hpp index 8ef43fa..5711300 100644 --- a/lanelet2_extension/include/lanelet2_extension/regulatory_elements/no_parking_area.hpp +++ b/autoware_lanelet2_extension/include/autoware_lanelet2_extension/regulatory_elements/no_parking_area.hpp @@ -17,7 +17,7 @@ // NOLINTBEGIN(readability-identifier-naming) -#include +#include #include diff --git a/lanelet2_extension/include/lanelet2_extension/regulatory_elements/no_stopping_area.hpp b/autoware_lanelet2_extension/include/autoware_lanelet2_extension/regulatory_elements/no_stopping_area.hpp similarity index 97% rename from lanelet2_extension/include/lanelet2_extension/regulatory_elements/no_stopping_area.hpp rename to autoware_lanelet2_extension/include/autoware_lanelet2_extension/regulatory_elements/no_stopping_area.hpp index eaf263b..4400832 100644 --- a/lanelet2_extension/include/lanelet2_extension/regulatory_elements/no_stopping_area.hpp +++ b/autoware_lanelet2_extension/include/autoware_lanelet2_extension/regulatory_elements/no_stopping_area.hpp @@ -17,7 +17,7 @@ // NOLINTBEGIN(readability-identifier-naming) -#include +#include #include diff --git a/lanelet2_extension/include/lanelet2_extension/regulatory_elements/road_marking.hpp b/autoware_lanelet2_extension/include/autoware_lanelet2_extension/regulatory_elements/road_marking.hpp similarity index 96% rename from lanelet2_extension/include/lanelet2_extension/regulatory_elements/road_marking.hpp rename to autoware_lanelet2_extension/include/autoware_lanelet2_extension/regulatory_elements/road_marking.hpp index 0fc4142..8d54249 100644 --- a/lanelet2_extension/include/lanelet2_extension/regulatory_elements/road_marking.hpp +++ b/autoware_lanelet2_extension/include/autoware_lanelet2_extension/regulatory_elements/road_marking.hpp @@ -17,7 +17,7 @@ // NOLINTBEGIN(readability-identifier-naming) -#include +#include #include diff --git a/lanelet2_extension/include/lanelet2_extension/regulatory_elements/speed_bump.hpp b/autoware_lanelet2_extension/include/autoware_lanelet2_extension/regulatory_elements/speed_bump.hpp similarity index 96% rename from lanelet2_extension/include/lanelet2_extension/regulatory_elements/speed_bump.hpp rename to autoware_lanelet2_extension/include/autoware_lanelet2_extension/regulatory_elements/speed_bump.hpp index 59c8d55..b0b4f93 100644 --- a/lanelet2_extension/include/lanelet2_extension/regulatory_elements/speed_bump.hpp +++ b/autoware_lanelet2_extension/include/autoware_lanelet2_extension/regulatory_elements/speed_bump.hpp @@ -19,7 +19,7 @@ // NOLINTBEGIN(readability-identifier-naming) -#include +#include #include diff --git a/lanelet2_extension/include/lanelet2_extension/regulatory_elements/virtual_traffic_light.hpp b/autoware_lanelet2_extension/include/autoware_lanelet2_extension/regulatory_elements/virtual_traffic_light.hpp similarity index 97% rename from lanelet2_extension/include/lanelet2_extension/regulatory_elements/virtual_traffic_light.hpp rename to autoware_lanelet2_extension/include/autoware_lanelet2_extension/regulatory_elements/virtual_traffic_light.hpp index fdbb633..4f90907 100644 --- a/lanelet2_extension/include/lanelet2_extension/regulatory_elements/virtual_traffic_light.hpp +++ b/autoware_lanelet2_extension/include/autoware_lanelet2_extension/regulatory_elements/virtual_traffic_light.hpp @@ -17,7 +17,7 @@ // NOLINTBEGIN(readability-identifier-naming) -#include +#include #include diff --git a/lanelet2_extension/include/lanelet2_extension/utility/message_conversion.hpp b/autoware_lanelet2_extension/include/autoware_lanelet2_extension/utility/message_conversion.hpp similarity index 100% rename from lanelet2_extension/include/lanelet2_extension/utility/message_conversion.hpp rename to autoware_lanelet2_extension/include/autoware_lanelet2_extension/utility/message_conversion.hpp diff --git a/lanelet2_extension/include/lanelet2_extension/utility/query.hpp b/autoware_lanelet2_extension/include/autoware_lanelet2_extension/utility/query.hpp similarity index 96% rename from lanelet2_extension/include/lanelet2_extension/utility/query.hpp rename to autoware_lanelet2_extension/include/autoware_lanelet2_extension/utility/query.hpp index b094a2b..53c8dbc 100644 --- a/lanelet2_extension/include/lanelet2_extension/utility/query.hpp +++ b/autoware_lanelet2_extension/include/autoware_lanelet2_extension/utility/query.hpp @@ -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 #include diff --git a/lanelet2_extension/include/lanelet2_extension/utility/route_checker.hpp b/autoware_lanelet2_extension/include/autoware_lanelet2_extension/utility/route_checker.hpp similarity index 100% rename from lanelet2_extension/include/lanelet2_extension/utility/route_checker.hpp rename to autoware_lanelet2_extension/include/autoware_lanelet2_extension/utility/route_checker.hpp diff --git a/lanelet2_extension/include/lanelet2_extension/utility/utilities.hpp b/autoware_lanelet2_extension/include/autoware_lanelet2_extension/utility/utilities.hpp similarity index 100% rename from lanelet2_extension/include/lanelet2_extension/utility/utilities.hpp rename to autoware_lanelet2_extension/include/autoware_lanelet2_extension/utility/utilities.hpp diff --git a/lanelet2_extension/include/lanelet2_extension/visualization/visualization.hpp b/autoware_lanelet2_extension/include/autoware_lanelet2_extension/visualization/visualization.hpp similarity index 98% rename from lanelet2_extension/include/lanelet2_extension/visualization/visualization.hpp rename to autoware_lanelet2_extension/include/autoware_lanelet2_extension/visualization/visualization.hpp index c904c43..9765589 100644 --- a/lanelet2_extension/include/lanelet2_extension/visualization/visualization.hpp +++ b/autoware_lanelet2_extension/include/autoware_lanelet2_extension/visualization/visualization.hpp @@ -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 diff --git a/lanelet2_extension/lib/autoware_osm_parser.cpp b/autoware_lanelet2_extension/lib/autoware_osm_parser.cpp similarity index 97% rename from lanelet2_extension/lib/autoware_osm_parser.cpp rename to autoware_lanelet2_extension/lib/autoware_osm_parser.cpp index 5c27200..268695f 100644 --- a/lanelet2_extension/lib/autoware_osm_parser.cpp +++ b/autoware_lanelet2_extension/lib/autoware_osm_parser.cpp @@ -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 #include diff --git a/lanelet2_extension/lib/autoware_traffic_light.cpp b/autoware_lanelet2_extension/lib/autoware_traffic_light.cpp similarity index 98% rename from lanelet2_extension/lib/autoware_traffic_light.cpp rename to autoware_lanelet2_extension/lib/autoware_traffic_light.cpp index b0ab77a..482b2e1 100644 --- a/lanelet2_extension/lib/autoware_traffic_light.cpp +++ b/autoware_lanelet2_extension/lib/autoware_traffic_light.cpp @@ -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 diff --git a/lanelet2_extension/lib/crosswalk.cpp b/autoware_lanelet2_extension/lib/crosswalk.cpp similarity index 98% rename from lanelet2_extension/lib/crosswalk.cpp rename to autoware_lanelet2_extension/lib/crosswalk.cpp index 19cb5ff..cdacd5a 100644 --- a/lanelet2_extension/lib/crosswalk.cpp +++ b/autoware_lanelet2_extension/lib/crosswalk.cpp @@ -14,7 +14,7 @@ // NOLINTBEGIN(readability-identifier-naming) -#include "lanelet2_extension/regulatory_elements/crosswalk.hpp" +#include "autoware_lanelet2_extension/regulatory_elements/crosswalk.hpp" #include diff --git a/lanelet2_extension/lib/detection_area.cpp b/autoware_lanelet2_extension/lib/detection_area.cpp similarity index 98% rename from lanelet2_extension/lib/detection_area.cpp rename to autoware_lanelet2_extension/lib/detection_area.cpp index ce7fb2d..9cae1fd 100644 --- a/lanelet2_extension/lib/detection_area.cpp +++ b/autoware_lanelet2_extension/lib/detection_area.cpp @@ -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 diff --git a/lanelet2_extension/lib/landmark.cpp b/autoware_lanelet2_extension/lib/landmark.cpp similarity index 91% rename from lanelet2_extension/lib/landmark.cpp rename to autoware_lanelet2_extension/lib/landmark.cpp index 021103a..9c349aa 100644 --- a/lanelet2_extension/lib/landmark.cpp +++ b/autoware_lanelet2_extension/lib/landmark.cpp @@ -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 diff --git a/lanelet2_extension/lib/message_conversion.cpp b/autoware_lanelet2_extension/lib/message_conversion.cpp similarity index 97% rename from lanelet2_extension/lib/message_conversion.cpp rename to autoware_lanelet2_extension/lib/message_conversion.cpp index 53878e7..4d823f0 100644 --- a/lanelet2_extension/lib/message_conversion.cpp +++ b/autoware_lanelet2_extension/lib/message_conversion.cpp @@ -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 #include diff --git a/lanelet2_extension/lib/mgrs_projector.cpp b/autoware_lanelet2_extension/lib/mgrs_projector.cpp similarity index 98% rename from lanelet2_extension/lib/mgrs_projector.cpp rename to autoware_lanelet2_extension/lib/mgrs_projector.cpp index 891df1b..5d579c7 100644 --- a/lanelet2_extension/lib/mgrs_projector.cpp +++ b/autoware_lanelet2_extension/lib/mgrs_projector.cpp @@ -16,7 +16,7 @@ // NOLINTBEGIN(readability-identifier-naming) -#include "lanelet2_extension/projection/mgrs_projector.hpp" +#include "autoware_lanelet2_extension/projection/mgrs_projector.hpp" #include #include diff --git a/lanelet2_extension/lib/no_parking_area.cpp b/autoware_lanelet2_extension/lib/no_parking_area.cpp similarity index 97% rename from lanelet2_extension/lib/no_parking_area.cpp rename to autoware_lanelet2_extension/lib/no_parking_area.cpp index ee282ba..913edc1 100644 --- a/lanelet2_extension/lib/no_parking_area.cpp +++ b/autoware_lanelet2_extension/lib/no_parking_area.cpp @@ -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 diff --git a/lanelet2_extension/lib/no_stopping_area.cpp b/autoware_lanelet2_extension/lib/no_stopping_area.cpp similarity index 98% rename from lanelet2_extension/lib/no_stopping_area.cpp rename to autoware_lanelet2_extension/lib/no_stopping_area.cpp index afade90..3825557 100644 --- a/lanelet2_extension/lib/no_stopping_area.cpp +++ b/autoware_lanelet2_extension/lib/no_stopping_area.cpp @@ -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 diff --git a/lanelet2_extension/lib/query.cpp b/autoware_lanelet2_extension/lib/query.cpp similarity index 98% rename from lanelet2_extension/lib/query.cpp rename to autoware_lanelet2_extension/lib/query.cpp index a505c12..535ccb7 100644 --- a/lanelet2_extension/lib/query.cpp +++ b/autoware_lanelet2_extension/lib/query.cpp @@ -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 #include diff --git a/lanelet2_extension/lib/road_marking.cpp b/autoware_lanelet2_extension/lib/road_marking.cpp similarity index 96% rename from lanelet2_extension/lib/road_marking.cpp rename to autoware_lanelet2_extension/lib/road_marking.cpp index d514f7a..05e9d70 100644 --- a/lanelet2_extension/lib/road_marking.cpp +++ b/autoware_lanelet2_extension/lib/road_marking.cpp @@ -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 diff --git a/lanelet2_extension/lib/route_checker.cpp b/autoware_lanelet2_extension/lib/route_checker.cpp similarity index 88% rename from lanelet2_extension/lib/route_checker.cpp rename to autoware_lanelet2_extension/lib/route_checker.cpp index 796cfaf..7a6269a 100644 --- a/lanelet2_extension/lib/route_checker.cpp +++ b/autoware_lanelet2_extension/lib/route_checker.cpp @@ -14,10 +14,10 @@ // NOLINTBEGIN(readability-identifier-naming) -#include "lanelet2_extension/utility/route_checker.hpp" +#include "autoware_lanelet2_extension/utility/route_checker.hpp" -#include -#include +#include +#include #include diff --git a/lanelet2_extension/lib/speed_bump.cpp b/autoware_lanelet2_extension/lib/speed_bump.cpp similarity index 97% rename from lanelet2_extension/lib/speed_bump.cpp rename to autoware_lanelet2_extension/lib/speed_bump.cpp index 22e7c2b..708e72d 100644 --- a/lanelet2_extension/lib/speed_bump.cpp +++ b/autoware_lanelet2_extension/lib/speed_bump.cpp @@ -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 diff --git a/lanelet2_extension/lib/transverse_mercator_projector.cpp b/autoware_lanelet2_extension/lib/transverse_mercator_projector.cpp similarity index 96% rename from lanelet2_extension/lib/transverse_mercator_projector.cpp rename to autoware_lanelet2_extension/lib/transverse_mercator_projector.cpp index 1bc5f8b..0534574 100644 --- a/lanelet2_extension/lib/transverse_mercator_projector.cpp +++ b/autoware_lanelet2_extension/lib/transverse_mercator_projector.cpp @@ -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 #include diff --git a/lanelet2_extension/lib/utilities.cpp b/autoware_lanelet2_extension/lib/utilities.cpp similarity index 98% rename from lanelet2_extension/lib/utilities.cpp rename to autoware_lanelet2_extension/lib/utilities.cpp index 8dbf514..73ef88c 100644 --- a/lanelet2_extension/lib/utilities.cpp +++ b/autoware_lanelet2_extension/lib/utilities.cpp @@ -16,10 +16,10 @@ // NOLINTBEGIN(readability-identifier-naming) -#include "lanelet2_extension/utility/utilities.hpp" +#include "autoware_lanelet2_extension/utility/utilities.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 #include @@ -435,7 +435,7 @@ lanelet::ConstLanelet getExpandedLanelet( checkForInversion(orig_right_bound_2d, expanded_right_bound_2d, right_offset); } catch (const lanelet::GeometryError & e) { RCLCPP_ERROR_THROTTLE( - rclcpp::get_logger("lanelet2_extension"), clock, 1000, + rclcpp::get_logger("autoware_lanelet2_extension"), clock, 1000, "Fail to expand lanelet. output may be undesired. Lanelet points interval in map data could " "be too narrow."); } @@ -572,14 +572,14 @@ bool lineStringToPolygon( { if (polygon == nullptr) { RCLCPP_ERROR_STREAM( - rclcpp::get_logger("lanelet2_extension.visualization"), + rclcpp::get_logger("autoware_lanelet2_extension.visualization"), __func__ << ": polygon is null pointer! Failed to convert to polygon."); return false; } if (linestring.size() < 4) { if (linestring.size() < 3 || linestring.front().id() == linestring.back().id()) { RCLCPP_WARN_STREAM( - rclcpp::get_logger("lanelet2_extension.visualization"), + rclcpp::get_logger("autoware_lanelet2_extension.visualization"), __func__ << ": linestring" << linestring.id() << " must have more than different 3 points! (size is " << linestring.size() << "). Failed to convert to polygon."); diff --git a/lanelet2_extension/lib/virtual_traffic_light.cpp b/autoware_lanelet2_extension/lib/virtual_traffic_light.cpp similarity index 96% rename from lanelet2_extension/lib/virtual_traffic_light.cpp rename to autoware_lanelet2_extension/lib/virtual_traffic_light.cpp index 7bf2f21..fbe3696 100644 --- a/lanelet2_extension/lib/virtual_traffic_light.cpp +++ b/autoware_lanelet2_extension/lib/virtual_traffic_light.cpp @@ -14,7 +14,7 @@ // NOLINTBEGIN(readability-identifier-naming) -#include "lanelet2_extension/regulatory_elements/virtual_traffic_light.hpp" +#include "autoware_lanelet2_extension/regulatory_elements/virtual_traffic_light.hpp" #include diff --git a/lanelet2_extension/lib/visualization.cpp b/autoware_lanelet2_extension/lib/visualization.cpp similarity index 98% rename from lanelet2_extension/lib/visualization.cpp rename to autoware_lanelet2_extension/lib/visualization.cpp index 0c48008..797a88d 100644 --- a/lanelet2_extension/lib/visualization.cpp +++ b/autoware_lanelet2_extension/lib/visualization.cpp @@ -16,14 +16,14 @@ // NOLINTBEGIN(readability-identifier-naming) -#include "lanelet2_extension/visualization/visualization.hpp" +#include "autoware_lanelet2_extension/visualization/visualization.hpp" -#include "lanelet2_extension/regulatory_elements/crosswalk.hpp" -#include "lanelet2_extension/regulatory_elements/detection_area.hpp" -#include "lanelet2_extension/regulatory_elements/speed_bump.hpp" -#include "lanelet2_extension/utility/message_conversion.hpp" -#include "lanelet2_extension/utility/query.hpp" -#include "lanelet2_extension/utility/utilities.hpp" +#include "autoware_lanelet2_extension/regulatory_elements/crosswalk.hpp" +#include "autoware_lanelet2_extension/regulatory_elements/detection_area.hpp" +#include "autoware_lanelet2_extension/regulatory_elements/speed_bump.hpp" +#include "autoware_lanelet2_extension/utility/message_conversion.hpp" +#include "autoware_lanelet2_extension/utility/query.hpp" +#include "autoware_lanelet2_extension/utility/utilities.hpp" #include @@ -991,7 +991,7 @@ visualization_msgs::msg::MarkerArray visualization::pedestrianPolygonMarkingsAsM pushPolygonMarker(&polygon_marker, polygon, c); } else { RCLCPP_WARN_STREAM( - rclcpp::get_logger("lanelet2_extension.visualization"), + rclcpp::get_logger("autoware_lanelet2_extension.visualization"), "pedestrian marking " << linestring.id() << " failed conversion."); } } @@ -1387,7 +1387,7 @@ void visualization::initLineStringMarker( { if (marker == nullptr) { RCLCPP_ERROR_STREAM( - rclcpp::get_logger("lanelet2_extension.visualization"), + rclcpp::get_logger("autoware_lanelet2_extension.visualization"), __FUNCTION__ << ": marker is null pointer!"); return; } @@ -1416,7 +1416,7 @@ void visualization::pushLineStringMarker( { if (marker == nullptr) { RCLCPP_ERROR_STREAM( - rclcpp::get_logger("lanelet2_extension.visualization"), + rclcpp::get_logger("autoware_lanelet2_extension.visualization"), __FUNCTION__ << ": marker is null pointer!"); return; } @@ -1424,7 +1424,7 @@ void visualization::pushLineStringMarker( // fill out lane line if (ls.size() < 2) { RCLCPP_ERROR_STREAM( - rclcpp::get_logger("lanelet2_extension.visualization"), + rclcpp::get_logger("autoware_lanelet2_extension.visualization"), __FUNCTION__ << ": marker line size is 1 or 0!"); return; } @@ -1471,7 +1471,7 @@ void visualization::initArrowsMarker( { if (marker == nullptr) { RCLCPP_ERROR_STREAM( - rclcpp::get_logger("lanelet2_extension.visualization"), + rclcpp::get_logger("autoware_lanelet2_extension.visualization"), __FUNCTION__ << ": marker is null pointer!"); return; } @@ -1500,7 +1500,7 @@ void visualization::pushArrowsMarker( { if (marker == nullptr) { RCLCPP_ERROR_STREAM( - rclcpp::get_logger("lanelet2_extension.visualization"), + rclcpp::get_logger("autoware_lanelet2_extension.visualization"), __FUNCTION__ << ": marker is null pointer!"); return; } @@ -1508,7 +1508,7 @@ void visualization::pushArrowsMarker( // fill out lane line if (ls.size() < 2) { RCLCPP_ERROR_STREAM( - rclcpp::get_logger("lanelet2_extension.visualization"), + rclcpp::get_logger("autoware_lanelet2_extension.visualization"), __FUNCTION__ << ": marker line size is 1 or 0!"); return; } diff --git a/lanelet2_extension/package.xml b/autoware_lanelet2_extension/package.xml similarity index 89% rename from lanelet2_extension/package.xml rename to autoware_lanelet2_extension/package.xml index 2f697db..e5b0f41 100644 --- a/lanelet2_extension/package.xml +++ b/autoware_lanelet2_extension/package.xml @@ -1,9 +1,9 @@ - lanelet2_extension - 0.1.0 - The lanelet2_extension package contains libraries to handle Lanelet2 format data. + autoware_lanelet2_extension + 0.1.1 + The autoware_lanelet2_extension package contains libraries to handle Lanelet2 format data. mitsudome-r Masahiro Sakamoto Mamoru Sobue diff --git a/lanelet2_extension/src/check_right_of_way.cpp b/autoware_lanelet2_extension/src/check_right_of_way.cpp similarity index 92% rename from lanelet2_extension/src/check_right_of_way.cpp rename to autoware_lanelet2_extension/src/check_right_of_way.cpp index 8b2a8be..36f5409 100644 --- a/lanelet2_extension/src/check_right_of_way.cpp +++ b/autoware_lanelet2_extension/src/check_right_of_way.cpp @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include -#include -#include +#include +#include +#include #include #include #include @@ -38,7 +38,7 @@ int main(int argc, char ** argv) { if (argc < 2) { - std::cout << "usage: ros2 run lanelet2_extension check_right_of_way "; + std::cout << "usage: ros2 run autoware_lanelet2_extension check_right_of_way "; return 0; } diff --git a/lanelet2_extension/src/sample_code.cpp b/autoware_lanelet2_extension/src/sample_code.cpp similarity index 96% rename from lanelet2_extension/src/sample_code.cpp rename to autoware_lanelet2_extension/src/sample_code.cpp index d4595fb..fa1124d 100644 --- a/lanelet2_extension/src/sample_code.cpp +++ b/autoware_lanelet2_extension/src/sample_code.cpp @@ -14,8 +14,8 @@ // NOLINTBEGIN(readability-identifier-naming) -#include "lanelet2_extension/projection/mgrs_projector.hpp" -#include "lanelet2_extension/regulatory_elements/autoware_traffic_light.hpp" +#include "autoware_lanelet2_extension/projection/mgrs_projector.hpp" +#include "autoware_lanelet2_extension/regulatory_elements/autoware_traffic_light.hpp" #include diff --git a/lanelet2_extension/src/validation.cpp b/autoware_lanelet2_extension/src/validation.cpp similarity index 96% rename from lanelet2_extension/src/validation.cpp rename to autoware_lanelet2_extension/src/validation.cpp index 4b08714..3561e11 100644 --- a/lanelet2_extension/src/validation.cpp +++ b/autoware_lanelet2_extension/src/validation.cpp @@ -14,8 +14,8 @@ // NOLINTBEGIN(readability-identifier-naming) -#include "lanelet2_extension/projection/mgrs_projector.hpp" -#include "lanelet2_extension/regulatory_elements/autoware_traffic_light.hpp" +#include "autoware_lanelet2_extension/projection/mgrs_projector.hpp" +#include "autoware_lanelet2_extension/regulatory_elements/autoware_traffic_light.hpp" #include #include @@ -47,7 +47,7 @@ constexpr const char * Elevation = "ele"; void printUsage() { std::cout << "Usage:" << std::endl - << "ros2 run lanelet2_extension autoware_lanelet2_validation" + << "ros2 run autoware_lanelet2_extension autoware_lanelet2_validation" " --ros-args -p map_file:=" << std::endl; } diff --git a/lanelet2_extension/test/src/test_message_conversion.cpp b/autoware_lanelet2_extension/test/src/test_message_conversion.cpp similarity index 97% rename from lanelet2_extension/test/src/test_message_conversion.cpp rename to autoware_lanelet2_extension/test/src/test_message_conversion.cpp index 4f31ab5..7643262 100644 --- a/lanelet2_extension/test/src/test_message_conversion.cpp +++ b/autoware_lanelet2_extension/test/src/test_message_conversion.cpp @@ -14,8 +14,8 @@ // NOLINTBEGIN(readability-identifier-naming) -#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 #include diff --git a/lanelet2_extension/test/src/test_projector.cpp b/autoware_lanelet2_extension/test/src/test_projector.cpp similarity index 97% rename from lanelet2_extension/test/src/test_projector.cpp rename to autoware_lanelet2_extension/test/src/test_projector.cpp index 3f3e7b8..acf08ac 100644 --- a/lanelet2_extension/test/src/test_projector.cpp +++ b/autoware_lanelet2_extension/test/src/test_projector.cpp @@ -14,8 +14,8 @@ // NOLINTBEGIN(readability-identifier-naming) -#include "lanelet2_extension/projection/mgrs_projector.hpp" -#include "lanelet2_extension/projection/transverse_mercator_projector.hpp" +#include "autoware_lanelet2_extension/projection/mgrs_projector.hpp" +#include "autoware_lanelet2_extension/projection/transverse_mercator_projector.hpp" #include #include diff --git a/lanelet2_extension/test/src/test_query.cpp b/autoware_lanelet2_extension/test/src/test_query.cpp similarity index 97% rename from lanelet2_extension/test/src/test_query.cpp rename to autoware_lanelet2_extension/test/src/test_query.cpp index 3fa73cf..ec9b570 100644 --- a/lanelet2_extension/test/src/test_query.cpp +++ b/autoware_lanelet2_extension/test/src/test_query.cpp @@ -14,8 +14,8 @@ // NOLINTBEGIN(readability-identifier-naming) -#include "lanelet2_extension/regulatory_elements/autoware_traffic_light.hpp" -#include "lanelet2_extension/utility/query.hpp" +#include "autoware_lanelet2_extension/regulatory_elements/autoware_traffic_light.hpp" +#include "autoware_lanelet2_extension/utility/query.hpp" #include #include diff --git a/lanelet2_extension/test/src/test_regulatory_elements.cpp b/autoware_lanelet2_extension/test/src/test_regulatory_elements.cpp similarity index 97% rename from lanelet2_extension/test/src/test_regulatory_elements.cpp rename to autoware_lanelet2_extension/test/src/test_regulatory_elements.cpp index 7037e95..3d67cf8 100644 --- a/lanelet2_extension/test/src/test_regulatory_elements.cpp +++ b/autoware_lanelet2_extension/test/src/test_regulatory_elements.cpp @@ -14,7 +14,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 #include diff --git a/lanelet2_extension/test/src/test_route_checker.cpp b/autoware_lanelet2_extension/test/src/test_route_checker.cpp similarity index 96% rename from lanelet2_extension/test/src/test_route_checker.cpp rename to autoware_lanelet2_extension/test/src/test_route_checker.cpp index 660d33e..12525fa 100644 --- a/lanelet2_extension/test/src/test_route_checker.cpp +++ b/autoware_lanelet2_extension/test/src/test_route_checker.cpp @@ -14,8 +14,8 @@ // NOLINTBEGIN(readability-identifier-naming) -#include "lanelet2_extension/utility/message_conversion.hpp" -#include "lanelet2_extension/utility/route_checker.hpp" +#include "autoware_lanelet2_extension/utility/message_conversion.hpp" +#include "autoware_lanelet2_extension/utility/route_checker.hpp" #include #include diff --git a/lanelet2_extension/test/src/test_utilities.cpp b/autoware_lanelet2_extension/test/src/test_utilities.cpp similarity index 98% rename from lanelet2_extension/test/src/test_utilities.cpp rename to autoware_lanelet2_extension/test/src/test_utilities.cpp index 4d53c03..4f135e2 100644 --- a/lanelet2_extension/test/src/test_utilities.cpp +++ b/autoware_lanelet2_extension/test/src/test_utilities.cpp @@ -14,7 +14,7 @@ // NOLINTBEGIN(readability-identifier-naming, cppcoreguidelines-avoid-goto) -#include "lanelet2_extension/utility/utilities.hpp" +#include "autoware_lanelet2_extension/utility/utilities.hpp" #include #include diff --git a/lanelet2_extension_python/CMakeLists.txt b/autoware_lanelet2_extension_python/CMakeLists.txt similarity index 94% rename from lanelet2_extension_python/CMakeLists.txt rename to autoware_lanelet2_extension_python/CMakeLists.txt index 2b9e028..9ca7b4a 100644 --- a/lanelet2_extension_python/CMakeLists.txt +++ b/autoware_lanelet2_extension_python/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.14) -project(lanelet2_extension_python) +project(autoware_lanelet2_extension_python) find_package(autoware_cmake REQUIRED) find_package(python_cmake_module REQUIRED) diff --git a/lanelet2_extension_python/lanelet2_extension_python/__init__.py b/autoware_lanelet2_extension_python/autoware_lanelet2_extension_python/__init__.py similarity index 100% rename from lanelet2_extension_python/lanelet2_extension_python/__init__.py rename to autoware_lanelet2_extension_python/autoware_lanelet2_extension_python/__init__.py diff --git a/lanelet2_extension_python/lanelet2_extension_python/impl/__init__.py b/autoware_lanelet2_extension_python/autoware_lanelet2_extension_python/impl/__init__.py similarity index 100% rename from lanelet2_extension_python/lanelet2_extension_python/impl/__init__.py rename to autoware_lanelet2_extension_python/autoware_lanelet2_extension_python/impl/__init__.py diff --git a/autoware_lanelet2_extension_python/autoware_lanelet2_extension_python/projection/__init__.py b/autoware_lanelet2_extension_python/autoware_lanelet2_extension_python/projection/__init__.py new file mode 100644 index 0000000..8ad754d --- /dev/null +++ b/autoware_lanelet2_extension_python/autoware_lanelet2_extension_python/projection/__init__.py @@ -0,0 +1,3 @@ +import autoware_lanelet2_extension_python._autoware_lanelet2_extension_python_boost_python_projection as _projection_cpp + +MGRSProjector = _projection_cpp.MGRSProjector diff --git a/lanelet2_extension_python/lanelet2_extension_python/regulatory_elements/__init__.py b/autoware_lanelet2_extension_python/autoware_lanelet2_extension_python/regulatory_elements/__init__.py similarity index 76% rename from lanelet2_extension_python/lanelet2_extension_python/regulatory_elements/__init__.py rename to autoware_lanelet2_extension_python/autoware_lanelet2_extension_python/regulatory_elements/__init__.py index 010ecc9..f38f666 100644 --- a/lanelet2_extension_python/lanelet2_extension_python/regulatory_elements/__init__.py +++ b/autoware_lanelet2_extension_python/autoware_lanelet2_extension_python/regulatory_elements/__init__.py @@ -1,4 +1,4 @@ -import lanelet2_extension_python._lanelet2_extension_python_boost_python_regulatory_elements as _regulatory_elements_cpp +import autoware_lanelet2_extension_python._autoware_lanelet2_extension_python_boost_python_regulatory_elements as _regulatory_elements_cpp AutowareTrafficLight = _regulatory_elements_cpp.AutowareTrafficLight Crosswalk = _regulatory_elements_cpp.Crosswalk diff --git a/autoware_lanelet2_extension_python/autoware_lanelet2_extension_python/utility/__init__.py b/autoware_lanelet2_extension_python/autoware_lanelet2_extension_python/utility/__init__.py new file mode 100644 index 0000000..f1cccde --- /dev/null +++ b/autoware_lanelet2_extension_python/autoware_lanelet2_extension_python/utility/__init__.py @@ -0,0 +1 @@ +import autoware_lanelet2_extension_python.regulatory_elements # noqa diff --git a/lanelet2_extension_python/lanelet2_extension_python/utility/query.py b/autoware_lanelet2_extension_python/autoware_lanelet2_extension_python/utility/query.py similarity index 97% rename from lanelet2_extension_python/lanelet2_extension_python/utility/query.py rename to autoware_lanelet2_extension_python/autoware_lanelet2_extension_python/utility/query.py index 7ac7206..2ddc16d 100644 --- a/lanelet2_extension_python/lanelet2_extension_python/utility/query.py +++ b/autoware_lanelet2_extension_python/autoware_lanelet2_extension_python/utility/query.py @@ -1,7 +1,7 @@ from geometry_msgs.msg import Point from geometry_msgs.msg import Pose import lanelet2.core -import lanelet2_extension_python._lanelet2_extension_python_boost_python_utility as _utility_cpp +import autoware_lanelet2_extension_python._autoware_lanelet2_extension_python_boost_python_utility as _utility_cpp # from rclpy.serialization import deserialize_message from rclpy.serialization import serialize_message diff --git a/lanelet2_extension_python/lanelet2_extension_python/utility/utilities.py b/autoware_lanelet2_extension_python/autoware_lanelet2_extension_python/utility/utilities.py similarity index 96% rename from lanelet2_extension_python/lanelet2_extension_python/utility/utilities.py rename to autoware_lanelet2_extension_python/autoware_lanelet2_extension_python/utility/utilities.py index 27acf99..6a7f7fb 100644 --- a/lanelet2_extension_python/lanelet2_extension_python/utility/utilities.py +++ b/autoware_lanelet2_extension_python/autoware_lanelet2_extension_python/utility/utilities.py @@ -2,7 +2,7 @@ from geometry_msgs.msg import Pose from geometry_msgs.msg import Quaternion import lanelet2 -import lanelet2_extension_python._lanelet2_extension_python_boost_python_utility as _utility_cpp +import autoware_lanelet2_extension_python._autoware_lanelet2_extension_python_boost_python_utility as _utility_cpp from rclpy.serialization import serialize_message combineLaneletsShape = _utility_cpp.combineLaneletsShape diff --git a/lanelet2_extension_python/example/example.py b/autoware_lanelet2_extension_python/example/example.py similarity index 97% rename from lanelet2_extension_python/example/example.py rename to autoware_lanelet2_extension_python/example/example.py index c9311bc..c434c01 100644 --- a/lanelet2_extension_python/example/example.py +++ b/autoware_lanelet2_extension_python/example/example.py @@ -2,9 +2,9 @@ from geometry_msgs.msg import Pose import lanelet2 import lanelet2.geometry -from lanelet2_extension_python.projection import MGRSProjector -import lanelet2_extension_python.utility.query as query -import lanelet2_extension_python.utility.utilities as utilities +from autoware_lanelet2_extension_python.projection import MGRSProjector +import autoware_lanelet2_extension_python.utility.query as query +import autoware_lanelet2_extension_python.utility.utilities as utilities import matplotlib.pyplot as plt import numpy as np diff --git a/lanelet2_extension_python/package.xml b/autoware_lanelet2_extension_python/package.xml similarity index 79% rename from lanelet2_extension_python/package.xml rename to autoware_lanelet2_extension_python/package.xml index 964ea43..ad378c4 100644 --- a/lanelet2_extension_python/package.xml +++ b/autoware_lanelet2_extension_python/package.xml @@ -1,9 +1,9 @@ - lanelet2_extension_python - 0.1.0 - The lanelet2_extension_python package contains Python bindings for lanelet2_extension package + autoware_lanelet2_extension_python + 0.1.1 + The autoware_lanelet2_extension_python package contains Python bindings for lanelet2_extension package Mamoru Sobue Yutaka Kondo Apache License 2.0 @@ -12,9 +12,9 @@ autoware_cmake python_cmake_module + autoware_lanelet2_extension geometry_msgs lanelet2_core - lanelet2_extension lanelet2_io lanelet2_projection lanelet2_python diff --git a/lanelet2_extension_python/src/projection.cpp b/autoware_lanelet2_extension_python/src/projection.cpp similarity index 85% rename from lanelet2_extension_python/src/projection.cpp rename to autoware_lanelet2_extension_python/src/projection.cpp index 0c0ddbf..43a21fd 100644 --- a/lanelet2_extension_python/src/projection.cpp +++ b/autoware_lanelet2_extension_python/src/projection.cpp @@ -16,8 +16,8 @@ // NOLINTBEGIN(readability-identifier-naming) -#include -#include +#include +#include #include @@ -25,7 +25,7 @@ #include -BOOST_PYTHON_MODULE(_lanelet2_extension_python_boost_python_projection) +BOOST_PYTHON_MODULE(_autoware_lanelet2_extension_python_boost_python_projection) { namespace bp = boost::python; diff --git a/lanelet2_extension_python/src/regulatory_elements.cpp b/autoware_lanelet2_extension_python/src/regulatory_elements.cpp similarity index 94% rename from lanelet2_extension_python/src/regulatory_elements.cpp rename to autoware_lanelet2_extension_python/src/regulatory_elements.cpp index acddb81..5b2f05e 100644 --- a/lanelet2_extension_python/src/regulatory_elements.cpp +++ b/autoware_lanelet2_extension_python/src/regulatory_elements.cpp @@ -16,14 +16,14 @@ // NOLINTBEGIN(readability-identifier-naming) -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include @@ -92,7 +92,7 @@ std::string repr(const lanelet::RegulatoryElementConstPtrs & regulatory_elements return repr(bp::list(regulatory_elements)); } -BOOST_PYTHON_MODULE(_lanelet2_extension_python_boost_python_regulatory_elements) +BOOST_PYTHON_MODULE(_autoware_lanelet2_extension_python_boost_python_regulatory_elements) { // autoware_traffic_light bp::class_< diff --git a/lanelet2_extension_python/src/utility.cpp b/autoware_lanelet2_extension_python/src/utility.cpp similarity index 99% rename from lanelet2_extension_python/src/utility.cpp rename to autoware_lanelet2_extension_python/src/utility.cpp index 5acbc28..12afb22 100644 --- a/lanelet2_extension_python/src/utility.cpp +++ b/autoware_lanelet2_extension_python/src/utility.cpp @@ -16,8 +16,8 @@ // NOLINTBEGIN(readability-identifier-naming) -#include -#include +#include +#include #include #include @@ -394,7 +394,7 @@ BOOST_PYTHON_FUNCTION_OVERLOADS( getPrecedingLaneletSequences_overload, lanelet::utils::query::getPrecedingLaneletSequences, 3, 4) // NOLINTEND(google-explicit-constructor) -BOOST_PYTHON_MODULE(_lanelet2_extension_python_boost_python_utility) +BOOST_PYTHON_MODULE(_autoware_lanelet2_extension_python_boost_python_utility) { /* * utilities.cpp diff --git a/lanelet2_extension_python/lanelet2_extension_python/projection/__init__.py b/lanelet2_extension_python/lanelet2_extension_python/projection/__init__.py deleted file mode 100644 index b5e7067..0000000 --- a/lanelet2_extension_python/lanelet2_extension_python/projection/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -import lanelet2_extension_python._lanelet2_extension_python_boost_python_projection as _projection_cpp - -MGRSProjector = _projection_cpp.MGRSProjector diff --git a/lanelet2_extension_python/lanelet2_extension_python/utility/__init__.py b/lanelet2_extension_python/lanelet2_extension_python/utility/__init__.py deleted file mode 100644 index 5ba63f1..0000000 --- a/lanelet2_extension_python/lanelet2_extension_python/utility/__init__.py +++ /dev/null @@ -1 +0,0 @@ -import lanelet2_extension_python.regulatory_elements # noqa