Import Launchpad translation updates

[andy/viking.git] / src / globals.h

diff --git a/src/globals.h b/src/globals.h
index d9da35209e4f77615cfe58ad053e45ad5ddcc86f..2d0fbe4a5b47eae3d2ba4bff7dab109f01400725 100644 (file)
--- a/src/globals.h
+++ b/src/globals.h
@@ -63,12 +63,12 @@ G_BEGIN_DECLS
 #define VIK_GTK_WINDOW_FROM_WIDGET(x) GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(x)))
 #define VIK_GTK_WINDOW_FROM_LAYER(x) VIK_GTK_WINDOW_FROM_WIDGET(VIK_LAYER(x)->vt)
 
-#define DEG2RAD 0.017453293
-#define RAD2DEG 57.2957795
+#define DEG2RAD(x) ((x)*(M_PI/180))
+#define RAD2DEG(x) ((x)*(180/M_PI))
 
 /* mercator projection, latitude conversion (degrees) */
-#define MERCLAT(x) (RAD2DEG * log(tan((0.25 * M_PI) + (0.5 * DEG2RAD * (x)))))
-#define DEMERCLAT(x) (RAD2DEG * atan(sinh(DEG2RAD * (x))))
+#define MERCLAT(x) (RAD2DEG(log(tan((0.25 * M_PI) + (0.5 * DEG2RAD(x))))))
+#define DEMERCLAT(x) (RAD2DEG(atan(sinh(DEG2RAD(x)))))
 
 /* Some command line options */
 extern gboolean vik_debug;
@@ -133,6 +133,13 @@ typedef enum {
 
 vik_kml_export_units_t a_vik_get_kml_export_units ( );
 
+typedef enum {
+  VIK_GPX_EXPORT_TRK_SORT_ALPHA,
+  VIK_GPX_EXPORT_TRK_SORT_TIME,
+} vik_gpx_export_trk_sort_t;
+
+vik_gpx_export_trk_sort_t a_vik_get_gpx_export_trk_sort ( );
+
 #ifndef WINDOWS
 /* Windows automatically uses the system defined viewer
    ATM for other systems need to specify the program to use */