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

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

revision 149 by harbaum, Thu Oct 29 13:59:16 2009 UTC revision 202 by harbaum, Sat Nov 21 20:13:13 2009 UTC
# Line 22  Line 22 
22   * http://topo.geofabrik.de/trail/${z}/${x}/${y}.png   8-15   * http://topo.geofabrik.de/trail/${z}/${x}/${y}.png   8-15
23   */   */
24    
25    /*
26     * TODO:
27     * - make semi-transparent caches selectable
28     */
29    
30  #include "gpxview.h"  #include "gpxview.h"
31  #include "converter.h"  #include "converter.h"
32  #include <math.h>    // for isnan  #include <math.h>    // for isnan
# Line 48  static const char *get_proxy_uri(appdata Line 53  static const char *get_proxy_uri(appdata
53    /* use environment settings if preset */    /* use environment settings if preset */
54    const char *proxy = g_getenv("http_proxy");    const char *proxy = g_getenv("http_proxy");
55    if(proxy) {    if(proxy) {
56      printf("http_proxy: %s\n", proxy);      printf("map http proxy from env: %s\n", proxy);
57      return proxy;      return proxy;
58    }    }
59    
# Line 69  static const char *get_proxy_uri(appdata Line 74  static const char *get_proxy_uri(appdata
74    
75        snprintf(proxy_buffer, sizeof(proxy_buffer),        snprintf(proxy_buffer, sizeof(proxy_buffer),
76                 "http://%s:%u", host, port);                 "http://%s:%u", host, port);
77          printf("map http proxy from gconf: %s\n ", proxy_buffer);
78    
79        g_free(host);        g_free(host);
80      }      }
# Line 146  static gboolean map_gps_update(gpointer Line 152  static gboolean map_gps_update(gpointer
152    return TRUE;    return TRUE;
153  }  }
154    
155  static void map_draw_cache(GtkWidget *map, cache_t *cache) {  static void map_draw_cache(GtkWidget *map, cache_t *cache, gboolean semi) {
156    GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);    int type = semi?ICON_CACHE_TYPE_SEMI:ICON_CACHE_TYPE;
157    
158      GdkPixbuf *icon = icon_get(type, cache->type);
159    
160    /* check if there's also an overwritten coordinate */    /* check if there's also an overwritten coordinate */
161    if(cache->notes && cache->notes->override) {    if(cache->notes && cache->notes->override) {
162      GdkPixbuf *over = icon_get(ICON_MISC, 1);      GdkPixbuf *over = icon_get(type, 11);
163    
164      osm_gps_map_add_image(OSM_GPS_MAP(map),      osm_gps_map_add_image(OSM_GPS_MAP(map),
165            cache->notes->pos.lat, cache->notes->pos.lon, icon);            cache->notes->pos.lat, cache->notes->pos.lon, icon);
# Line 165  static void map_draw_cache(GtkWidget *ma Line 173  static void map_draw_cache(GtkWidget *ma
173    }    }
174  }  }
175    
176  static void map_draw_gpx(appdata_t *appdata, GtkWidget *map, gpx_t *gpx) {  static void map_draw_gpx(appdata_t *appdata, cache_display_t *caches,
177                             GtkWidget *map, gpx_t *gpx,
178                             cache_t *nav, gboolean semi) {
179    if(!gpx->notes_loaded) {    if(!gpx->notes_loaded) {
180      notes_load_all(appdata, gpx);      notes_load_all(appdata, gpx);
181      gpx->notes_loaded = TRUE;      gpx->notes_loaded = TRUE;
# Line 173  static void map_draw_gpx(appdata_t *appd Line 183  static void map_draw_gpx(appdata_t *appd
183    
184    cache_t *cache = gpx->cache;    cache_t *cache = gpx->cache;
185    while(cache) {    while(cache) {
186      map_draw_cache(map, cache);      /* search if we have that cache already in our list/displayed */
187        int i=0;
188        while(caches[i].id && (strcmp(caches[i].id, cache->id) != 0))
189          i++;
190    
191        if(!caches[i].id) {
192          /* if nav is given draw all other caches semitransparent. */
193          /* if nav is not given do what semi sais */
194          map_draw_cache(map, cache, nav?(cache != nav):semi);
195          caches[i].id = cache->id;
196        }
197    
198      cache = cache->next;      cache = cache->next;
199    }    }
200  }  }
# Line 182  static void map_draw_gpx(appdata_t *appd Line 203  static void map_draw_gpx(appdata_t *appd
203  static void map_setup(map_context_t *context) {  static void map_setup(map_context_t *context) {
204    char *name = NULL;    char *name = NULL;
205    
206      int cache_num = gpx_total_caches_global(context->appdata->gpx);
207    
208      if(context->caches_displayed && (cache_num != context->cache_list_len)) {
209        //    printf("re-alloc because %p %d/%d\n", context->caches_displayed,
210        //     cache_num, context->cache_list_len);
211        g_free(context->caches_displayed);
212        context->caches_displayed = NULL;
213        context->cache_list_len = 0;
214      }
215    
216      /* allocate buffer */
217      if(cache_num && !context->caches_displayed) {
218        context->cache_list_len = cache_num;
219        context->caches_displayed = g_new0(cache_display_t, cache_num+1);
220        printf("allocated space to handle %d map icons\n", cache_num);
221      }
222    
223    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
224      if(context->state != MAP_ALL) {      if(context->state != MAP_ALL) {
225        printf("map_setup(ALL)\n");        printf("map_setup(ALL)\n");
# Line 191  static void map_setup(map_context_t *con Line 229  static void map_setup(map_context_t *con
229        osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));        osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
230  #endif  #endif
231    
232        /* clear all existing ccahe images */        /* clear all existing cache images */
233        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
234          memset(context->caches_displayed, 0,
235                 (cache_num+1) * sizeof(cache_display_t));
236    
237        /* draw all geocaches */        /* draw all geocaches and none is semi-transparent */
238        gpx_t *gpx = context->appdata->gpx;        gpx_t *gpx = context->appdata->gpx;
239        while(gpx) {        while(gpx) {
240          map_draw_gpx(context->appdata, context->widget, gpx);          map_draw_gpx(context->appdata, context->caches_displayed,
241                         context->widget, gpx, NULL, FALSE);
242          gpx = gpx->next;          gpx = gpx->next;
243        }        }
244    
245          {
246            int i=0;
247            while(context->caches_displayed[i].id) i++;
248            printf("number of caches actually displayed: %d\n", i);
249          }
250    
251        name = g_strdup(_("all"));        name = g_strdup(_("all"));
252        context->state = MAP_ALL;        context->state = MAP_ALL;
253      }      }
# Line 214  static void map_setup(map_context_t *con Line 262  static void map_setup(map_context_t *con
262    
263        /* clear all existing ccahe images */        /* clear all existing ccahe images */
264        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
265          memset(context->caches_displayed, 0,
266                 (cache_num+1) * sizeof(cache_display_t));
267    
268          /* draw all geocaches and all other gpx files are semi-transparent */
269          map_draw_gpx(context->appdata, context->caches_displayed,
270                       context->widget, context->appdata->cur_gpx, NULL, FALSE);
271    
272          gpx_t *gpx = context->appdata->gpx;
273          while(gpx) {
274            if(gpx != context->appdata->cur_gpx)
275              map_draw_gpx(context->appdata, context->caches_displayed,
276                           context->widget, gpx, NULL, TRUE);
277    
278            gpx = gpx->next;
279          }
280    
       map_draw_gpx(context->appdata, context->widget,  
                    context->appdata->cur_gpx);  
281        name = g_strdup(context->appdata->cur_gpx->name);        name = g_strdup(context->appdata->cur_gpx->name);
282        context->state = MAP_GPX;        context->state = MAP_GPX;
283      }      }
284    } else {    } else {
285      cache_t *cache = context->appdata->cur_cache;      cache_t *cache = context->appdata->cur_cache;
286    
287      printf("map_setp(CACHE)\n");      printf("map_setup(CACHE)\n");
288    
289      /* no balloons in this mode */      /* no balloons in this mode */
290      context->balloon = NULL;      context->balloon = NULL;
# Line 231  static void map_setup(map_context_t *con Line 292  static void map_setup(map_context_t *con
292    
293      /* clear all existing ccahe images */      /* clear all existing ccahe images */
294      osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));      osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
295        memset(context->caches_displayed, 0,
296               (cache_num+1) * sizeof(cache_display_t));
297    
298      map_draw_cache(context->widget, cache);      /* draw all geocaches and all but selected one are semi-transparent */
299        gpx_t *gpx = context->appdata->gpx;
300        while(gpx) {
301          map_draw_gpx(context->appdata, context->caches_displayed,
302                       context->widget, gpx, cache, FALSE);
303          gpx = gpx->next;
304        }
305    
306      name = g_strdup(cache->name);      name = g_strdup(cache->name);
307      context->state = MAP_CACHE;      context->state = MAP_CACHE;
308    
# Line 408  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 478  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
478                                 gdk_pixbuf_get_height(buf));                                 gdk_pixbuf_get_height(buf));
479    
480    // Create the new Context for the ImageSurface    // Create the new Context for the ImageSurface
481      g_assert(image_surface);
482    cairo_t *context = cairo_create(image_surface);    cairo_t *context = cairo_create(image_surface);
483    
484    // Draw the image on the new Context    // Draw the image on the new Context
# Line 421  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 492  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
492  }  }
493    
494  #ifndef BIG_BALLOONS  #ifndef BIG_BALLOONS
495  #define LINE_SKIP  7  #define ICON_SIZE  ICON_CACHE_TYPE
496    #else
497    #define ICON_SIZE  ICON_CACHE_TYPE_1_5X
498    #endif
499    
500    #ifndef BIG_BALLOONS
501    #define FONT_SIZE 14.0
502  #else  #else
503  #define LINE_SKIP  12  #define FONT_SIZE 22.0
504  #endif  #endif
505    #define LINE_SKIP  (FONT_SIZE/4)
506    
507    
508  static void  static void
509  balloon_cb(osm_gps_map_balloon_event_t *event, gpointer data) {  balloon_cb(osm_gps_map_balloon_event_t *event, gpointer data) {
# Line 451  balloon_cb(osm_gps_map_balloon_event_t * Line 530  balloon_cb(osm_gps_map_balloon_event_t *
530      gint x = event->data.draw.rect->x, y = event->data.draw.rect->y;      gint x = event->data.draw.rect->x, y = event->data.draw.rect->y;
531    
532      /* draw the cache type icon ... */      /* draw the cache type icon ... */
533      GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);      GdkPixbuf *icon = icon_get(ICON_SIZE, cache->type);
534      cairo_draw_pixbuf(event->data.draw.cr, icon, x, y);      cairo_draw_pixbuf(event->data.draw.cr, icon, x, y);
535    
536      if(cache->notes && cache->notes->override) {      if(cache->notes && cache->notes->override) {
537        GdkPixbuf *over = icon_get(ICON_MISC, 1);        GdkPixbuf *over = icon_get(ICON_SIZE, 11);
538        cairo_draw_pixbuf(event->data.draw.cr, over, x, y);        cairo_draw_pixbuf(event->data.draw.cr, over, x, y);
539      }      }
540    
# Line 491  balloon_cb(osm_gps_map_balloon_event_t * Line 570  balloon_cb(osm_gps_map_balloon_event_t *
570      x = event->data.draw.rect->x;      x = event->data.draw.rect->x;
571    
572      /* everything from here uses the same font */      /* everything from here uses the same font */
573      cairo_select_font_face (event->data.draw.cr, "Sans", CAIRO_FONT_SLANT_NORMAL,      cairo_select_font_face (event->data.draw.cr, "Sans",
574                                CAIRO_FONT_SLANT_NORMAL,
575                              CAIRO_FONT_WEIGHT_NORMAL);                              CAIRO_FONT_WEIGHT_NORMAL);
576  #ifndef BIG_BALLOONS  
577      cairo_set_font_size (event->data.draw.cr, 14.0);      cairo_set_font_size (event->data.draw.cr, FONT_SIZE);
 #else  
     cairo_set_font_size (event->data.draw.cr, 22.0);  
 #endif  
578    
579      if(cache->name) {      if(cache->name) {
580        /* draw cache name */        /* draw cache name */
581        cairo_text_extents (event->data.draw.cr, cache->name, &extents);        cairo_text_extents (event->data.draw.cr, cache->name, &extents);
582        y += extents.height;        cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing);
       cairo_move_to (event->data.draw.cr, x, y);  
583        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
584        cairo_show_text (event->data.draw.cr, cache->name);        cairo_show_text (event->data.draw.cr, cache->name);
585        cairo_stroke (event->data.draw.cr);        cairo_stroke (event->data.draw.cr);
586    
587        /* return to the left border and below text */        /* return to the left border and below text */
588        y += LINE_SKIP;        y += LINE_SKIP + FONT_SIZE;
589        x = event->data.draw.rect->x;        x = event->data.draw.rect->x;
590      }      }
591    
592      if(cache->terrain) {      if(cache->terrain) {
593          int text_y = 0, icon_y = 0;
594    
595        /* draw cache rating */        /* draw cache rating */
596        const char *terrain = "Terrain:";        const char *terrain = "Terrain:";
597        icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));        icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));
598        cairo_text_extents (event->data.draw.cr, _(terrain), &extents);        cairo_text_extents (event->data.draw.cr, _(terrain), &extents);
599        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;  
600          if(gdk_pixbuf_get_height(icon) > FONT_SIZE)
601            text_y = (gdk_pixbuf_get_height(icon) - FONT_SIZE)/2;
602          else
603            icon_y = (FONT_SIZE - gdk_pixbuf_get_height(icon))/2;
604    
605        /* draw "Terrain:" string */        /* draw "Terrain:" string */
606        cairo_move_to (event->data.draw.cr, x, y);        cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing + text_y);
607        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
608        cairo_show_text (event->data.draw.cr, _(terrain));        cairo_show_text (event->data.draw.cr, _(terrain));
609        cairo_stroke (event->data.draw.cr);        cairo_stroke (event->data.draw.cr);
610        x += extents.width + 2;        x += extents.width + 2;
611    
612        /* draw terrain stars */        /* draw terrain stars */
613        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y -        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y + icon_y);
                         (gdk_pixbuf_get_height(icon) + extents.height)/2);  
