-
Notifications
You must be signed in to change notification settings - Fork 901
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
Added FromLLArray service #676
Open
MarcinSlomiany
wants to merge
3
commits into
cra-ros-pkg:foxy-devel
Choose a base branch
from
piappl:foxy-devel
base: foxy-devel
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -142,7 +142,8 @@ NavSatTransform::NavSatTransform(const rclcpp::NodeOptions & options) | |
"toLL", std::bind(&NavSatTransform::toLLCallback, this, _1, _2)); | ||
from_ll_srv_ = this->create_service<robot_localization::srv::FromLL>( | ||
"fromLL", std::bind(&NavSatTransform::fromLLCallback, this, _1, _2)); | ||
|
||
from_ll_array_srv_ = this->create_service<robot_localization::srv::FromLLArray>( | ||
"fromLLArray", std::bind(&NavSatTransform::fromLLArrayCallback, this, _1, _2)); | ||
std::vector<double> datum_vals; | ||
if (use_manual_datum_) { | ||
datum_vals = this->declare_parameter("datum", datum_vals); | ||
|
@@ -448,6 +449,58 @@ bool NavSatTransform::fromLLCallback( | |
return true; | ||
} | ||
|
||
bool NavSatTransform::fromLLArrayCallback( | ||
const std::shared_ptr<robot_localization::srv::FromLLArray::Request> request, | ||
std::shared_ptr<robot_localization::srv::FromLLArray::Response> response) | ||
{ | ||
double altitude, longitude, latitude; | ||
double cartesian_x {}; | ||
double cartesian_y {}; | ||
double cartesian_z {}; | ||
tf2::Transform cartesian_pose; | ||
std::string utm_zone_tmp; | ||
for (auto it = request->ll_points.begin(); it != request->ll_points.end(); ++it) { | ||
// | ||
altitude = it->altitude; | ||
longitude = it->longitude; | ||
latitude = it->latitude; | ||
cartesian_x = 0.0; | ||
cartesian_y = 0.0; | ||
cartesian_z = 0.0; | ||
// | ||
if (use_local_cartesian_) { | ||
gps_local_cartesian_.Forward( | ||
latitude, | ||
longitude, | ||
altitude, | ||
cartesian_x, | ||
cartesian_y, | ||
cartesian_z); | ||
} else { | ||
|
||
navsat_conversions::LLtoUTM( | ||
latitude, | ||
longitude, | ||
cartesian_y, | ||
cartesian_x, | ||
utm_zone_tmp); | ||
} | ||
|
||
cartesian_pose.setOrigin(tf2::Vector3(cartesian_x, cartesian_y, altitude)); | ||
|
||
// nav_msgs::msg::Odometry gps_odom; // it's unused? | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Please remove this line. |
||
|
||
if (!transform_good_) { | ||
return false; | ||
} | ||
|
||
response->map_points.push_back(cartesianToMap(cartesian_pose).pose.pose.position); | ||
|
||
} | ||
|
||
return true; | ||
} | ||
|
||
nav_msgs::msg::Odometry NavSatTransform::cartesianToMap( | ||
const tf2::Transform & cartesian_pose) const | ||
{ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
geographic_msgs/GeoPoint[] ll_points | ||
--- | ||
geometry_msgs/Point[] map_points | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Missing a newline here. |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I thought I deprecated these functions in favor of geographilib. But I cannot confirm until next week.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, we should be consistent with whatever method we're using.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Found it!
Looks like parts didn't make it into ROS2. The reasoning of using geographiclib directly instead of these navsat_transform functions is here: https://github.com/cra-ros-pkg/robot_localization/pull/627/files#r598612280