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

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

revision 58 by harbaum, Mon Aug 17 10:51:56 2009 UTC revision 73 by harbaum, Sun Aug 23 19:38:15 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
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
30  #define GPS_DEFAULT_ZOOM 13  #define GPS_DEFAULT_ZOOM 13
31    
 /* 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)  
   
32  #define PROXY_KEY  "/system/http_proxy/"  #define PROXY_KEY  "/system/http_proxy/"
33    
34  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 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        }
   /* 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;  
 }  
   
 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 141  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 193  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 251  static cache_t *map_closest(map_context_ Line 205  static cache_t *map_closest(map_context_
205  /* translate between osm-gps-map positions and gpxview ones */  /* translate between osm-gps-map positions and gpxview ones */
206  pos_t coord2pos(coord_t coo) {  pos_t coord2pos(coord_t coo) {
207    pos_t pos;    pos_t pos;
208    pos.lat = RAD2DEG(coo.rlat);    pos.lat = rad2deg(coo.rlat);
209    pos.lon = RAD2DEG(coo.rlon);    pos.lon = rad2deg(coo.rlon);
210    return pos;    return pos;
211  }  }
212    
# Line 301  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 255  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
255    
256    // now draw this onto the original context    // now draw this onto the original context
257    cairo_set_source_surface(cr, image_surface, x, y);    cairo_set_source_surface(cr, image_surface, x, y);
258    
259    cairo_paint(cr);    cairo_paint(cr);
260  }  }
261    
262    #ifndef BIG_BALLOONS
263    #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) {
270    cache_t *cache = (cache_t*)data;    cache_t *cache = (cache_t*)data;
# Line 329  balloon_draw_cb(cairo_t *cr, OsmGpsMapRe Line 290  balloon_draw_cb(cairo_t *cr, OsmGpsMapRe
290    /* ... and right of it the waypoint id */    /* ... and right of it the waypoint id */
291    cairo_text_extents_t extents;    cairo_text_extents_t extents;
292    
293    cairo_select_font_face (cr, "Sans",    if(cache->id) {
294                            CAIRO_FONT_SLANT_NORMAL,      cairo_select_font_face (cr, "Sans",
295                            CAIRO_FONT_WEIGHT_BOLD);                              CAIRO_FONT_SLANT_NORMAL,
296                                CAIRO_FONT_WEIGHT_BOLD);
297    
298    cairo_set_font_size (cr, 20.0);  #ifndef BIG_BALLOONS
299    cairo_text_extents (cr, cache->id, &extents);      cairo_set_font_size (cr, 20.0);
300    #else
301        cairo_set_font_size (cr, 36.0);
302    #endif
303    
304    /* draw right of icon vertically centered */      cairo_text_extents (cr, cache->id, &extents);
305    x += gdk_pixbuf_get_width(icon) + 5;  
306    y += (gdk_pixbuf_get_height(icon) + extents.height)/2;      /* display id right of icon vertically centered */
307        x += gdk_pixbuf_get_width(icon) + 5;
308    cairo_move_to (cr, x,y);      y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
309    printf("trying to draw %s\n", cache->id);      cairo_move_to (cr, x, y);
310    cairo_set_source_rgba (cr, 0, 0, 0, 1);      cairo_set_source_rgba (cr, 0, 0, 0, 1);
311    cairo_show_text (cr, cache->id);      cairo_show_text (cr, cache->id);
312    cairo_stroke (cr);      cairo_stroke (cr);
313    
314        y += (gdk_pixbuf_get_height(icon) - extents.height)/2 + LINE_SKIP;
315      } else
316        y += gdk_pixbuf_get_height(icon);
317    
318      /* return to the left border and below icon/text */
319      x = rect->x;
320    
321      /* everything from here uses the same font */
322      cairo_select_font_face (cr, "Sans", CAIRO_FONT_SLANT_NORMAL,
323                              CAIRO_FONT_WEIGHT_NORMAL);
324    #ifndef BIG_BALLOONS
325      cairo_set_font_size (cr, 14.0);
326    #else
327      cairo_set_font_size (cr, 22.0);
328    #endif
329    
330      if(cache->name) {
331        /* draw cache name */
332        cairo_text_extents (cr, cache->name, &extents);
333        y += extents.height;
334        cairo_move_to (cr, x, y);
335        cairo_set_source_rgba (cr, 0, 0, 0, 1);
336        cairo_show_text (cr, cache->name);
337        cairo_stroke (cr);
338    
339        /* return to the left border and below text */
340        y += LINE_SKIP;
341        x = rect->x;
342      }
343    
344      if(cache->terrain) {
345        /* draw cache rating */
346        const char *terrain = "Terrain:";
347        icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));
348        cairo_text_extents (cr, _(terrain), &extents);
349        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
350    
351        /* draw "Terrain:" string */
352        cairo_move_to (cr, x, y);
353        cairo_set_source_rgba (cr, 0, 0, 0, 1);
354        cairo_show_text (cr, _(terrain));
355        cairo_stroke (cr);
356        x += extents.width + 2;
357    
358        /* draw terrain stars */
359        cairo_draw_pixbuf(cr, icon, x, y -
360                          (gdk_pixbuf_get_height(icon) + extents.height)/2);
361    
362        x += gdk_pixbuf_get_width(icon) + LINE_SKIP;
363        y -= (gdk_pixbuf_get_height(icon) + extents.height)/2;
364      }
365    
366      if(cache->difficulty) {
367        const char *difficulty = "Difficulty:";
368        cairo_text_extents (cr, _(difficulty), &extents);
369        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
370    
371        /* draw "Difficulty:" string */
372        cairo_move_to (cr, x, y);
373        cairo_set_source_rgba (cr, 0, 0, 0, 1);
374        cairo_show_text (cr, _(difficulty));
375        cairo_stroke (cr);
376        x += extents.width + 2;
377    
378        icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));
379        cairo_draw_pixbuf(cr, icon, x, y -
380                          (gdk_pixbuf_get_height(icon) + extents.height)/2);
381      }
382  }  }
383    
384  static gboolean  static gboolean
# Line 420  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 436  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 484  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 518  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.58  
changed lines
  Added in v.73