Move some variables around

[mapper] / src / mapper-types.h

diff --git a/src/mapper-types.h b/src/mapper-types.h
index fd6b391b74b9551e82d6eb87354e3e58a2a2c6ee..914290bb30cd58c119d878ef07cc795e10c203ee 100644 (file)
--- a/src/mapper-types.h
+++ b/src/mapper-types.h
@@ -1,11 +1,12 @@
 #include "config.h"
 
-#include <math.h>
-#include <gtk/gtk.h>
-
 #ifndef _MAPPER_TYPES_H
 #define _MAPPER_TYPES_H
 
+#include <math.h>
+#include <gtk/gtk.h>
+#include <curl/multi.h>
+
 /** Generic search item list indexes */
 typedef enum {
        ITEM_ID,
@@ -32,22 +33,13 @@ typedef enum {
        REPOTYPE_WMS            /* "service=wms" */
 } RepoType;
 
-/** Possible center modes.  The "WAS" modes imply no current center mode;
- * they only hint at what the last center mode was, so that it can be
- * recalled. */
-typedef enum {
-       CENTER_WAS_LATLON = -2,
-       CENTER_WAS_LEAD = -1,
-       CENTER_MANUAL =0,
-       CENTER_LEAD = 1,
-       CENTER_LATLON = 2
-} CenterMode;
-
 /* Route list */
 typedef enum {
        ROUTE_LATLON,
        ROUTE_DISTANCE,
        ROUTE_WAYPOINT,
+       ROUTE_LAT,
+       ROUTE_LON,
        ROUTE_NUM_COLUMNS
 } RouteList;
 
@@ -62,19 +54,6 @@ typedef enum {
        CAT_NUM_COLUMNS
 } CategoryList;
 
-/** This enum defines the possible units we can use. */
-typedef enum {
-       UNITS_KM,
-       UNITS_MI,
-       UNITS_NM,
-       UNITS_ENUM_COUNT
-} UnitType;
-gchar *UNITS_TEXT[UNITS_ENUM_COUNT];
-
-/* UNITS_CONVERTS, when multiplied, converts from NM. */
-#define EARTH_RADIUS (3440.06479f)
-gfloat UNITS_CONVERT[UNITS_ENUM_COUNT];
-
 /** This enum defines the possible font sizes. */
 typedef enum {
        INFO_FONT_XXSMALL,