614    
615        x += gdk_pixbuf_get_width(icon) + LINE_SKIP;        x += gdk_pixbuf_get_width(icon) + LINE_SKIP;
     y -= (gdk_pixbuf_get_height(icon) + extents.height)/2;  
616      }      }
617    
618      if(cache->difficulty) {      if(cache->difficulty) {
619          int text_y = 0, icon_y = 0;
620    
621        const char *difficulty = "Difficulty:";        const char *difficulty = "Difficulty:";
622          icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));
623        cairo_text_extents (event->data.draw.cr, _(difficulty), &extents);        cairo_text_extents (event->data.draw.cr, _(difficulty), &extents);
       y += (gdk_pixbuf_get_height(icon) + extents.height)/2;  
624    
625          if(gdk_pixbuf_get_height(icon) > FONT_SIZE)
626            text_y = (gdk_pixbuf_get_height(icon) - FONT_SIZE)/2;
627          else
628            icon_y = (FONT_SIZE - gdk_pixbuf_get_height(icon))/2;
629    
630        /* draw "Difficulty:" string */        /* draw "Difficulty:" string */
631        cairo_move_to (event->data.draw.cr, x, y);        cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing + text_y);
632        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
633        cairo_show_text (event->data.draw.cr, _(difficulty));        cairo_show_text (event->data.draw.cr, _(difficulty));
634        cairo_stroke (event->data.draw.cr);        cairo_stroke (event->data.draw.cr);
635        x += extents.width + 2;        x += extents.width + 2;
636    
637        icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y + icon_y);
       cairo_draw_pixbuf(event->data.draw.cr, icon, x, y -  
                       (gdk_pixbuf_get_height(icon) + extents.height)/2);  
