Patch from Melchior Franz:

[simgear.git] / simgear / math / sg_geodesy.cxx

diff --git a/simgear/math/sg_geodesy.cxx b/simgear/math/sg_geodesy.cxx
index 8969d713a5c9994eddef534cbde8550f96a2fa05..4393778d52fccbd5b8967609f9b4c861c4024bd0 100644 (file)
--- a/simgear/math/sg_geodesy.cxx
+++ b/simgear/math/sg_geodesy.cxx
@@ -31,9 +31,6 @@
 SG_USING_STD(cout);
 #endif
 
-// ONE_SECOND is pi/180/60/60, or about 100 feet at earths' equator
-#define ONE_SECOND 4.848136811E-6
-
 
 #define DOMAIN_ERR_DEBUG 1
 
@@ -60,30 +57,30 @@ void sgGeocToGeod( double lat_geoc, double radius, double
     double t_lat, x_alpha, mu_alpha, delt_mu, r_alpha, l_point, rho_alpha;
     double sin_mu_a, denom,delt_lambda, lambda_sl, sin_lambda_sl;
 
-    if( ( (SG_PI_2 - lat_geoc) < ONE_SECOND )        // near North pole
-       || ( (SG_PI_2 + lat_geoc) < ONE_SECOND ) )   // near South pole
+    if( ( (SGD_PI_2 - lat_geoc) < SG_ONE_SECOND )        // near North pole
+       || ( (SGD_PI_2 + lat_geoc) < SG_ONE_SECOND ) )   // near South pole
     {
        *lat_geod = lat_geoc;
-       *sea_level_r = EQUATORIAL_RADIUS_M*E;
+       *sea_level_r = SG_EQUATORIAL_RADIUS_M*E;
        *alt = radius - *sea_level_r;
     } else {
        // cout << "  lat_geoc = " << lat_geoc << endl;
        t_lat = tan(lat_geoc);
        // cout << "  tan(t_lat) = " << t_lat << endl;
-       x_alpha = E*EQUATORIAL_RADIUS_M/sqrt(t_lat*t_lat + E*E);
+       x_alpha = E*SG_EQUATORIAL_RADIUS_M/sqrt(t_lat*t_lat + E*E);
 #ifdef DOMAIN_ERR_DEBUG
        if ( errno ) {
            perror("fgGeocToGeod()");
-           FG_LOG( FG_GENERAL, FG_ALERT, "sqrt(" << t_lat*t_lat + E*E << ")" );
+           SG_LOG( SG_GENERAL, SG_ALERT, "sqrt(" << t_lat*t_lat + E*E << ")" );
        }
 #endif
        // cout << "  x_alpha = " << x_alpha << endl;
-       double tmp = sqrt(RESQ_M - x_alpha * x_alpha);
+       double tmp = sqrt(SG_EQ_RAD_SQUARE_M - x_alpha * x_alpha);
        if ( tmp < 0.0 ) { tmp = 0.0; }
 #ifdef DOMAIN_ERR_DEBUG
        if ( errno ) {
            perror("fgGeocToGeod()");
-           FG_LOG( FG_GENERAL, FG_ALERT, "sqrt(" << RESQ_M - x_alpha * x_alpha
+           SG_LOG( SG_GENERAL, SG_ALERT, "sqrt(" << SG_EQ_RAD_SQUARE_M - x_alpha * x_alpha
                    << ")" );
        }
 #endif
@@ -99,23 +96,23 @@ void sgGeocToGeod( double lat_geoc, double radius, double
 #ifdef DOMAIN_ERR_DEBUG
        if ( errno ) {
            perror("fgGeocToGeod()");
-           FG_LOG( FG_GENERAL, FG_ALERT, "sqrt(" <<
+           SG_LOG( SG_GENERAL, SG_ALERT, "sqrt(" <<
                    1-EPS*EPS*sin_mu_a*sin_mu_a << ")" );
        }
 #endif
-       rho_alpha = EQUATORIAL_RADIUS_M*(1-EPS)/
+       rho_alpha = SG_EQUATORIAL_RADIUS_M*(1-EPS)/
            (denom*denom*denom);
        delt_mu = atan2(l_point*sin(delt_lambda),rho_alpha + *alt);
        *lat_geod = mu_alpha - delt_mu;
        lambda_sl = atan( E*E * tan(*lat_geod) ); // SL geoc. latitude
        sin_lambda_sl = sin( lambda_sl );
        *sea_level_r = 
-           sqrt(RESQ_M / (1 + ((1/(E*E))-1)*sin_lambda_sl*sin_lambda_sl));
+           sqrt(SG_EQ_RAD_SQUARE_M / (1 + ((1/(E*E))-1)*sin_lambda_sl*sin_lambda_sl));
 #ifdef DOMAIN_ERR_DEBUG
        if ( errno ) {
            perror("fgGeocToGeod()");
-           FG_LOG( FG_GENERAL, FG_ALERT, "sqrt(" <<
-                   RESQ_M / (1 + ((1/(E*E))-1)*sin_lambda_sl*sin_lambda_sl)
+           SG_LOG( SG_GENERAL, SG_ALERT, "sqrt(" <<
+                   SG_EQ_RAD_SQUARE_M / (1 + ((1/(E*E))-1)*sin_lambda_sl*sin_lambda_sl)
                    << ")" );
        }
 #endif
@@ -152,12 +149,12 @@ void sgGeodToGeoc( double lat_geod, double alt, double *sl_radius,
     sin_mu = sin(lat_geod);                  // Geodetic (map makers') latitude
     cos_mu = cos(lat_geod);
     *sl_radius = 
-       sqrt(RESQ_M / (1 + ((1/(E*E))-1)*sin_lambda_sl*sin_lambda_sl));
+       sqrt(SG_EQ_RAD_SQUARE_M / (1 + ((1/(E*E))-1)*sin_lambda_sl*sin_lambda_sl));
 #ifdef DOMAIN_ERR_DEBUG
        if ( errno ) {
            perror("fgGeodToGeoc()");
-           FG_LOG( FG_GENERAL, FG_ALERT, "sqrt(" <<
-                   RESQ_M / (1 + ((1/(E*E))-1)*sin_lambda_sl*sin_lambda_sl)
+           SG_LOG( SG_GENERAL, SG_ALERT, "sqrt(" <<
+                   SG_EQ_RAD_SQUARE_M / (1 + ((1/(E*E))-1)*sin_lambda_sl*sin_lambda_sl)
                    << ")" );
        }
 #endif
@@ -180,7 +177,7 @@ void sgGeodToGeoc( double lat_geod, double alt, double *sl_radius,
 //
 // modified for FlightGear to use WGS84 only -- Norman Vine
 
-#define GEOD_INV_PI SG_PI
+#define GEOD_INV_PI SGD_PI
 
 // s == distance
 // az = azimuth