Fix GPS settings dialog so it works.

[mapper] / src / utils.h

diff --git a/src/utils.h b/src/utils.h
index 970ff48c724649a1eb281f401a3a48d1a4e51f45..a1e1467d85575c1a352b62810f07dbefa2a3d880 100644 (file)
--- a/src/utils.h
+++ b/src/utils.h
@@ -21,9 +21,7 @@
 #ifndef _MAPPER_UTILS_H
 #define _MAPPER_UTILS_H
 
-#define _GNU_SOURCE
-
-#include <config.h>
+#include "config.h"
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
@@ -69,65 +67,8 @@
 
 #define SQR(s) ((s)*(s))
 
-/** MAX_ZOOM defines the largest map zoom level we will download.
- * (MAX_ZOOM - 1) is the largest map zoom level that the user can zoom to.
- */
-#define MAX_ZOOM 16
-
-#define TILE_SIZE_PIXELS (256)
-#define TILE_SIZE_P2 (8)
-
-#ifdef WITH_DEVICE_770
-#define BUF_WIDTH_TILES (4)
-#define BUF_HEIGHT_TILES (3)
-#define BUF_WIDTH_PIXELS (1024)
-#define BUF_HEIGHT_PIXELS (768)
-#else
-#define BUF_WIDTH_TILES (8)
-#define BUF_HEIGHT_TILES (8)
-#define BUF_WIDTH_PIXELS (2048)
-#define BUF_HEIGHT_PIXELS (2048)
-#endif
-
 #define ARRAY_CHUNK_SIZE (1024)
 #define BUFFER_SIZE (2048)
-#define WORLD_SIZE_UNITS (2 << (MAX_ZOOM + TILE_SIZE_P2))
-
-#define tile2grid(tile) ((tile) << 3)
-#define grid2tile(grid) ((grid) >> 3)
-#define tile2pixel(tile) ((tile) << 8)
-#define pixel2tile(pixel) ((pixel) >> 8)
-#define tile2unit(tile) ((tile) << (8 + _zoom))
-#define unit2tile(unit) ((unit) >> (8 + _zoom))
-#define tile2zunit(tile, zoom) ((tile) << (8 + zoom))
-#define unit2ztile(unit, zoom) ((unit) >> (8 + zoom))
-
-#define grid2pixel(grid) ((grid) << 5)
-#define pixel2grid(pixel) ((pixel) >> 5)
-#define grid2unit(grid) ((grid) << (5 + _zoom))
-#define unit2grid(unit) ((unit) >> (5 + _zoom))
-
-#define pixel2unit(pixel) ((pixel) << _zoom)
-#define unit2pixel(pixel) ((pixel) >> _zoom)
-#define pixel2zunit(pixel, zoom) ((pixel) << (zoom))
-
-#define unit2bufx(unit) (unit2pixel(unit) - tile2pixel(_base_tilex))
-#define bufx2unit(x) (pixel2unit(x) + tile2unit(_base_tilex))
-#define unit2bufy(unit) (unit2pixel(unit) - tile2pixel(_base_tiley))
-#define bufy2unit(y) (pixel2unit(y) + tile2unit(_base_tiley))
-
-#define unit2x(unit) (unit2pixel(unit) - tile2pixel(_base_tilex) - _offsetx)
-#define x2unit(x) (pixel2unit(x + _offsetx) + tile2unit(_base_tilex))
-#define unit2y(unit) (unit2pixel(unit) - tile2pixel(_base_tiley) - _offsety)
-#define y2unit(y) (pixel2unit(y + _offsety) + tile2unit(_base_tiley))
-
-#define leadx2unit() (_pos.unitx + (_lead_ratio) * pixel2unit(_gps.vel_offsetx))
-#define leady2unit() (_pos.unity + (0.6f*_lead_ratio)*pixel2unit(_gps.vel_offsety))
-
-/* Pans are done two "grids" at a time, or 64 pixels. */
-#define PAN_UNITS (grid2unit(2))
-
-#define INITIAL_DOWNLOAD_RETRIES (3)
 
 #define MACRO_PARSE_INT(tofill, str) { \
     gchar *error_check; \
@@ -150,11 +91,6 @@
     } \
 }
 
-#define DISTANCE_SQUARED(a, b) \
-   ((guint64)((((gint64)(b).unitx)-(a).unitx)*(((gint64)(b).unitx)-(a).unitx))\
-  + (guint64)((((gint64)(b).unity)-(a).unity)*(((gint64)(b).unity)-(a).unity)))
-
-
 #ifdef WITH_OSSO
 #define KEEP_DISPLAY_ON() { \
     /* Note that the flag means keep on ONLY when fullscreen. */ \
@@ -196,7 +132,7 @@ if (_http_proxy_host) { \
 
 #ifdef WITH_HILDON
 #define MACRO_BANNER_SHOW_INFO(A, S) { \
-    gchar *my_macro_buffer = g_strdup_printf("<span size='%s'>%s</span>", \
+    gchar *my_macro_buffer = g_markup_printf_escaped("<span size='%s'>%s</span>", \
             INFO_FONT_TEXT[_info_font_size], (S)); \
     hildon_banner_show_information_with_markup(A, NULL, my_macro_buffer); \
     g_free(my_macro_buffer); \
@@ -206,6 +142,5 @@ if (_http_proxy_host) { \
 #endif
 
 void sound_noise(void);
-gint download_comparefunc(const ProgressUpdateInfo * a, const ProgressUpdateInfo * b, gpointer user_data);
 
 #endif