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

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

revision 61 by harbaum, Tue Aug 18 14:32:45 2009 UTC revision 73 by harbaum, Sun Aug 23 19:38:15 2009 UTC
# Line 23  Line 23 
23    
24  #ifdef ENABLE_OSM_GPS_MAP  #ifdef ENABLE_OSM_GPS_MAP
25  #include "osm-gps-map.h"  #include "osm-gps-map.h"
26    #include "osm-gps-map-osd-classic.h"
27  #endif  #endif
28    
29  #define MAP_SOURCE  OSM_GPS_MAP_SOURCE_OPENSTREETMAP  #define MAP_SOURCE  OSM_GPS_MAP_SOURCE_OPENSTREETMAP
# Line 66  static const char *get_proxy_uri(appdata Line 67  static const char *get_proxy_uri(appdata
67    return NULL;    return NULL;
68  }  }
69    
70  static void map_zoom(map_context_t *context, int step) {  static void
71    gint zoom;  cb_map_gps(osd_button_t but, map_context_t *context) {
72    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    if(but == OSD_GPS) {
73    g_object_get(map, "zoom", &zoom, NULL);      pos_t *refpos = get_pos(context->appdata);
74    zoom = osm_gps_map_set_zoom(map, zoom+step);      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
75          osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
76    /* enable/disable zoom buttons as required */                                  refpos->lat, refpos->lon, GPS_DEFAULT_ZOOM);
77    gtk_widget_set_sensitive(context->zoomin,      } else {
78             zoom < osm_gps_map_source_get_max_zoom(MAP_SOURCE));        /* no coordinates given: display the entire world */
79    gtk_widget_set_sensitive(context->zoomout,        osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
80             zoom > osm_gps_map_source_get_min_zoom(MAP_SOURCE));                                  0.0, 0.0, 1);
81        }
   /* save new zoom */  
   context->appdata->map.zoom = zoom;  
 }  
   
 static gboolean  
 cb_map_zoomin(GtkButton *button, map_context_t *context) {  
   map_zoom(context, +1);  
   return FALSE;  
 }  
   
 static gboolean  
 cb_map_zoomout(GtkButton *button, map_context_t *context) {  
   map_zoom(context, -1);  
   return FALSE;  
 }  
   
 static gboolean  
 cb_map_gps(GtkButton *button, map_context_t *context) {  
   pos_t *refpos = get_pos(context->appdata);  
   if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {  
     osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),  
                       refpos->lat, refpos->lon, GPS_DEFAULT_ZOOM);  
   } else {  
     /* no coordinates given: display the entire world */  
     osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),  
                               0.0, 0.0, 1);  
