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

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

revision 57 by harbaum, Sun Aug 16 19:29:01 2009 UTC revision 65 by harbaum, Wed Aug 19 14:21:14 2009 UTC
# Line 18  Line 18 
18   */   */
19    
20  #include "gpxview.h"  #include "gpxview.h"
21    #include "converter.h"
22  #include <math.h>    // for isnan  #include <math.h>    // for isnan
23    
24  #ifdef ENABLE_OSM_GPS_MAP  #ifdef ENABLE_OSM_GPS_MAP
# Line 27  Line 28 
28  #define MAP_SOURCE  OSM_GPS_MAP_SOURCE_OPENSTREETMAP  #define MAP_SOURCE  OSM_GPS_MAP_SOURCE_OPENSTREETMAP
29  #define GPS_DEFAULT_ZOOM 13  #define GPS_DEFAULT_ZOOM 13
30    
 /* equatorial radius in meters */  
 #define EQ_RADIUS     (6378137.0)  
   
 #define RAD2DEG(a)  (((a)*180.0)/M_PI)  
 #define DEG2RAD(a)  (((a)*M_PI)/180.0)  
   
31  #define PROXY_KEY  "/system/http_proxy/"  #define PROXY_KEY  "/system/http_proxy/"
32    
33  static const char *get_proxy_uri(appdata_t *appdata) {  static const char *get_proxy_uri(appdata_t *appdata) {
# Line 71  static const char *get_proxy_uri(appdata Line 66  static const char *get_proxy_uri(appdata
66    return NULL;    return NULL;
67  }  }
68    
69  static void map_zoom(map_context_t *context, int step) {  /* TODO: This needs to be wired to the GPS button in osm_gps_map */
70    gint zoom;  #if 0
   OsmGpsMap *map = OSM_GPS_MAP(context->widget);  
   g_object_get(map, "zoom", &zoom, NULL);  
   zoom = osm_gps_map_set_zoom(map, zoom+step);  
   
   /* enable/disable zoom buttons as required */  
   gtk_widget_set_sensitive(context->zoomin,  
            zoom < osm_gps_map_source_get_max_zoom(MAP_SOURCE));  
   gtk_widget_set_sensitive(context->zoomout,  
            zoom > osm_gps_map_source_get_min_zoom(MAP_SOURCE));  
   
   /* hmm ... this doesn't really work */  
   osm_gps_map_osd_speed(map, zoom);  
   
   /* 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;  
 }  
   
71  static gboolean  static gboolean
72  cb_map_gps(GtkButton *button, map_context_t *context) {  cb_map_gps(GtkButton *button, map_context_t *context) {
73    pos_t *refpos = get_pos(context->appdata);    pos_t *refpos = get_pos(context->appdata);
# Line 116  cb_map_gps(GtkButton *button, map_contex Line 82  cb_map_gps(GtkButton *button, map_contex
82    
83    return FALSE;    return FALSE;
84  }  }
   
 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);  
85  #endif  #endif
   return button;  
 }  
86    
87  static int dist2pixel(map_context_t *context, float km, float lat) {  static int dist2pixel(map_context_t *context, float km, float lat) {
88    return 1000.0*km/osm_gps_map_get_scale(OSM_GPS_MAP(context->widget));    return 1000.0*km/osm_gps_map_get_scale(OSM_GPS_MAP(context->widget));
# Line 141  static gboolean map_gps_update(gpointer Line 96  static gboolean map_gps_update(gpointer
96    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);
97    
98    /* ... and enable "goto" button if it's valid */    /* ... and enable "goto" button if it's valid */
99    gtk_widget_set_sensitive(context->gps, ok);    /* TODO: gtk_widget_set_sensitive(context->gps, ok); */
100    
101    if(ok) {    if(ok) {
102      float heading = NAN;      float heading = NAN;
# Line 251  static cache_t *map_closest(map_context_ Line 206  static cache_t *map_closest(map_context_
206  /* translate between osm-gps-map positions and gpxview ones */  /* translate between osm-gps-map positions and gpxview ones */
207  pos_t coord2pos(coord_t coo) {  pos_t coord2pos(coord_t coo) {
208    pos_t pos;    pos_t pos;
209    pos.lat = RAD2DEG(coo.rlat);    pos.lat = rad2deg(coo.rlat);
210    pos.lon = RAD2DEG(coo.rlon);    pos.lon = rad2deg(coo.rlon);
211    return pos;    return pos;
212  }  }
213    
# Line 282  on_map_button_press_event(GtkWidget *wid Line 237  on_map_button_press_event(GtkWidget *wid
237    return FALSE;    return FALSE;
238  }  }
239    
240    static void
241    cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf *buf, gint x, gint y) {
242      /* convert the pixbuf into something cairo can handle */
243    
244      // Create a new ImageSurface
245      cairo_surface_t *image_surface =
246        cairo_image_surface_create(CAIRO_FORMAT_ARGB32,
247                                   gdk_pixbuf_get_width(buf),
248                                   gdk_pixbuf_get_height(buf));
249    
250      // Create the new Context for the ImageSurface
251      cairo_t *context = cairo_create(image_surface);
252    
253      // Draw the image on the new Context
254      gdk_cairo_set_source_pixbuf(context, buf, 0.0, 0.0);
255      cairo_paint(context);
256    
257      // now draw this onto the original context
258      cairo_set_source_surface(cr, image_surface, x, y);
259    
260      cairo_paint(cr);
261    }
262    
263    #ifndef BIG_BALLOONS
264    #define LINE_SKIP  7
265    #else
266    #define LINE_SKIP  12
267    #endif
268    
269    static void
270    balloon_draw_cb(cairo_t *cr, OsmGpsMapRect_t *rect, gpointer data) {
271      cache_t *cache = (cache_t*)data;
272    
273      //  printf("draw cb for \"%s\"\n", cache->name);
274    
275    #if 0
276      /* draw pink background to check clipping */
277      cairo_rectangle (cr, rect->x-20, rect->y-20, rect->w+40, rect->h+40);
278      cairo_set_source_rgba (cr, 1, 0, 0, 0.3);
279      cairo_fill_preserve (cr);
280      cairo_set_line_width (cr, 0);
281      cairo_stroke (cr);
282    #endif
283    
284      /* leave a little border top and left */
285      gint x = rect->x, y = rect->y;
286    
287      /* draw the cache type icon ... */
288      GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);
289      cairo_draw_pixbuf(cr, icon, x, y);
290    
291      /* ... and right of it the waypoint id */
292      cairo_text_extents_t extents;
293    
294      if(cache->id) {
295        cairo_select_font_face (cr, "Sans",
296                                CAIRO_FONT_SLANT_NORMAL,
297                                CAIRO_FONT_WEIGHT_BOLD);
298    
299    #ifndef BIG_BALLOONS
300        cairo_set_font_size (cr, 20.0);
301    #else
302        cairo_set_font_size (cr, 36.0);
303    #endif
304    
305        cairo_text_extents (cr, cache->id, &extents);
306    
307        /* display id right of icon vertically centered */
308        x += gdk_pixbuf_get_width(icon) + 5;
309        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
310        cairo_move_to (cr, x, y);
311        cairo_set_source_rgba (cr, 0, 0, 0, 1);
312        cairo_show_text (cr, cache->id);
313        cairo_stroke (cr);
314    
315        y += (gdk_pixbuf_get_height(icon) - extents.height)/2 + LINE_SKIP;
316      } else
317        y += gdk_pixbuf_get_height(icon);
318    
319      /* return to the left border and below icon/text */
320      x = rect->x;
321    
322      /* everything from here uses the same font */
323      cairo_select_font_face (cr, "Sans", CAIRO_FONT_SLANT_NORMAL,
324                              CAIRO_FONT_WEIGHT_NORMAL);
325    #ifndef BIG_BALLOONS
326      cairo_set_font_size (cr, 14.0);
327    #else
328      cairo_set_font_size (cr, 24.0);
329    #endif
330    
331      if(cache->name) {
332        /* draw cache name */
333        cairo_text_extents (cr, cache->name, &extents);
334        y += extents.height;
335        cairo_move_to (cr, x, y);
336        cairo_set_source_rgba (cr, 0, 0, 0, 1);
337        cairo_show_text (cr, cache->name);
338        cairo_stroke (cr);
339    
340        /* return to the left border and below text */
341        y += LINE_SKIP;
342        x = rect->x;
343      }
344    
345      if(cache->terrain) {
346        /* draw cache rating */
347        const char *terrain = "Terrain:";
348        icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));
349        cairo_text_extents (cr, _(terrain), &extents);
350        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
351    
352        /* draw "Terrain:" string */
353        cairo_move_to (cr, x, y);
354        cairo_set_source_rgba (cr, 0, 0, 0, 1);
355        cairo_show_text (cr, _(terrain));
356        cairo_stroke (cr);
357        x += extents.width + 2;
358    
359        /* draw terrain stars */
360        cairo_draw_pixbuf(cr, icon, x, y -
361                          (gdk_pixbuf_get_height(icon) + extents.height)/2);
362    
363        x += gdk_pixbuf_get_width(icon) + LINE_SKIP;
364        y -= (gdk_pixbuf_get_height(icon) + extents.height)/2;
365      }
366    
367      if(cache->difficulty) {
368        const char *difficulty = "Difficulty:";
369        cairo_text_extents (cr, _(difficulty), &extents);
370        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
371    
372        /* draw "Difficulty:" string */
373        cairo_move_to (cr, x, y);
374        cairo_set_source_rgba (cr, 0, 0, 0, 1);
375        cairo_show_text (cr, _(difficulty));
376        cairo_stroke (cr);
377        x += extents.width + 2;
378    
379        icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));
380        cairo_draw_pixbuf(cr, icon, x, y -
381                          (gdk_pixbuf_get_height(icon) + extents.height)/2);
382      }
383    }
384    
385  static gboolean  static gboolean
386  on_map_button_release_event(GtkWidget *widget,  on_map_button_release_event(GtkWidget *widget,
387                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
# Line 299  on_map_button_release_event(GtkWidget *w Line 399  on_map_button_release_event(GtkWidget *w
399        float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);        float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);
400        if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ) {        if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ) {
401    
402          osm_gps_map_draw_balloon(map, nearest->pos.lat, nearest->pos.lon);          osm_gps_map_draw_balloon(map, nearest->pos.lat, nearest->pos.lon,
403                                     balloon_draw_cb, nearest);
404        }        }
405      }      }
406      context->press_on = NULL;      context->press_on = NULL;
# Line 353  void map(appdata_t *appdata) { Line 454  void map(appdata_t *appdata) {
454    context = appdata->map.context = g_new0(map_context_t, 1);    context = appdata->map.context = g_new0(map_context_t, 1);
455    context->appdata = appdata;    context->appdata = appdata;
456    
   GtkWidget *hbox = gtk_hbox_new(FALSE, 0);  
   
