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

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

revision 144 by harbaum, Tue Oct 27 08:38:31 2009 UTC revision 190 by harbaum, Tue Nov 17 10:22:41 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     * - draw caches only once
28     * - prefer duplicates from selected files
29     * - make semi-transparent caches selectable
30     */
31    
32  #include "gpxview.h"  #include "gpxview.h"
33  #include "converter.h"  #include "converter.h"
34  #include <math.h>    // for isnan  #include <math.h>    // for isnan
# Line 48  static const char *get_proxy_uri(appdata Line 55  static const char *get_proxy_uri(appdata
55    /* use environment settings if preset */    /* use environment settings if preset */
56    const char *proxy = g_getenv("http_proxy");    const char *proxy = g_getenv("http_proxy");
57    if(proxy) {    if(proxy) {
58      printf("http_proxy: %s\n", proxy);      printf("map http proxy from env: %s\n", proxy);
59      return proxy;      return proxy;
60    }    }
61    
# Line 69  static const char *get_proxy_uri(appdata Line 76  static const char *get_proxy_uri(appdata
76    
77        snprintf(proxy_buffer, sizeof(proxy_buffer),        snprintf(proxy_buffer, sizeof(proxy_buffer),
78                 "http://%s:%u", host, port);                 "http://%s:%u", host, port);
79          printf("map http proxy from gconf: %s\n ", proxy_buffer);
80    
81        g_free(host);        g_free(host);
82      }      }
# Line 109  static int dist2pixel(map_context_t *con Line 117  static int dist2pixel(map_context_t *con
117    
118  static gboolean map_gps_update(gpointer data) {  static gboolean map_gps_update(gpointer data) {
119    map_context_t *context = (map_context_t*)data;    map_context_t *context = (map_context_t*)data;
120      static gboolean goto_is_enabled = FALSE;
121    
122    /* get reference position ... */    /* get reference position ... */
123    pos_t *refpos = get_pos(context->appdata);    pos_t *refpos = get_pos(context->appdata);
124    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);
125    
126    /* ... and enable "goto" button if it's valid */    /* ... and enable "goto" button if it's valid */
127    osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),    if(ok != goto_is_enabled) {
128                   OSM_GPS_MAP_OSD_CALLBACK(ok?cb_map_gps:NULL), context);      osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),
129                    OSM_GPS_MAP_OSD_CALLBACK(ok?cb_map_gps:NULL), context);
130        goto_is_enabled = ok;
131      }
132    
133    if(ok) {    if(ok) {
134      float heading = NAN;      float heading = NAN;
# Line 131  static gboolean map_gps_update(gpointer Line 143  static gboolean map_gps_update(gpointer
143          radius = dist2pixel(context, eph/1000, refpos->lat);          radius = dist2pixel(context, eph/1000, refpos->lat);
144      }      }
145    
146        /* TODO: in order to save energy: only draw if state actually changed */
147    
148      g_object_set(context->widget, "gps-track-highlight-radius", radius, NULL);      g_object_set(context->widget, "gps-track-highlight-radius", radius, NULL);
149      osm_gps_map_draw_gps(OSM_GPS_MAP(context->widget),      osm_gps_map_draw_gps(OSM_GPS_MAP(context->widget),
150                           refpos->lat, refpos->lon, heading);                           refpos->lat, refpos->lon, heading);
# Line 140  static gboolean map_gps_update(gpointer Line 154  static gboolean map_gps_update(gpointer
154    return TRUE;    return TRUE;
155  }  }
156    
157  static void map_draw_cache(GtkWidget *map, cache_t *cache) {  static void map_draw_cache(GtkWidget *map, cache_t *cache, gboolean semi) {
158    GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);    int type = semi?ICON_CACHE_TYPE_SEMI:ICON_CACHE_TYPE;
159    
160      GdkPixbuf *icon = icon_get(type, cache->type);
161    
162    /* check if there's also an overwritten coordinate */    /* check if there's also an overwritten coordinate */
163    if(cache->notes && cache->notes->override) {    if(cache->notes && cache->notes->override) {
164      GdkPixbuf *over = icon_get(ICON_MISC, 1);      GdkPixbuf *over = icon_get(type, 11);
165    
166      osm_gps_map_add_image(OSM_GPS_MAP(map),      osm_gps_map_add_image(OSM_GPS_MAP(map),
167            cache->notes->pos.lat, cache->notes->pos.lon, icon);            cache->notes->pos.lat, cache->notes->pos.lon, icon);
# Line 159  static void map_draw_cache(GtkWidget *ma Line 175  static void map_draw_cache(GtkWidget *ma
175    }    }
176  }  }
177    
178  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,
179                             GtkWidget *map, gpx_t *gpx,
180                             cache_t *nav, gboolean semi) {
181    if(!gpx->notes_loaded) {    if(!gpx->notes_loaded) {
182      notes_load_all(appdata, gpx);      notes_load_all(appdata, gpx);
183      gpx->notes_loaded = TRUE;      gpx->notes_loaded = TRUE;
# Line 167  static void map_draw_gpx(appdata_t *appd Line 185  static void map_draw_gpx(appdata_t *appd
185    
186    cache_t *cache = gpx->cache;    cache_t *cache = gpx->cache;
187    while(cache) {    while(cache) {
188      map_draw_cache(map, cache);      /* search if we have that cache already in our list/displayed */
189        int i=0;
190        while(caches[i].id && (strcmp(caches[i].id, cache->id) != 0))
191          i++;
192    
193        if(!caches[i].id) {
194          /* if nav is given draw all other caches semitransparent. */
195          /* if nav is not given do what semi sais */
196          map_draw_cache(map, cache, nav?(cache != nav):semi);
197          caches[i].id = cache->id;
198        }
199    
200      cache = cache->next;      cache = cache->next;
201    }    }
202  }  }
# Line 176  static void map_draw_gpx(appdata_t *appd Line 205  static void map_draw_gpx(appdata_t *appd
205  static void map_setup(map_context_t *context) {  static void map_setup(map_context_t *context) {
206    char *name = NULL;    char *name = NULL;
207    
208      int cache_num = gpx_total_caches_global(context->appdata->gpx);
209    
210      if(context->caches_displayed && (cache_num != context->cache_list_len)) {
211        //    printf("re-alloc because %p %d/%d\n", context->caches_displayed,
212        //     cache_num, context->cache_list_len);
213        g_free(context->caches_displayed);
214        context->caches_displayed = NULL;
215        context->cache_list_len = 0;
216      }
217    
218      /* allocate buffer */
219      if(cache_num && !context->caches_displayed) {
220        context->cache_list_len = cache_num;
221        context->caches_displayed = g_new0(cache_display_t, cache_num+1);
222        printf("allocated space to handle %d map icons\n", cache_num);
223      }
224    
225    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
226      if(context->state != MAP_ALL) {      if(context->state != MAP_ALL) {
227        printf("map_setup(ALL)\n");        printf("map_setup(ALL)\n");
# Line 185  static void map_setup(map_context_t *con Line 231  static void map_setup(map_context_t *con
231        osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));        osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
232  #endif  #endif
233    
234        /* clear all existing ccahe images */        /* clear all existing cache images */
235        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
236          memset(context->caches_displayed, 0,
237                 (cache_num+1) * sizeof(cache_display_t));
238    
239        /* draw all geocaches */        /* draw all geocaches and none is semi-transparent */
240        gpx_t *gpx = context->appdata->gpx;        gpx_t *gpx = context->appdata->gpx;
241        while(gpx) {        while(gpx) {
242          map_draw_gpx(context->appdata, context->widget, gpx);          map_draw_gpx(context->appdata, context->caches_displayed,
243                         context->widget, gpx, NULL, FALSE);
244          gpx = gpx->next;          gpx = gpx->next;
245        }        }
246    
247          {
248            int i=0;
249            while(context->caches_displayed[i].id) i++;
250            printf("number of caches actually displayed: %d\n", i);
251          }
252    
253        name = g_strdup(_("all"));        name = g_strdup(_("all"));
254        context->state = MAP_ALL;        context->state = MAP_ALL;
255      }      }
# Line 208  static void map_setup(map_context_t *con Line 264  static void map_setup(map_context_t *con
264    
265        /* clear all existing ccahe images */        /* clear all existing ccahe images */
266        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
267          memset(context->caches_displayed, 0,
268                 (cache_num+1) * sizeof(cache_display_t));
269    
270          /* draw all geocaches and all other gpx files are semi-transparent */
271          map_draw_gpx(context->appdata, context->caches_displayed,
272                       context->widget, context->appdata->cur_gpx, NULL, FALSE);
273    
274          gpx_t *gpx = context->appdata->gpx;
275          while(gpx) {
276            if(gpx != context->appdata->cur_gpx)
277              map_draw_gpx(context->appdata, context->caches_displayed,
278                           context->widget, gpx, NULL, TRUE);
279    
280            gpx = gpx->next;
281          }
282    
       map_draw_gpx(context->appdata, context->widget,  
                    context->appdata->cur_gpx);  
283        name = g_strdup(context->appdata->cur_gpx->name);        name = g_strdup(context->appdata->cur_gpx->name);
284        context->state = MAP_GPX;        context->state = MAP_GPX;
285      }      }
286    } else {    } else {
287      cache_t *cache = context->appdata->cur_cache;      cache_t *cache = context->appdata->cur_cache;
288    
289      printf("map_setp(CACHE)\n");      printf("map_setup(CACHE)\n");
290    
291      /* no balloons in this mode */      /* no balloons in this mode */
292      context->balloon = NULL;      context->balloon = NULL;
# Line 225  static void map_setup(map_context_t *con Line 294  static void map_setup(map_context_t *con
294    
295      /* clear all existing ccahe images */      /* clear all existing ccahe images */
296      osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));      osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
297        memset(context->caches_displayed, 0,
298               (cache_num+1) * sizeof(cache_display_t));
299    
300      map_draw_cache(context->widget, cache);      /* draw all geocaches and all but selected one are semi-transparent */
301        gpx_t *gpx = context->appdata->gpx;
302        while(gpx) {
303          map_draw_gpx(context->appdata, context->caches_displayed,
304                       context->widget, gpx, cache, FALSE);
305          gpx = gpx->next;
306        }
307    
308      name = g_strdup(cache->name);      name = g_strdup(cache->name);
309      context->state = MAP_CACHE;      context->state = MAP_CACHE;
310    
# Line 402  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 480  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
480                                 gdk_pixbuf_get_height(buf));                                 gdk_pixbuf_get_height(buf));
481    
482    // Create the new Context for the ImageSurface    // Create the new Context for the ImageSurface
483      g_assert(image_surface);
484    cairo_t *context = cairo_create(image_surface);    cairo_t *context = cairo_create(image_surface);
485    
486    // Draw the image on the new Context    // Draw the image on the new Context
# Line 415  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 494  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
494  }  }
495    
496  #ifndef BIG_BALLOONS  #ifndef BIG_BALLOONS
497    #define ICON_SIZE  ICON_CACHE_TYPE
498  #define LINE_SKIP  7  #define LINE_SKIP  7
499  #else  #else
500  #define LINE_SKIP  12  #define ICON_SIZE  ICON_CACHE_TYPE_1_5X
501    #define LINE_SKIP  7
502  #endif  #endif
503    
504  static void  static void
# Line 445  balloon_cb(osm_gps_map_balloon_event_t * Line 526  balloon_cb(osm_gps_map_balloon_event_t *
526      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;
527    
528      /* draw the cache type icon ... */      /* draw the cache type icon ... */
529      GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);      GdkPixbuf *icon = icon_get(ICON_SIZE, cache->type);
530      cairo_draw_pixbuf(event->data.draw.cr, icon, x, y);      cairo_draw_pixbuf(event->data.draw.cr, icon, x, y);
531    
532      if(cache->notes && cache->notes->override) {      if(cache->notes && cache->notes->override) {
533        GdkPixbuf *over = icon_get(ICON_MISC, 1);        GdkPixbuf *over = icon_get(ICON_SIZE, 11);
534        cairo_draw_pixbuf(event->data.draw.cr, over, x, y);        cairo_draw_pixbuf(event->data.draw.cr, over, x, y);
535      }      }
536    
# Line 485  balloon_cb(osm_gps_map_balloon_event_t * Line 566  balloon_cb(osm_gps_map_balloon_event_t *
566      x = event->data.draw.rect->x;      x = event->data.draw.rect->x;
567    
568      /* everything from here uses the same font */      /* everything from here uses the same font */
569      cairo_select_font_face (event->data.draw.cr, "Sans", CAIRO_FONT_SLANT_NORMAL,      cairo_select_font_face (event->data.draw.cr, "Sans",
570                                CAIRO_FONT_SLANT_NORMAL,
571                              CAIRO_FONT_WEIGHT_NORMAL);                              CAIRO_FONT_WEIGHT_NORMAL);
572    
573  #ifndef BIG_BALLOONS  #ifndef BIG_BALLOONS
574      cairo_set_font_size (event->data.draw.cr, 14.0);  #define FONT_SIZE 14.0
575  #else  #else
576      cairo_set_font_size (event->data.draw.cr, 22.0);  #define FONT_SIZE 22.0
577  #endif  #endif
578    
579        cairo_set_font_size (event->data.draw.cr, FONT_SIZE);
580    
581      if(cache->name) {      if(cache->name) {
582        /* draw cache name */        /* draw cache name */
# Line 508  balloon_cb(osm_gps_map_balloon_event_t * Line 593  balloon_cb(osm_gps_map_balloon_event_t *
593      }      }
594    
595      if(cache->terrain) {      if(cache->terrain) {
596          int text_y = 0, icon_y = 0;
597    
598        /* draw cache rating */        /* draw cache rating */
599        const char *terrain = "Terrain:";        const char *terrain = "Terrain:";
600        icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));        icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));
601        cairo_text_extents (event->data.draw.cr, _(terrain), &extents);        cairo_text_extents (event->data.draw.cr, _(terrain), &extents);
602        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;  
603          if(gdk_pixbuf_get_height(icon) > FONT_SIZE)
604            text_y = (gdk_pixbuf_get_height(icon) - FONT_SIZE)/2;
605          else
606            icon_y = (FONT_SIZE - gdk_pixbuf_get_height(icon))/2;
607    
608        /* draw "Terrain:" string */        /* draw "Terrain:" string */
609        cairo_move_to (event->data.draw.cr, x, y);        cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing + text_y);
610        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
611        cairo_show_text (event->data.draw.cr, _(terrain));        cairo_show_text (event->data.draw.cr, _(terrain));
612        cairo_stroke (event->data.draw.cr);        cairo_stroke (event->data.draw.cr);
613        x += extents.width + 2;        x += extents.width + 2;
614    
615        /* draw terrain stars */        /* draw terrain stars */
616        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);  
617    
618        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;  
619      }      }
620    
621      if(cache->difficulty) {      if(cache->difficulty) {
622          int text_y = 0, icon_y = 0;
623    
624        const char *difficulty = "Difficulty:";        const char *difficulty = "Difficulty:";
625          icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));
626        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;  
627    
628          if(gdk_pixbuf_get_height(icon) > FONT_SIZE)
629            text_y = (gdk_pixbuf_get_height(icon) - FONT_SIZE)/2;
630          else
631            icon_y = (FONT_SIZE - gdk_pixbuf_get_height(icon))/2;
632    
633        /* draw "Difficulty:" string */        /* draw "Difficulty:" string */
634        cairo_move_to (event->data.draw.cr, x, y);        cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing + text_y);
635        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
636        cairo_show_text (event->data.draw.cr, _(difficulty));        cairo_show_text (event->data.draw.cr, _(difficulty));
637        cairo_stroke (event->data.draw.cr);        cairo_stroke (event->data.draw.cr);
638        x += extents.width + 2;        x += extents.width + 2;
639    
640        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);  
641      }      }
642    } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {    } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {
643      printf("click %s event at %d %d\n",      printf("click %s event at %d %d\n",
# Line 664  static void on_window_destroy(GtkWidget Line 758  static void on_window_destroy(GtkWidget
758  #endif  #endif
759    
760    gtk_timeout_remove(context->handler_id);    gtk_timeout_remove(context->handler_id);
761      gps_unregister_callback(appdata, context->cb_id);
762    
763      if(context->caches_displayed) {
764        g_free(context->caches_displayed);
765        context->caches_displayed = NULL;
766      }
767    
768    g_free(context);    g_free(context);
769    appdata->map.context = NULL;    appdata->map.context = NULL;
# Line 694  on_window_realize(GtkWidget *widget, gpo Line 794  on_window_realize(GtkWidget *widget, gpo
794    
795  static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event,  static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event,
796                           gpointer data) {                           gpointer data) {
797      map_context_t *context = (map_context_t*)data;
798    
799    printf("map got focus\n");    printf("map got focus\n");
800    map_setup((map_context_t*)data);  
801    #ifdef USE_MAEMO
802      /* re-enable refresh of map */
803      if(!context->handler_id)
804        context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
805    #endif
806    
807      map_setup(context);
808    return FALSE;    return FALSE;
809  }  }
810    
811    #ifdef USE_MAEMO
812    static gboolean on_focus_out(GtkWidget *widget, GdkEventFocus *event,
813                             gpointer data) {
814      map_context_t *context = (map_context_t*)data;
815    
816      printf("map lost focus\n");
817      gtk_timeout_remove(context->handler_id);
818      context->handler_id = 0;
819    
820      return FALSE;
821    }
822    #endif
823    
824  void map_update(appdata_t *appdata) {  void map_update(appdata_t *appdata) {
825    printf("map_update\n");    printf("map_update\n");
826  #ifndef USE_MAEMO  #ifndef USE_MAEMO
# Line 707  void map_update(appdata_t *appdata) { Line 829  void map_update(appdata_t *appdata) {
829  #endif  #endif
830  }  }
831    
832    /* callback called by the gps layer whenever gps state changes */
833    static void
834    gps_callback(struct gps_state *state, gpointer data) {
835      printf("map: gps callback\n");
836    }
837    
838  void map(appdata_t *appdata) {  void map(appdata_t *appdata) {
839    map_context_t *context = NULL;    map_context_t *context = NULL;
840    
# Line 786  void map(appdata_t *appdata) { Line 914  void map(appdata_t *appdata) {
914    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",
915                     G_CALLBACK(on_focus_in), context);                     G_CALLBACK(on_focus_in), context);
916    
917    #ifdef USE_MAEMO
918      g_signal_connect(G_OBJECT(context->widget), "focus-out-event",
919                       G_CALLBACK(on_focus_out), context);
920    #endif
921    
922    g_signal_connect(G_OBJECT(context->widget), "configure-event",    g_signal_connect(G_OBJECT(context->widget), "configure-event",
923                     G_CALLBACK(on_map_configure), context);                     G_CALLBACK(on_map_configure), context);
924    
# Line 797  void map(appdata_t *appdata) { Line 930  void map(appdata_t *appdata) {
930    
931    /* install handler for timed updates of the gps button */    /* install handler for timed updates of the gps button */
932    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
933      context->cb_id = gps_register_callback(appdata, gps_callback, context);
934    
935  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
936    /* prevent some of the main screen things */    /* prevent some of the main screen things */
Legend:
Removed from v.144  
changed lines
  Added in v.190