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.

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

Jump to bottom

Add utm transfom support for software registration_to_exif_gps_position #1993

Merged
merged 4 commits into from
Apr 16, 2022
Merged

Add utm transfom support for software registration_to_exif_gps_position #1993

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1440187
fixed some wrong typing in issue #1921
qingzhengzhuma Aug 20, 2021
3a864ba
fixed some wrong typing in issue #1921
qingzhengzhuma Aug 20, 2021
b0477b1
Merge branch 'openMVG:develop' into develop
qingzhengzhuma Dec 22, 2021
dbd8b59
add utm tranform support
qingzhengzhuma Dec 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 16 additions & 4 deletions src/software/Geodesy/registration_to_exif_gps_position.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,12 @@ int main(int argc, char **argv)
sSfM_Data_Filename_In,
sSfM_Data_Filename_Out;
unsigned int rigid_registration_method = ERegistrationType::RIGID_REGISTRATION_ALL_POINTS;

int i_GPS_XYZ_method = 0;
CmdLine cmd;
cmd.add(make_option('i', sSfM_Data_Filename_In, "input_file"));
cmd.add(make_option('o', sSfM_Data_Filename_Out, "output_file"));
cmd.add(make_option('m', rigid_registration_method, "method"));

cmd.add(make_option('M', i_GPS_XYZ_method, "gps_to_xyz_method"));
try
{
if (argc == 1) throw std::string("Invalid command line parameter.");
Expand All @@ -66,6 +66,9 @@ int main(int argc, char **argv)
<< "[-m|--method] method to use for the rigid registration\n"
<< "\t0 => registration is done using a robust estimation,\n"
<< "\t1 (default)=> registration is done using all points.\n"
<< "[-M|--gps_to_xyz_method] XZY Coordinate system:\n"
<< "\t 0: ECEF (default)\n"
<< "\t 1: UTM"
<< std::endl;

std::cerr << s << std::endl;
Expand Down Expand Up @@ -125,8 +128,17 @@ int main(int argc, char **argv)
exifReader->GPSLongitude( &longitude ) &&
exifReader->GPSAltitude( &altitude ) )
{
// Add ECEF XYZ position to the GPS position array
vec_gps_center.push_back( lla_to_ecef( latitude, longitude, altitude ) );
// Add XYZ position to the GPS position array
switch (i_GPS_XYZ_method)
{
case 1:
vec_gps_center.push_back(lla_to_utm(latitude, longitude, altitude));
break;
case 0:
default:
vec_gps_center.push_back(lla_to_ecef(latitude, longitude, altitude));
break;
}
const openMVG::geometry::Pose3 pose(sfm_data.GetPoseOrDie(view_it.second.get()));
vec_sfm_center.push_back( pose.center() );
}
Expand Down