Global: Aggregate the same definitions.

Global: Aggregate the same definitions.

libraries/AP_Common/AP_Common.h

@@ -167,4 +167,3 @@ bool is_bounded_int32(int32_t value, int32_t lower_bound, int32_t upper_bound);
 #else
 #define SITL_printf(fmt, args ...)
 #endif
-

libraries/AP_Common/Location.cpp

@@ -13,10 +13,6 @@ extern const AP_HAL::HAL& hal;
 const AP_AHRS_NavEKF *Location_Class::_ahrs = nullptr;
 AP_Terrain *Location_Class::_terrain = nullptr;
 
-// scalers to convert latitude and longitude to meters.  Duplicated from location.cpp
-#define LOCATION_SCALING_FACTOR 0.011131884502145034f
-#define LOCATION_SCALING_FACTOR_INV 89.83204953368922f
-
 /// constructors
 Location_Class::Location_Class()
 {

libraries/AP_Math/location.cpp

@@ -24,12 +24,6 @@
 #include "AP_Math.h"
 #include "location.h"
 
-// scaling factor from 1e-7 degrees to meters at equater
-// == 1.0e-7 * DEG_TO_RAD * RADIUS_OF_EARTH
-#define LOCATION_SCALING_FACTOR 0.011131884502145034f
-// inverse of LOCATION_SCALING_FACTOR
-#define LOCATION_SCALING_FACTOR_INV 89.83204953368922f
-
 float longitude_scale(const struct Location &loc)
 {
 #if HAL_CPU_CLASS < HAL_CPU_CLASS_150

libraries/AP_Math/location.h

@@ -8,6 +8,11 @@
 #include "vector2.h"
 #include "vector3.h"
 
+// scaling factor from 1e-7 degrees to meters at equater
+// == 1.0e-7 * DEG_TO_RAD * RADIUS_OF_EARTH
+#define LOCATION_SCALING_FACTOR 0.011131884502145034f
+// inverse of LOCATION_SCALING_FACTOR
+#define LOCATION_SCALING_FACTOR_INV 89.83204953368922f
 
 /*
  * LOCATION