diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2013-03-01 23:11:41 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2013-03-01 23:11:41 -0800 |
| commit | 51d20880210d990e35982137067cda1801460d0a (patch) | |
| tree | bcbd7c015a526e900d4ae72c9748cbd0d1fb72d0 /gps.c | |
| parent | f7d373bae64627e25dcca219f81362c9f1d1b508 (diff) | |
| parent | d1c394e51f7ab792650246dff74677609a9e7ea8 (diff) | |
| download | subsurface-51d20880210d990e35982137067cda1801460d0a.tar.gz | |
Merge branch 'map-providers'
Diffstat (limited to 'gps.c')
| -rw-r--r-- | gps.c | 8 |
1 files changed, 1 insertions, 7 deletions
@@ -17,12 +17,6 @@ static GtkWidget *window = NULL; static OsmGpsMap *map = NULL; -/* Several map providers are available, such as OSM_GPS_MAP_SOURCE_OPENSTREETMAP - and OSM_GPS_MAP_SOURCE_GOOGLE_STREET. We should make more of - them available from e.g. a pull-down menu */ -static OsmGpsMapSource_t opt_map_provider = OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_HYBRID; - - static void on_close(GtkWidget *widget, gpointer user_data) { GtkWidget **window = user_data; @@ -168,7 +162,7 @@ OsmGpsMap *init_map(void) cachedir = g_strdup(OSM_GPS_MAP_CACHE_AUTO); map = g_object_new(OSM_TYPE_GPS_MAP, - "map-source", opt_map_provider, + "map-source", prefs.map_provider, "tile-cache", cachedir, "tile-cache-base", cachebasedir, "proxy-uri", g_getenv("http_proxy"), |