Add Yahoo! Maps webtool link.

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

diff --git a/src/globals.h b/src/globals.h
index 89f8d3840b412c017609ca0f4b935bd4f65554c9..40d58d58260c0e075dec679b899fecfa7a1dd5a6 100644 (file)
--- a/src/globals.h
+++ b/src/globals.h
@@ -32,6 +32,29 @@
 #define ALTI_TO_MPP 1.4017295
 #define MPP_TO_ALTI 0.7134044
 
 #define ALTI_TO_MPP 1.4017295
 #define MPP_TO_ALTI 0.7134044
 

+#define VIK_FEET_IN_METER 3.2808399
+#define VIK_METERS_TO_FEET(X) ((X)*VIK_FEET_IN_METER)
+#define VIK_FEET_TO_METERS(X) ((X)/VIK_FEET_IN_METER)
+
+#define VIK_MILES_IN_METER 0.000621371192
+#define VIK_METERS_TO_MILES(X) ((X)*VIK_MILES_IN_METER)
+#define VIK_MILES_TO_METERS(X) ((X)/VIK_MILES_IN_METER)
+
+/* MPS - Metres Per Second */
+/* MPH - Metres Per Hour */
+#define VIK_MPH_IN_MPS 2.23693629
+#define VIK_MPS_TO_MPH(X) ((X)*VIK_MPH_IN_MPS)
+#define VIK_MPH_TO_MPS(X) ((X)/VIK_MPH_IN_MPS)
+
+/* KPH - Kilometres Per Hour */
+#define VIK_KPH_IN_MPS 3.6
+#define VIK_MPS_TO_KPH(X) ((X)*VIK_KPH_IN_MPS)
+#define VIK_KPH_TO_MPS(X) ((X)/VIK_KPH_IN_MPS)
+
+#define VIK_KNOTS_IN_MPS 1.94384449
+#define VIK_MPS_TO_KNOTS(X) ((X)*VIK_KNOTS_IN_MPS)
+#define VIK_KNOTS_TO_MPS(X) ((X)/VIK_KNOTS_IN_MPS)
+

 #define VIK_DEFAULT_ALTITUDE 0.0
 #define VIK_DEFAULT_DOP 0.0
 
 #define VIK_DEFAULT_ALTITUDE 0.0
 #define VIK_DEFAULT_DOP 0.0
 


@@ -75,6 +98,7 @@ typedef enum {
   VIK_UNITS_SPEED_KILOMETRES_PER_HOUR,
   VIK_UNITS_SPEED_MILES_PER_HOUR,
   VIK_UNITS_SPEED_METRES_PER_SECOND,
   VIK_UNITS_SPEED_KILOMETRES_PER_HOUR,
   VIK_UNITS_SPEED_MILES_PER_HOUR,
   VIK_UNITS_SPEED_METRES_PER_SECOND,

+  VIK_UNITS_SPEED_KNOTS,

 } vik_units_speed_t;
 
 vik_units_speed_t a_vik_get_units_speed ( );
 } vik_units_speed_t;
 
 vik_units_speed_t a_vik_get_units_speed ( );