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

feat: add lanelet2 #242

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open
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
28 changes: 28 additions & 0 deletions patch/ros-humble-lanelet2-core.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
diff --git a/include/lanelet2_core/primitives/Polygon.h b/include/lanelet2_core/primitives/Polygon.h
index a458cb49..6c9dfab6 100644
--- a/include/lanelet2_core/primitives/Polygon.h
+++ b/include/lanelet2_core/primitives/Polygon.h
@@ -394,8 +394,9 @@ inline BasicPolygon2d to2D<BasicPolygon3d>(const BasicPolygon3d& primitive) {
return p2d;
}

-template <typename PolygonT>
-std::enable_if_t<traits::isPolygonT<PolygonT>(), BasicPolygon2d> toBasicPolygon2d(const PolygonT& t) {
+template <typename PolygonT,
+ std::enable_if_t<traits::isPolygonT<PolygonT>(), int> = 0>
+BasicPolygon2d toBasicPolygon2d(const PolygonT& t) {
return traits::to2D(t).basicPolygon();
}

@@ -411,8 +412,9 @@ inline BasicPolygon2d toBasicPolygon2d<BasicPolygon3d>(const BasicPolygon3d& t)

inline BasicPolygon2d toBasicPolygon2d(BasicPolygon2d&& t) { return std::move(t); }

-template <typename PolygonT>
-std::enable_if_t<traits::isPolygonT<PolygonT>(), BasicPolygon3d> toBasicPolygon3d(const PolygonT& t) {
+template <typename PolygonT,
+ std::enable_if_t<traits::isPolygonT<PolygonT>(), int> = 0>
+BasicPolygon3d toBasicPolygon3d(const PolygonT& t) {
return traits::to3D(t).basicPolygon();
}

13 changes: 13 additions & 0 deletions patch/ros-humble-mrt-cmake-modules.patch
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
diff --git a/cmake/Modules/FindBoostPython.cmake b/cmake/Modules/FindBoostPython.cmake
index 409cfaf..a3d9984 100644
--- a/cmake/Modules/FindBoostPython.cmake
+++ b/cmake/Modules/FindBoostPython.cmake
@@ -8,7 +8,7 @@
if(PYTHON_VERSION)
set(_python_version ${PYTHON_VERSION})
else()
- set(_python_version 2.7)
+ set(_python_version 3)
endif()
if(_python_version VERSION_EQUAL 3 AND CMAKE_VERSION VERSION_GREATER 3.15)
# we also need the subversion
diff --git a/CMakeLists.txt b/CMakeLists.txt
index aa99d8d..8327d4e 100644
--- a/CMakeLists.txt
Expand Down
30 changes: 15 additions & 15 deletions pixi.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pixi.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ vinca = { git = "https://github.com/RoboStack/vinca.git", rev = "35f09634dbd3c36
[feature.beta.tasks]
generate-recipes = { cmd = "vinca -m", depends_on = ["rename-file"] }
remove-file = { cmd = "rm vinca.yaml; rm -rf recipes" }
build_additional_recipes = { cmd = "rattler-build build --recipe-dir ./additional_recipes -m ./conda_build_config.yaml --skip-existing" }
build_additional_recipes = { cmd = "rattler-build build --recipe-dir ./additional_recipes -m ./conda_build_config.yaml -c robostack-staging -c https://repo.prefix.dev/conda-forge --skip-existing" }
build = { cmd = "rattler-build build --recipe-dir ./recipes -m ./conda_build_config.yaml -c robostack-staging -c https://repo.prefix.dev/conda-forge --skip-existing", depends_on = ["build_additional_recipes", "generate-recipes"] }
build_one_package = { cmd = "cp ./patch/$PACKAGE.*patch ./recipes/$PACKAGE/patch/; rattler-build build --recipe ./recipes/$PACKAGE/recipe.yaml -m ./conda_build_config.yaml -c robostack-staging -c https://repo.prefix.dev/conda-forge", env = { PACKAGE = "ros-humble-ros-workspace" } }
create_snapshot = { cmd = "vinca-snapshot -d humble -o snapshot_$(date +\"%Y-%m-%d-%H-%M-%S\").yaml" }
Expand Down
3 changes: 2 additions & 1 deletion vinca_linux_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,8 @@ packages_select_by_deps:

- grid_map

- lanelet2

# ----- end of package support -----

# - rtabmap
Expand Down Expand Up @@ -307,7 +309,6 @@ packages_select_by_deps:
# - plansys2-bt-actions
# - plansys2-terminal
# - nav2-system-tests
# - lanelet2
# - plansys2-bringup
# - octovis
# - gps-umd
Expand Down
3 changes: 2 additions & 1 deletion vinca_linux_aarch64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,8 @@ packages_select_by_deps:

- ament_cmake_vendor_package # Requested in https://github.com/RoboStack/ros-humble/pull/210

- lanelet2


# Used to work, now needs fixes
# - rtabmap
Expand Down Expand Up @@ -144,7 +146,6 @@ packages_select_by_deps:
# - plansys2-bt-actions
# - plansys2-terminal
# - nav2-system-tests
# - lanelet2
# - plansys2-bringup
# - octovis
# - gps-umd
Expand Down
2 changes: 2 additions & 0 deletions vinca_osx.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -121,4 +121,6 @@ packages_select_by_deps:
# Universal Robots, requested in https://github.com/RoboStack/ros-humble/issues/234, https://github.com/RoboStack/ros-humble/issues/227 and https://github.com/RoboStack/ros-humble/issues/222
- ur

- lanelet2

patch_dir: patch
4 changes: 3 additions & 1 deletion vinca_osx_arm64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,9 @@ packages_select_by_deps:
- rosbag2_storage_mcap

# Universal Robots, requested in https://github.com/RoboStack/ros-humble/issues/234, https://github.com/RoboStack/ros-humble/issues/227 and https://github.com/RoboStack/ros-humble/issues/222
- ur
- ur

- lanelet2


patch_dir: patch
2 changes: 2 additions & 0 deletions vinca_win.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -235,4 +235,6 @@ packages_select_by_deps:

- plotjuggler_msgs

- lanelet2

patch_dir: patch
Loading