Get rid of _pos, move data to gpsdata struct.

[mapper] / src / settings-gconf.h

diff --git a/src/settings-gconf.h b/src/settings-gconf.h
index eb19833365163d02927abd2ac1a0c43be7114d1c..3fe6db475e3b6f69673384e9a3290f4bb1357838 100644 (file)
--- a/src/settings-gconf.h
+++ b/src/settings-gconf.h
@@ -2,26 +2,19 @@
 #define CONFIG_FILE_ROUTE "route.gpx"
 #define CONFIG_FILE_TRACK "track.gpx"
 
-/* Default OSM Repository */
-#define REPO_DEFAULT_NAME "OpenStreet"
+#define GCONF_KEY_PREFIX "/apps/maemo/mapper"
+
+#define REPO_DEFAULT_NAME "OpenStreetMap"
+#ifdef WITH_DEVICE_770
 #define REPO_DEFAULT_CACHE_BASE "~/MyDocs/.documents/Maps/"
-#define REPO_DEFAULT_CACHE_DIR REPO_DEFAULT_CACHE_BASE"OpenStreet"
+#else
+#define REPO_DEFAULT_CACHE_BASE "~/Maps/"
+#endif
+#define REPO_DEFAULT_CACHE_DIR REPO_DEFAULT_CACHE_BASE"OpenStreetMap"
 #define REPO_DEFAULT_MAP_URI "http://tile.openstreetmap.org/%0d/%d/%d.png"
-#define REPO_DEFAULT_DL_ZOOM_STEPS (2)
+#define REPO_DEFAULT_DL_ZOOM_STEPS (1)
 #define REPO_DEFAULT_VIEW_ZOOM_STEPS (1)
 
-#define HELP_ID_PREFIX "help_maemomapper_"
-#define HELP_ID_INTRO HELP_ID_PREFIX"intro"
-#define HELP_ID_GETSTARTED HELP_ID_PREFIX"getstarted"
-#define HELP_ID_ABOUT HELP_ID_PREFIX"about"
-#define HELP_ID_SETTINGS HELP_ID_PREFIX"settings"
-#define HELP_ID_REPOMAN HELP_ID_PREFIX"repoman"
-#define HELP_ID_MAPMAN HELP_ID_PREFIX"mapman"
-#define HELP_ID_DOWNROUTE HELP_ID_PREFIX"downroute"
-#define HELP_ID_POICAT HELP_ID_PREFIX"poicat"
-
-#define GCONF_KEY_PREFIX "/apps/maemo/mapper"
-
 /* GPS */
 #define GCONF_KEY_RCVR_MAC GCONF_KEY_PREFIX"/receiver_mac"
 #define GCONF_KEY_RCVR_CHAN GCONF_KEY_PREFIX"/receiver_channel"
@@ -33,7 +26,10 @@
 #define GCONF_KEY_GPS_FILTER_HDOP GCONF_KEY_PREFIX"/gps_filter_hdop"
 #define GCONF_KEY_GPS_FILTER_VDOP GCONF_KEY_PREFIX"/gps_filter_vdop"
 #define GCONF_KEY_GPS_FILTER_ANGLE GCONF_KEY_PREFIX"/gps_filter_angle"
+#define GCONF_KEY_GPS_FILTER_OSM GCONF_KEY_PREFIX"/gps_filter_osm"
+#define GCONF_KEY_GPS_FILTER_MAXDROP GCONF_KEY_PREFIX"/gps_filter_maxdrop"
 
+/* Misc */
 #define GCONF_KEY_MAP_URI_FORMAT GCONF_KEY_PREFIX"/map_uri_format"
 #define GCONF_KEY_MAP_ZOOM_STEPS GCONF_KEY_PREFIX"/map_zoom_steps"
 #define GCONF_KEY_MAP_DIR_NAME GCONF_KEY_PREFIX"/map_cache_dir"
@@ -59,9 +55,13 @@
 #define GCONF_KEY_SPEED_LIMIT GCONF_KEY_PREFIX"/speed_limit"
 #define GCONF_KEY_SPEED_LOCATION GCONF_KEY_PREFIX"/speed_location"
 
+/* Database */
+#define GCONF_KEY_MAPPER_DB GCONF_KEY_PREFIX"/mapper_db"
+
 /* POI */
-#define GCONF_KEY_POI_DB GCONF_KEY_PREFIX"/poi_db"
 #define GCONF_KEY_POI_ZOOM GCONF_KEY_PREFIX"/poi_zoom"
+#define GCONF_KEY_POI_THEME_BASE GCONF_KEY_PREFIX"/poi_theme_base"
+#define GCONF_KEY_POI_ICON_THEME GCONF_KEY_PREFIX"/poi_icon_theme"
 
 #define GCONF_KEY_AUTOCENTER_MODE GCONF_KEY_PREFIX"/autocenter_mode"
 #define GCONF_KEY_LEAD_AMOUNT GCONF_KEY_PREFIX"/lead_amount"
@@ -71,6 +71,9 @@
 #define GCONF_KEY_CENTER_LON GCONF_KEY_PREFIX"/center_longitude"
 #define GCONF_KEY_ZOOM GCONF_KEY_PREFIX"/zoom"
 
+#define GCONF_KEY_HOME_LAT GCONF_KEY_PREFIX"/home_latitude"
+#define GCONF_KEY_HOME_LON GCONF_KEY_PREFIX"/home_longitude"
+
 /* Display features */
 #define GCONF_KEY_SHOWSCALE GCONF_KEY_PREFIX"/show_scale"
 #define GCONF_KEY_SHOWTRACKS GCONF_KEY_PREFIX"/show_tracks"