Remove old map sources

[mapper] / src / settings-gconf.h

diff --git a/src/settings-gconf.h b/src/settings-gconf.h
index 3faf5138d0cda5681724ea8a3bcb35eeb5c35147..4944b0b36fd1c0ee5d3f4a997ccbbd1b118e2b43 100644 (file)
--- a/src/settings-gconf.h
+++ b/src/settings-gconf.h
@@ -2,19 +2,24 @@
 #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 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"
+#define GCONF_KEY_GPS_TYPE GCONF_KEY_PREFIX"/receiver_type"
+#define GCONF_KEY_GPS_MAC GCONF_KEY_PREFIX"/receiver_mac"
+#define GCONF_KEY_GPS_PORT GCONF_KEY_PREFIX"/receiver_port"
+#define GCONF_KEY_GPS_CHAN GCONF_KEY_PREFIX"/receiver_channel"
 #define GCONF_KEY_ENABLE_GPS GCONF_KEY_PREFIX"/enable_gps"
 #define GCONF_KEY_GPS_INFO GCONF_KEY_PREFIX"/gps_info"
 
@@ -24,7 +29,9 @@
 #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"
@@ -42,6 +49,10 @@
 #define GCONF_KEY_VOICE_PITCH GCONF_KEY_PREFIX"/voice_pitch"
 #define GCONF_KEY_ANNOUNCE_NOTICE GCONF_KEY_PREFIX"/announce_notice"
 
+#define GCONF_KEY_ANNOUNCE_WAYPOINTS GCONF_KEY_PREFIX"/announce_waypoints"
+#define GCONF_KEY_ANNOUNCE_OVERSPEED GCONF_KEY_PREFIX"/announce_overspeed"
+#define GCONF_KEY_ANNOUNCE_DESTINATION GCONF_KEY_PREFIX"/announce_destination"
+
 #define GCONF_KEY_ALWAYS_KEEP_ON GCONF_KEY_PREFIX"/always_keep_on"
 #define GCONF_KEY_UNITS GCONF_KEY_PREFIX"/units"
 
@@ -55,17 +66,22 @@
 
 /* POI */
 #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_ZOOM GCONF_KEY_PREFIX"/zoom"
 #define GCONF_KEY_AUTOCENTER_MODE GCONF_KEY_PREFIX"/autocenter_mode"
 #define GCONF_KEY_LEAD_AMOUNT GCONF_KEY_PREFIX"/lead_amount"
+
 #define GCONF_KEY_LAT GCONF_KEY_PREFIX"/last_latitude"
 #define GCONF_KEY_LON GCONF_KEY_PREFIX"/last_longitude"
+
 #define GCONF_KEY_CENTER_LAT GCONF_KEY_PREFIX"/center_latitude"
 #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"
+/* Special locations */
+#define GCONF_KEY_POSITION_HOME GCONF_KEY_PREFIX"/home_latlon"
+#define GCONF_KEY_POSITION_DEST GCONF_KEY_PREFIX"/destination_latlon"
 
 /* Display features */
 #define GCONF_KEY_SHOWSCALE GCONF_KEY_PREFIX"/show_scale"
@@ -80,6 +96,7 @@
 #define GCONF_KEY_ROUTE_DL_URL GCONF_KEY_PREFIX"/route_dl_url"
 #define GCONF_KEY_ROUTE_DL_RADIUS GCONF_KEY_PREFIX"/route_dl_radius"
 
+#define GCONF_KEY_TRACK_DL_RADIUS GCONF_KEY_PREFIX"/track_dl_radius"
 #define GCONF_KEY_TRACKFILE GCONF_KEY_PREFIX"/track_file"
 #define GCONF_KEY_DEG_FORMAT GCONF_KEY_PREFIX"/deg_format"