SF#356778: Download Map Tiles using F5

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

diff --git a/src/globals.h b/src/globals.h
index fb4d6f903968411df605dc08839a848f6a50443c..151b26f42d65ed65a3e79b5d293c6408de7e0a30 100644 (file)
--- a/src/globals.h
+++ b/src/globals.h
@@ -34,22 +34,26 @@
 
 #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_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)
+#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_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_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
@@ -118,8 +122,33 @@ typedef enum {
 gdouble a_vik_get_default_lat ( );
 gdouble a_vik_get_default_long ( );
 
+/* KML export preferences */
+typedef enum {
+  VIK_KML_EXPORT_UNITS_METRIC,
+  VIK_KML_EXPORT_UNITS_STATUTE,
+  VIK_KML_EXPORT_UNITS_NAUTICAL,
+} vik_kml_export_units_t;
+
+vik_kml_export_units_t a_vik_get_kml_export_units ( );
+
+#ifndef WINDOWS
+/* Windows automatically uses the system defined viewer
+   ATM for other systems need to specify the program to use */
+const gchar* a_vik_get_image_viewer ( );
+#endif
+
+const gchar* a_vik_get_external_gpx_program_1 ( );
+
+const gchar* a_vik_get_external_gpx_program_2 ( );
+
 /* Group for global preferences */
 #define VIKING_PREFERENCES_GROUP_KEY "viking.globals"
 #define VIKING_PREFERENCES_NAMESPACE "viking.globals."
 
+/* Another group of global preferences,
+  but in a separate section to try to keep things organized */
+/* AKA Export/External Prefs */
+#define VIKING_PREFERENCES_IO_GROUP_KEY "viking.io"
+#define VIKING_PREFERENCES_IO_NAMESPACE "viking.io."
+
 #endif