Skip to content

Remove deprecated get_package_share_directory #71

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.

Sign up for GitHub

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

Closed
fmrico wants to merge 1 commit into from
Closed

Remove deprecated get_package_share_directory #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 6 additions & 5 deletions ...anagers/easynav_bonxai_maps_manager/src/easynav_bonxai_maps_manager/BonxaiMapsManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include <filesystem>
#include <string>

#include "easynav_bonxai_maps_manager/BonxaiMapsManager.hpp"
Expand All @@ -27,7 +28,7 @@
#include "pcl/point_types.h"
#include "pcl/point_cloud.h"

#include "ament_index_cpp/get_package_share_directory.hpp"
#include "ament_index_cpp/get_package_share_path.hpp"
#include "ament_index_cpp/get_package_prefix.hpp"

namespace easynav_bonxai
Expand Down Expand Up @@ -73,8 +74,8 @@ BonxaiMapsManager::on_initialize()

if (!package_name.empty() && !bonxai_path_file.empty()) {
try {
const std::string pkgpath = ament_index_cpp::get_package_share_directory(package_name);
map_path_ = pkgpath + std::string("/") + bonxai_path_file;
const std::filesystem::path pkgpath = ament_index_cpp::get_package_share_path(package_name);
map_path_ = (pkgpath / bonxai_path_file).string();
Comment on lines +77 to +78
} catch (ament_index_cpp::PackageNotFoundError & ex) {
throw std::runtime_error("Package " + package_name + " not found. Error: " + ex.what());
}
Expand Down Expand Up @@ -106,8 +107,8 @@ BonxaiMapsManager::on_initialize()

if (!package_name.empty() && !occmap_path_file.empty()) {
try {
const std::string pkgpath = ament_index_cpp::get_package_share_directory(package_name);
map_path_ = pkgpath + std::string("/") + occmap_path_file;
const std::filesystem::path pkgpath = ament_index_cpp::get_package_share_path(package_name);
map_path_ = (pkgpath / occmap_path_file).string();
Comment on lines +110 to +111
} catch (ament_index_cpp::PackageNotFoundError & ex) {
throw std::runtime_error("Package " + package_name + " not found. Error: " + ex.what());
}
Expand Down
7 changes: 4 additions & 3 deletions ...gers/easynav_costmap_maps_manager/src/easynav_costmap_maps_manager/CostmapMapsManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include <filesystem>
#include <stdexcept>
#include <string>

Expand All @@ -24,7 +25,7 @@
#include "easynav_costmap_maps_manager/map_io.hpp"
#include "easynav_common/RTTFBuffer.hpp"

#include "ament_index_cpp/get_package_share_directory.hpp"
#include "ament_index_cpp/get_package_share_path.hpp"
#include "ament_index_cpp/get_package_prefix.hpp"

namespace easynav
Expand Down Expand Up @@ -110,8 +111,8 @@ CostmapMapsManager::on_initialize()
map_path_ = "/tmp/default.map.yaml";
if (!package_name.empty() && !map_path_file.empty()) {
try {
const std::string pkgpath = ament_index_cpp::get_package_share_directory(package_name);
map_path_ = pkgpath + std::string("/") + map_path_file;
const std::filesystem::path pkgpath = ament_index_cpp::get_package_share_path(package_name);
map_path_ = (pkgpath / map_path_file).string();
Comment on lines +114 to +115
} catch (ament_index_cpp::PackageNotFoundError & ex) {
throw std::runtime_error("Package " + package_name + " not found. Error: " + ex.what());
}
Expand Down
11 changes: 6 additions & 5 deletions ...anagers/easynav_navmap_maps_manager/src/easynav_navmap_maps_manager/NavMapMapsManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include <filesystem>
#include <stdexcept>
#include <string>

Expand All @@ -26,7 +27,7 @@
#include "navmap_ros/navmap_io.hpp"
#include "easynav_navmap_maps_manager/map_io.hpp"

#include "ament_index_cpp/get_package_share_directory.hpp"
#include "ament_index_cpp/get_package_share_path.hpp"
#include "ament_index_cpp/get_package_prefix.hpp"

namespace easynav
Expand Down Expand Up @@ -122,8 +123,8 @@ NavMapMapsManager::on_initialize()

if (!package_name.empty() && !occmap_path_file.empty()) {
try {
const std::string pkgpath = ament_index_cpp::get_package_share_directory(package_name);
map_path_ = pkgpath + std::string("/") + occmap_path_file;
const std::filesystem::path pkgpath = ament_index_cpp::get_package_share_path(package_name);
map_path_ = (pkgpath / occmap_path_file).string();
Comment on lines +126 to +127
} catch (ament_index_cpp::PackageNotFoundError & ex) {
throw std::runtime_error("Package " + package_name + " not found. Error: " + ex.what());
}
Expand All @@ -145,8 +146,8 @@ NavMapMapsManager::on_initialize()

if (!package_name.empty() && !navmap_path_file.empty()) {
try {
const std::string pkgpath = ament_index_cpp::get_package_share_directory(package_name);
map_path_ = pkgpath + std::string("/") + navmap_path_file;
const std::filesystem::path pkgpath = ament_index_cpp::get_package_share_path(package_name);
map_path_ = (pkgpath / navmap_path_file).string();
Comment on lines +149 to +150
} catch (ament_index_cpp::PackageNotFoundError & ex) {
throw std::runtime_error("Package " + package_name + " not found. Error: " + ex.what());
}
Expand Down
7 changes: 4 additions & 3 deletions ...anagers/easynav_routes_maps_manager/src/easynav_routes_maps_manager/RoutesMapsManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,12 @@
#include "easynav_routes_maps_manager/RoutesMapsManager.hpp"
#include "easynav_common/RTTFBuffer.hpp"

#include <filesystem>
#include <fstream>

#include <yaml-cpp/yaml.h>

#include "ament_index_cpp/get_package_share_directory.hpp"
#include "ament_index_cpp/get_package_share_path.hpp"

#include "rclcpp/rclcpp.hpp"

Expand Down Expand Up @@ -84,8 +85,8 @@ void RoutesMapsManager::on_initialize()
// Absolute path: ignore package_name.
map_path_ = map_path_file;
} else if (!package_name.empty() && !map_path_file.empty()) {
const auto pkgpath = ament_index_cpp::get_package_share_directory(package_name);
map_path_ = pkgpath + "/" + map_path_file;
const auto pkgpath = ament_index_cpp::get_package_share_path(package_name);
map_path_ = (pkgpath / map_path_file).string();
} else {
throw std::runtime_error(
"Parameters '" + plugin_name + ".package' and '" + plugin_name +
Expand Down
10 changes: 6 additions & 4 deletions ...anagers/easynav_simple_maps_manager/src/easynav_simple_maps_manager/SimpleMapsManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,12 @@
/// \file
/// \brief Implementation of the SimpleMapsManager class.

#include <filesystem>

#include "easynav_simple_maps_manager/SimpleMapsManager.hpp"
#include "easynav_sensors/types/PointPerception.hpp"

#include "ament_index_cpp/get_package_share_directory.hpp"
#include "ament_index_cpp/get_package_share_path.hpp"
#include "ament_index_cpp/get_package_prefix.hpp"
Comment on lines +24 to 25

#include "easynav_common/YTSession.hpp"
Expand Down Expand Up @@ -60,10 +62,10 @@ SimpleMapsManager::on_initialize()

map_path_ = "/tmp/default.map";
if (package_name != "" && map_path_file != "") {
std::string pkgpath;
std::filesystem::path pkgpath;
try {
pkgpath = ament_index_cpp::get_package_share_directory(package_name);
map_path_ = pkgpath + "/" + map_path_file;
pkgpath = ament_index_cpp::get_package_share_path(package_name);
map_path_ = (pkgpath / map_path_file).string();
Comment on lines +67 to +68
} catch(ament_index_cpp::PackageNotFoundError & ex) {
throw std::runtime_error("Package " + package_name + " not found. Error: " + ex.what());
}
Expand Down