aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AP_Math: add separate check_lat() and check_lng()

Browse Source
This commit is contained in:
Tom Pittenger 2016-06-06 13:02:56 -07:00
parent fb07b8c4cc
commit 00aaa78757
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libraries/AP_Math/location.cpp
View File

@ -310,15 +310,31 @@ void wgsecef2llh(const Vector3d &ecef, Vector3d &llh) {
}
// return true when lat and lng are within range
bool check_lat(float lat)
{
return fabsf(lat) <= 90;
}
bool check_lng(float lng)
{
return fabsf(lng) <= 180;
}
bool check_lat(int32_t lat)
{
return labs(lat) <= 90*1e7;
}
bool check_lng(int32_t lng)
{
return labs(lng) <= 180*1e7;
}
bool check_latlng(float lat, float lng)
{
return (fabsf(lat) <= 90) && (fabsf(lng) <= 180);
return check_lat(lat) && check_lng(lng);
}
bool check_latlng(int32_t lat, int32_t lng)
{
return (labs(lat) <= 90*1e7) && (labs(lng) <= 180*1e7);
return check_lat(lat) && check_lng(lng);
}
bool check_latlng(Location loc)
{
return check_latlng(loc.lat, loc.lng);
return check_lat(loc.lat) && check_lng(loc.lng);
}

4
libraries/AP_Math/location.h
View File

@ -80,6 +80,10 @@ void wgsllh2ecef(const Vector3d &llh, Vector3d &ecef);
void wgsecef2llh(const Vector3d &ecef, Vector3d &llh);
// return true when lat and lng are within range
bool check_lat(float lat);
bool check_lng(float lng);
bool check_lat(int32_t lat);
bool check_lng(int32_t lng);
bool check_latlng(float lat, float lng);
bool check_latlng(int32_t lat, int32_t lng);
bool check_latlng(Location loc);