457    char *path = g_strdup_printf("%s/map/", appdata->image_path);    char *path = g_strdup_printf("%s/map/", appdata->image_path);
458    const char *proxy = get_proxy_uri(appdata);    const char *proxy = get_proxy_uri(appdata);
459    
# Line 417  void map(appdata_t *appdata) { Line 516  void map(appdata_t *appdata) {
516    g_signal_connect(G_OBJECT(context->widget), "button-release-event",    g_signal_connect(G_OBJECT(context->widget), "button-release-event",
517                     G_CALLBACK(on_map_button_release_event), context);                     G_CALLBACK(on_map_button_release_event), context);
518    
519    gtk_box_pack_start_defaults(GTK_BOX(hbox), context->widget);    /* TODO: gtk_widget_set_sensitive(context->gps, FALSE); */
   /* 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    
521    /* install handler for timed updates of the gps button */    /* install handler for timed updates of the gps button */
522    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);  
523    
524  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
525    /* prevent some of the main screen things */    /* prevent some of the main screen things */
# Line 451  void map(appdata_t *appdata) { Line 530  void map(appdata_t *appdata) {
530    g_signal_connect(G_OBJECT(context->window), "destroy",    g_signal_connect(G_OBJECT(context->window), "destroy",
531                     G_CALLBACK(on_window_destroy), context);                     G_CALLBACK(on_window_destroy), context);
532    
533    gtk_container_add(GTK_CONTAINER(context->window), hbox);    gtk_container_add(GTK_CONTAINER(context->window), context->widget);
534    gtk_widget_show_all(GTK_WIDGET(context->window));    gtk_widget_show_all(GTK_WIDGET(context->window));
535  }  }
Legend:
Removed from v.57  
changed lines
  Added in v.65