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 89 by harbaum, Tue Sep 1 11:16:30 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 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 77  cb_map_gps(osd_button_t but, map_context Line 79  cb_map_gps(osd_button_t but, map_context
79    if(but == OSD_GPS) {    if(but == OSD_GPS) {
80      pos_t *refpos = get_pos(context->appdata);      pos_t *refpos = get_pos(context->appdata);
81      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
82        osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),        gint zoom;
83                                  refpos->lat, refpos->lon, GPS_DEFAULT_ZOOM);        g_object_get(OSM_GPS_MAP(context->widget), "zoom", &zoom, NULL);
84          if(zoom < 10)
85            osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
86                                      refpos->lat, refpos->lon, GPS_DEFAULT_ZOOM);
87          else
88            osm_gps_map_set_center(OSM_GPS_MAP(context->widget),
89                                   refpos->lat, refpos->lon);
90    
91        /* re-enable centering */        /* re-enable centering */
92        g_object_set(context->widget, "auto-center", TRUE, NULL);        g_object_set(context->widget, "auto-center", TRUE, NULL);
93      } else {      } else {
# Line 130  static gboolean on_map_configure(GtkWidg Line 139  static gboolean on_map_configure(GtkWidg
139                                   GdkEventConfigure *event,                                   GdkEventConfigure *event,
140                                   map_context_t *context) {                                   map_context_t *context) {
141    
142    /* set default values if they are invalid */    if(!context->map_complete) {
143    if(!context->appdata->map.zoom ||  
144       isnan(context->appdata->map.pos.lat) ||      /* set default values if they are invalid */
145       isnan(context->appdata->map.pos.lon)) {      if(!context->appdata->map.zoom ||
146      printf("no valid map position found\n");         isnan(context->appdata->map.pos.lat) ||
147           isnan(context->appdata->map.pos.lon)) {
148      pos_t *refpos = get_pos(context->appdata);        printf("no valid map position found\n");
149      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {  
150        /* use gps position if present */        pos_t *refpos = get_pos(context->appdata);
151        context->appdata->map.pos = *refpos;        if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
152        context->appdata->map.zoom = GPS_DEFAULT_ZOOM;          /* use gps position if present */
153      } else {          context->appdata->map.pos = *refpos;
154        /* use world map otherwise */          context->appdata->map.zoom = GPS_DEFAULT_ZOOM;
155        context->appdata->map.pos.lat = 0.0;        } else {
156        context->appdata->map.pos.lon = 0.0;          /* use world map otherwise */
157        context->appdata->map.zoom = 1;          context->appdata->map.pos.lat = 0.0;
158            context->appdata->map.pos.lon = 0.0;
159            context->appdata->map.zoom = 1;
160          }
161      }      }
162    
163        /* jump to initial position */
164        osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
165                                  context->appdata->map.pos.lat,
166                                  context->appdata->map.pos.lon,
167                                  context->appdata->map.zoom);
168        context->map_complete = TRUE;
169    }    }
170    
   /* jump to initial position */  
   osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),  
                             context->appdata->map.pos.lat,  
                             context->appdata->map.pos.lon,  
                             context->appdata->map.zoom);  
   
171    return FALSE;    return FALSE;
172  }  }
173    
# Line 224  on_map_button_press_event(GtkWidget *wid Line 237  on_map_button_press_event(GtkWidget *wid
237                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
238    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
239    
240      /* check if we actually clicked parts of the OSD */
241      if(osm_gps_map_osd_check(map, event->x, event->y) != OSD_NONE)
242        return FALSE;
243    
244    /* got a press event without release event? eat it! */    /* got a press event without release event? eat it! */
245    if(context->press_on != NULL) {    if(context->press_on != NULL) {
246      printf("PRESS: already\n");      printf("PRESS: already\n");
247      return TRUE;      return FALSE;
248    }    }
249    
250    pos_t pos =    pos_t pos =
# Line 435  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 476  void map(appdata_t *appdata) { Line 497  void map(appdata_t *appdata) {
497    
498    context = appdata->map.context = g_new0(map_context_t, 1);    context = appdata->map.context = g_new0(map_context_t, 1);
499    context->appdata = appdata;    context->appdata = appdata;
500      context->map_complete = FALSE;
501    
502    /* cleanup old (pre 0.8.7) path if it exists */    /* cleanup old (pre 0.8.7) path if it exists */
503    char *old_path = g_strdup_printf("%s/map/", appdata->image_path);    char *old_path = g_strdup_printf("%s/map/", appdata->image_path);
# Line 503  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.77  
changed lines
  Added in v.89