Diff of /trunk/src/map-tool.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 86 by harbaum, Sun Aug 30 19:05:44 2009 UTC revision 89 by harbaum, Tue Sep 1 11:16:30 2009 UTC
# Line 33  Line 33 
33    
34  // #define MAP_SOURCE  OSM_GPS_MAP_SOURCE_OPENSTREETMAP  // #define MAP_SOURCE  OSM_GPS_MAP_SOURCE_OPENSTREETMAP
35  #define MAP_SOURCE  OSM_GPS_MAP_SOURCE_OPENCYCLEMAP  #define MAP_SOURCE  OSM_GPS_MAP_SOURCE_OPENCYCLEMAP
36    // #define MAP_SOURCE  OSM_GPS_MAP_SOURCE_GOOGLE_STREET
37  #define GPS_DEFAULT_ZOOM 13  #define GPS_DEFAULT_ZOOM 13
38    
39  #define PROXY_KEY  "/system/http_proxy/"  #define PROXY_KEY  "/system/http_proxy/"
# Line 451  static void on_window_destroy(GtkWidget Line 452  static void on_window_destroy(GtkWidget
452    context->appdata->map.pos.lat = lat;    context->appdata->map.pos.lat = lat;
453    context->appdata->map.pos.lon = lon;    context->appdata->map.pos.lon = lon;
454    
455      gint source;
456      g_object_get(map, "map-source", &source, NULL);
457      context->appdata->map.source = source;
458    
459  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
460    /* restore cur_view */    /* restore cur_view */
461    context->appdata->cur_view = context->old_view;    context->appdata->cur_view = context->old_view;
# Line 520  void map(appdata_t *appdata) { Line 525  void map(appdata_t *appdata) {
525    
526    const char *proxy = get_proxy_uri(appdata);    const char *proxy = get_proxy_uri(appdata);
527    
528      gint source = context->appdata->map.source;
529      if(!source) source = MAP_SOURCE;
530    
531    context->widget = g_object_new(OSM_TYPE_GPS_MAP,    context->widget = g_object_new(OSM_TYPE_GPS_MAP,
532                   "map-source",               MAP_SOURCE,                   "map-source",               source,
533                   "tile-cache",               path,                   "tile-cache",               path,
534                   "auto-center",              FALSE,                   "auto-center",              FALSE,
535                   "record-trip-history",      FALSE,                   "record-trip-history",      FALSE,
Legend:
Removed from v.86  
changed lines
  Added in v.89