82    }    }
   
   return FALSE;  
 }  
   
 static GtkWidget  
 *map_add_button(int icon, GCallback cb, gpointer data,  
                 char *tooltip) {  
   GtkWidget *button = gtk_button_new();  
   gtk_button_set_image(GTK_BUTTON(button), icon_get_widget(ICON_MISC, icon));  
   g_signal_connect(button, "clicked", cb, data);  
 #ifndef USE_MAEMO  
   gtk_widget_set_tooltip_text(button, tooltip);  
 #endif  
   return button;  
83  }  }
84    
85  static int dist2pixel(map_context_t *context, float km, float lat) {  static int dist2pixel(map_context_t *context, float km, float lat) {
# Line 133  static gboolean map_gps_update(gpointer Line 94  static gboolean map_gps_update(gpointer
94    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);
95    
96    /* ... and enable "goto" button if it's valid */    /* ... and enable "goto" button if it's valid */
97    gtk_widget_set_sensitive(context->gps, ok);    osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),
98                     OSM_GPS_MAP_OSD_CALLBACK(ok?cb_map_gps:NULL), context);
99    
100    if(ok) {    if(ok) {
101      float heading = NAN;      float heading = NAN;
# Line 185  static gboolean on_map_configure(GtkWidg Line 147  static gboolean on_map_configure(GtkWidg
147                              context->appdata->map.pos.lat,                              context->appdata->map.pos.lat,
148                              context->appdata->map.pos.lon,                              context->appdata->map.pos.lon,
149                              context->appdata->map.zoom);                              context->appdata->map.zoom);
150    
151    return FALSE;    return FALSE;
152  }  }
153    
# Line 297  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 259  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
259    cairo_paint(cr);    cairo_paint(cr);
260  }  }
261    
262    #ifndef BIG_BALLOONS
263  #define LINE_SKIP  7  #define LINE_SKIP  7
264    #else
265    #define LINE_SKIP  12
266    #endif
267    
268  static void  static void
269  balloon_draw_cb(cairo_t *cr, OsmGpsMapRect_t *rect, gpointer data) {  balloon_draw_cb(cairo_t *cr, OsmGpsMapRect_t *rect, gpointer data) {
# Line 329  balloon_draw_cb(cairo_t *cr, OsmGpsMapRe Line 295  balloon_draw_cb(cairo_t *cr, OsmGpsMapRe
295                              CAIRO_FONT_SLANT_NORMAL,                              CAIRO_FONT_SLANT_NORMAL,
296                              CAIRO_FONT_WEIGHT_BOLD);                              CAIRO_FONT_WEIGHT_BOLD);
297    
298    #ifndef BIG_BALLOONS
299      cairo_set_font_size (cr, 20.0);      cairo_set_font_size (cr, 20.0);
300    #else
301        cairo_set_font_size (cr, 36.0);
302    #endif
303    
304      cairo_text_extents (cr, cache->id, &extents);      cairo_text_extents (cr, cache->id, &extents);
305    
306      /* display id right of icon vertically centered */      /* display id right of icon vertically centered */
# Line 350  balloon_draw_cb(cairo_t *cr, OsmGpsMapRe Line 321  balloon_draw_cb(cairo_t *cr, OsmGpsMapRe
321    /* everything from here uses the same font */    /* everything from here uses the same font */
322    cairo_select_font_face (cr, "Sans", CAIRO_FONT_SLANT_NORMAL,    cairo_select_font_face (cr, "Sans", CAIRO_FONT_SLANT_NORMAL,
323                            CAIRO_FONT_WEIGHT_NORMAL);                            CAIRO_FONT_WEIGHT_NORMAL);
324    #ifndef BIG_BALLOONS
325    cairo_set_font_size (cr, 14.0);    cairo_set_font_size (cr, 14.0);
326    #else
327      cairo_set_font_size (cr, 22.0);
328    #endif
329    
330    if(cache->name) {    if(cache->name) {
331      /* draw cache name */      /* draw cache name */
# Line 478  void map(appdata_t *appdata) { Line 453  void map(appdata_t *appdata) {
453    context = appdata->map.context = g_new0(map_context_t, 1);    context = appdata->map.context = g_new0(map_context_t, 1);
454    context->appdata = appdata;    context->appdata = appdata;
455    
   GtkWidget *hbox = gtk_hbox_new(FALSE, 0);  
   
456    char *path = g_strdup_printf("%s/map/", appdata->image_path);    char *path = g_strdup_printf("%s/map/", appdata->image_path);
457    const char *proxy = get_proxy_uri(appdata);    const char *proxy = get_proxy_uri(appdata);
458    
# Line 494  void map(appdata_t *appdata) { Line 467  void map(appdata_t *appdata) {
467    
468    g_free(path);    g_free(path);
469    
470      osm_gps_map_osd_classic_init(OSM_GPS_MAP(context->widget));
471    
472    char *name = NULL;    char *name = NULL;
473  #ifdef USE_MAEMO  #ifdef USE_MAEMO
474    if(!appdata->cur_gpx) {    if(!appdata->cur_gpx) {
# Line 542  void map(appdata_t *appdata) { Line 517  void map(appdata_t *appdata) {
517    g_signal_connect(G_OBJECT(context->widget), "button-release-event",    g_signal_connect(G_OBJECT(context->widget), "button-release-event",
518                     G_CALLBACK(on_map_button_release_event), context);                     G_CALLBACK(on_map_button_release_event), context);
519    
   gtk_box_pack_start_defaults(GTK_BOX(hbox), context->widget);  
   /* zoom button box */  
   GtkWidget *vbox = gtk_vbox_new(FALSE,0);  
   
   context->zoomin =  
     map_add_button(10, G_CALLBACK(cb_map_zoomin),  
                    context, _("Zoom in"));  
   gtk_box_pack_start(GTK_BOX(vbox), context->zoomin, FALSE, FALSE, 0);  
   
   context->zoomout =  
     map_add_button(11, G_CALLBACK(cb_map_zoomout),  
                    context, _("Zoom out"));  
   gtk_box_pack_start(GTK_BOX(vbox), context->zoomout, FALSE, FALSE, 0);  
   
   context->gps =  
     map_add_button(9, G_CALLBACK(cb_map_gps),  
                    context, _("Jump to GPS position"));  
   gtk_widget_set_sensitive(context->gps, FALSE);  
   
520    /* install handler for timed updates of the gps button */    /* install handler for timed updates of the gps button */
521    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
   gtk_box_pack_start(GTK_BOX(vbox), context->gps, FALSE, FALSE, 0);  
   
   gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0);  
522    
523  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
524    /* prevent some of the main screen things */    /* prevent some of the main screen things */
# Line 576  void map(appdata_t *appdata) { Line 529  void map(appdata_t *appdata) {
529    g_signal_connect(G_OBJECT(context->window), "destroy",    g_signal_connect(G_OBJECT(context->window), "destroy",
530                     G_CALLBACK(on_window_destroy), context);                     G_CALLBACK(on_window_destroy), context);
531    
532    gtk_container_add(GTK_CONTAINER(context->window), hbox);    gtk_container_add(GTK_CONTAINER(context->window), context->widget);
533    gtk_widget_show_all(GTK_WIDGET(context->window));    gtk_widget_show_all(GTK_WIDGET(context->window));
534  }  }
Legend:
Removed from v.61  
changed lines
  Added in v.73