638      }      }
639    } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {    } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {
640      printf("click %s event at %d %d\n",      printf("click %s event at %d %d\n",
# Line 672  static void on_window_destroy(GtkWidget Line 757  static void on_window_destroy(GtkWidget
757    gtk_timeout_remove(context->handler_id);    gtk_timeout_remove(context->handler_id);
758    gps_unregister_callback(appdata, context->cb_id);    gps_unregister_callback(appdata, context->cb_id);
759    
760      if(context->caches_displayed) {
761        g_free(context->caches_displayed);
762        context->caches_displayed = NULL;
763      }
764    
765    g_free(context);    g_free(context);
766    appdata->map.context = NULL;    appdata->map.context = NULL;
767  }  }
# Line 701  on_window_realize(GtkWidget *widget, gpo Line 791  on_window_realize(GtkWidget *widget, gpo
791    
792  static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event,  static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event,
793                           gpointer data) {                           gpointer data) {
794      map_context_t *context = (map_context_t*)data;
795    
796    printf("map got focus\n");    printf("map got focus\n");
797    map_setup((map_context_t*)data);  
798    #ifdef USE_MAEMO
799      /* re-enable refresh of map */
800      if(!context->handler_id)
801        context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
802    #endif
803    
804      map_setup(context);
805    return FALSE;    return FALSE;
806  }  }
807    
808    #ifdef USE_MAEMO
809    static gboolean on_focus_out(GtkWidget *widget, GdkEventFocus *event,
810                             gpointer data) {
811      map_context_t *context = (map_context_t*)data;
812    
813      printf("map lost focus\n");
814      gtk_timeout_remove(context->handler_id);
815      context->handler_id = 0;
816    
817      return FALSE;
818    }
819    #endif
820    
821  void map_update(appdata_t *appdata) {  void map_update(appdata_t *appdata) {
822    printf("map_update\n");    printf("map_update\n");
823  #ifndef USE_MAEMO  #ifndef USE_MAEMO
# Line 799  void map(appdata_t *appdata) { Line 911  void map(appdata_t *appdata) {
911    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",
912                     G_CALLBACK(on_focus_in), context);                     G_CALLBACK(on_focus_in), context);
913    
914    #ifdef USE_MAEMO
915      g_signal_connect(G_OBJECT(context->widget), "focus-out-event",
916                       G_CALLBACK(on_focus_out), context);
917    #endif
918    
919    g_signal_connect(G_OBJECT(context->widget), "configure-event",    g_signal_connect(G_OBJECT(context->widget), "configure-event",
920                     G_CALLBACK(on_map_configure), context);                     G_CALLBACK(on_map_configure), context);
921    
Legend:
Removed from v.149  
changed lines
  Added in v.202