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

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

revision 77 by harbaum, Tue Aug 25 12:49:03 2009 UTC revision 84 by harbaum, Fri Aug 28 07:52:01 2009 UTC
# Line 31  Line 31 
31  #include <X11/Xatom.h>  #include <X11/Xatom.h>
32  #endif  #endif
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
36  #define GPS_DEFAULT_ZOOM 13  #define GPS_DEFAULT_ZOOM 13
37    
38  #define PROXY_KEY  "/system/http_proxy/"  #define PROXY_KEY  "/system/http_proxy/"
# Line 77  cb_map_gps(osd_button_t but, map_context Line 78  cb_map_gps(osd_button_t but, map_context
78    if(but == OSD_GPS) {    if(but == OSD_GPS) {
79      pos_t *refpos = get_pos(context->appdata);      pos_t *refpos = get_pos(context->appdata);
80      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
81        osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),        gint zoom;
82                                  refpos->lat, refpos->lon, GPS_DEFAULT_ZOOM);        g_object_get(OSM_GPS_MAP(context->widget), "zoom", &zoom, NULL);
83          if(zoom < 10)
84            osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
85                                      refpos->lat, refpos->lon, GPS_DEFAULT_ZOOM);
86          else
87            osm_gps_map_set_center(OSM_GPS_MAP(context->widget),
88                                   refpos->lat, refpos->lon);
89    
90        /* re-enable centering */        /* re-enable centering */
91        g_object_set(context->widget, "auto-center", TRUE, NULL);        g_object_set(context->widget, "auto-center", TRUE, NULL);
92      } else {      } else {
Legend:
Removed from v.77  
changed lines
  Added in v.84