From e6a8e337c7165c89c0fb7ab4ca74550efd3c1af6 Mon Sep 17 00:00:00 2001
From: Peter Barker <pbarker@barker.dropbear.id.au>
Date: Sat, 23 Mar 2019 14:30:02 +1100
Subject: [PATCH] AP_Math: move sanitize to be a method on location

---
 libraries/AP_Math/location.cpp | 30 ------------------------------
 libraries/AP_Math/location.h   |  5 -----
 2 files changed, 35 deletions(-)

diff --git a/libraries/AP_Math/location.cpp b/libraries/AP_Math/location.cpp
index b4a5cfc18b..591ce47d1b 100644
--- a/libraries/AP_Math/location.cpp
+++ b/libraries/AP_Math/location.cpp
@@ -126,36 +126,6 @@ bool locations_are_same(const struct Location &loc1, const struct Location &loc2
     return (loc1.lat == loc2.lat) && (loc1.lng == loc2.lng);
 }
 
-/*
- * convert invalid waypoint with useful data. return true if location changed
- */
-bool location_sanitize(const struct Location &defaultLoc, struct Location &loc)
-{
-    bool has_changed = false;
-    // convert lat/lng=0 to mean current point
-    if (loc.lat == 0 && loc.lng == 0) {
-        loc.lat = defaultLoc.lat;
-        loc.lng = defaultLoc.lng;
-        has_changed = true;
-    }
-
-    // convert relative alt=0 to mean current alt
-    if (loc.alt == 0 && loc.relative_alt) {
-        loc.relative_alt = false;
-        loc.alt = defaultLoc.alt;
-        has_changed = true;
-    }
-
-    // limit lat/lng to appropriate ranges
-    if (!check_latlng(loc)) {
-        loc.lat = defaultLoc.lat;
-        loc.lng = defaultLoc.lng;
-        has_changed = true;
-    }
-
-    return has_changed;
-}
-
 // return true when lat and lng are within range
 bool check_lat(float lat)
 {
diff --git a/libraries/AP_Math/location.h b/libraries/AP_Math/location.h
index 738855b32b..7f198cbbf1 100644
--- a/libraries/AP_Math/location.h
+++ b/libraries/AP_Math/location.h
@@ -64,11 +64,6 @@ Vector3f    location_3d_diff_NED(const struct Location &loc1, const struct Locat
  */
 bool        locations_are_same(const struct Location &loc1, const struct Location &loc2);
 
-/*
- * convert invalid waypoint with useful data. return true if location changed
- */
-bool        location_sanitize(const struct Location &defaultLoc, struct Location &loc);
-
 // Converts from WGS84 geodetic coordinates (lat, lon, height)
 // into WGS84 Earth Centered, Earth Fixed (ECEF) coordinates
 // (X, Y, Z)