SF BugsZZ#123: Fix bzip2 decompression on Windows.

[andy/viking.git] / src / coords.c

diff --git a/src/coords.c b/src/coords.c
index 62a2d9f90d5885e5fd7de06d48704a43eae09c75..14211c5b42725753016fc914de2dd5addab750c9 100644 (file)
--- a/src/coords.c
+++ b/src/coords.c
@@ -49,8 +49,14 @@ renaming functions and defining LatLon and UTM structs.
 #include <math.h>
 #endif
 
+#include "coords.h"
+#ifdef HAVE_VIKING
 #include "viking.h"
 #include "globals.h"
+#else
+#define DEG2RAD(x) ((x)*(M_PI/180))
+#define RAD2DEG(x) ((x)*(180/M_PI))
+#endif
 #include "degrees_converters.h"
 
 /**
@@ -255,7 +261,7 @@ void a_coords_latlon_to_string ( const struct LatLon *latlon,
                                 gchar **lon )
 {
   g_return_if_fail ( latlon != NULL );
-
+#ifdef HAVE_VIKING
   vik_degree_format_t format = a_vik_get_degree_format ();
 
   switch (format) {
@@ -271,7 +277,15 @@ void a_coords_latlon_to_string ( const struct LatLon *latlon,
     *lat = convert_lat_dec_to_dms ( latlon->lat );
     *lon = convert_lon_dec_to_dms ( latlon->lon );
     break;
+  case VIK_DEGREE_FORMAT_RAW:
+    *lat = g_strdup_printf ( "%.6f", latlon->lat );
+    *lon = g_strdup_printf ( "%.6f", latlon->lon );
+    break;
   default:
     g_critical("Houston, we've had a problem. format=%d", format);
   }
+#else
+  *lat = convert_lat_dec_to_ddd ( latlon->lat );
+  *lon = convert_lon_dec_to_ddd ( latlon->lon );
+#endif
 }