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 255 by harbaum, Tue Feb 9 19:25:36 2010 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 82  static void Line 88  static void
88  cb_map_gps(osd_button_t but, map_context_t *context) {  cb_map_gps(osd_button_t but, map_context_t *context) {
89    
90    if(but == OSD_GPS) {    if(but == OSD_GPS) {
91        printf("clicked OSD_GPS %p\n", context);
92        printf("clicked OSD_GPS a %p\n", context->appdata);
93    
94      pos_t *refpos = get_pos(context->appdata);      pos_t *refpos = get_pos(context->appdata);
95      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
96        gint zoom;        gint zoom;
# Line 109  static int dist2pixel(map_context_t *con Line 118  static int dist2pixel(map_context_t *con
118    
119  static gboolean map_gps_update(gpointer data) {  static gboolean map_gps_update(gpointer data) {
120    map_context_t *context = (map_context_t*)data;    map_context_t *context = (map_context_t*)data;
121    static gboolean goto_is_enabled = FALSE;  
122    #ifdef USE_MAEMO
123      if(context->appdata->goto_disable_screensaver)
124        if(osso_display_blanking_pause(context->appdata->osso_context) != OSSO_OK)
125          fprintf(stderr, "error with display blank\n");
126    #endif
127    
128    /* get reference position ... */    /* get reference position ... */
129    pos_t *refpos = get_pos(context->appdata);    pos_t *refpos = get_pos(context->appdata);
130    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);
131    
132    /* ... and enable "goto" button if it's valid */    /* ... and enable "goto" button if it's valid */
133    if(ok != goto_is_enabled) {    if(ok != context->goto_is_enabled) {
134      osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),      osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),
135                  OSM_GPS_MAP_OSD_CALLBACK(ok?cb_map_gps:NULL), context);                  OSM_GPS_MAP_OSD_CALLBACK(ok?cb_map_gps:NULL), context);
136      goto_is_enabled = ok;      context->goto_is_enabled = ok;
137    }    }
138    
139    if(ok) {    if(ok) {
# Line 146  static gboolean map_gps_update(gpointer Line 160  static gboolean map_gps_update(gpointer
160    return TRUE;    return TRUE;
161  }  }
162    
163  static void map_draw_cache(GtkWidget *map, cache_t *cache) {  static void map_draw_cache(GtkWidget *map, cache_t *cache, gboolean semi) {
164    GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);    int type = semi?ICON_CACHE_TYPE_SEMI:ICON_CACHE_TYPE;
165    
166      GdkPixbuf *icon = icon_get(type, cache->type);
167      GdkPixbuf *over = NULL;
168    
169      if(cache->mine)                   over = icon_get(type, 14);
170      else if(cache->found)             over = icon_get(type, 12);
171      else if(cache->notes) {
172        if(cache->notes->found)         over = icon_get(type, 12);
173        else if(cache->notes->override) over = icon_get(type, 11);
174        else                            over = icon_get(type, 13);
175      }
176    
177      pos_t *pos = &cache->pos;
178    /* check if there's also an overwritten coordinate */    /* check if there's also an overwritten coordinate */
179    if(cache->notes && cache->notes->override) {    if(cache->notes && cache->notes->override)
180      GdkPixbuf *over = icon_get(ICON_MISC, 1);      pos = &cache->notes->pos;
181    
182      if(!isnan(pos->lat) && !isnan(pos->lon)) {
183      osm_gps_map_add_image(OSM_GPS_MAP(map),      osm_gps_map_add_image(OSM_GPS_MAP(map),
184            cache->notes->pos.lat, cache->notes->pos.lon, icon);                            pos->lat, pos->lon, icon);
185        if(over)
186          osm_gps_map_add_image(OSM_GPS_MAP(map),
187                                pos->lat, pos->lon, over);
188      }
189    }
190    
191      osm_gps_map_add_image(OSM_GPS_MAP(map),  static void map_draw_wpt(GtkWidget *map, cache_t *cache, wpt_t *wpt) {
192            cache->notes->pos.lat, cache->notes->pos.lon, over);    /* only draw wpts that don't equal the main point */
193    } else {    if(pos_differ(&cache->pos, &wpt->pos)) {
194      if(!isnan(cache->pos.lat) && !isnan(cache->pos.lon))      if(!isnan(wpt->pos.lat) && !isnan(wpt->pos.lon))  {
195          GdkPixbuf *icon =
196            icon_get(ICON_WPT, (wpt->sym!=WPT_SYM_UNKNOWN)?
197                     wpt->sym:WPT_SYM_REFPOINT);
198    
199        osm_gps_map_add_image(OSM_GPS_MAP(map),        osm_gps_map_add_image(OSM_GPS_MAP(map),
200                              cache->pos.lat, cache->pos.lon, icon);                              wpt->pos.lat, wpt->pos.lon, icon);
201        }
202    }    }
203  }  }
204    
205  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,
206                             GtkWidget *map, gpx_t *gpx,
207                             cache_t *nav, gboolean semi) {
208    if(!gpx->notes_loaded) {    if(!gpx->notes_loaded) {
209      notes_load_all(appdata, gpx);      notes_load_all(appdata, gpx);
210      gpx->notes_loaded = TRUE;      gpx->notes_loaded = TRUE;
# Line 173  static void map_draw_gpx(appdata_t *appd Line 212  static void map_draw_gpx(appdata_t *appd
212    
213    cache_t *cache = gpx->cache;    cache_t *cache = gpx->cache;
214    while(cache) {    while(cache) {
215      map_draw_cache(map, cache);      /* search if we have that cache already in our list/displayed */
216        int i=0;
217        while(caches[i].id && (strcmp(caches[i].id, cache->id) != 0))
218          i++;
219    
220        if(!caches[i].id) {
221          /* if nav is given draw all other caches semitransparent. */
222          /* if nav is not given do what semi sais */
223          map_draw_cache(map, cache, nav?(cache != nav):semi);
224          caches[i].id = cache->id;
225    
226          /* also draw waypoints of nav cache */
227          if(nav && cache == nav) {
228            wpt_t *wpt = cache->wpt;
229            while(wpt) {
230              map_draw_wpt(map, cache, wpt);
231              wpt = wpt->next;
232            }
233          }
234        }
235    
236      cache = cache->next;      cache = cache->next;
237    }    }
238  }  }
239    
240    static cache_t *cache_search_first(gpx_t *gpx, cache_t *cache) {
241      while(gpx) {
242        cache_t *cur = gpx->cache;
243        while(cur) {
244          /* we do a string comparision to make sure that if copies */
245          /* exist, we get the original one */
246          if(!strcmp(cache->id, cur->id))
247             return cur;
248    
249          cur = cur->next;
250        }
251        gpx = gpx->next;
252      }
253      g_assert(FALSE);
254      return NULL;
255    }
256    
257  /* draw geocaches and set window title */  /* draw geocaches and set window title */
258  static void map_setup(map_context_t *context) {  static void map_setup(map_context_t *context) {
259    char *name = NULL;    char *name = NULL;
260    
261    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {    int cache_num = gpx_total_caches_global(context->appdata->gpx);
262    
263      if(context->caches_displayed && (cache_num != context->cache_list_len)) {
264        //    printf("re-alloc because %p %d/%d\n", context->caches_displayed,
265        //     cache_num, context->cache_list_len);
266        g_free(context->caches_displayed);
267        context->caches_displayed = NULL;
268        context->cache_list_len = 0;
269      }
270    
271      /* allocate buffer */
272      if(cache_num && !context->caches_displayed) {
273        context->cache_list_len = cache_num;
274        context->caches_displayed = g_new0(cache_display_t, cache_num+1);
275        printf("allocated space to handle %d map icons\n", cache_num);
276      }
277    
278      if(context->appdata->search_results && !context->appdata->cur_cache) {
279        if(context->state != MAP_SEARCH) {
280          printf("map_setup(SEARCH)\n");
281    
282          /* clear any pending balloon */
283          context->balloon = NULL;
284          osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
285    
286    #ifdef OSD_NAV
287          /* no navigation in this mode */
288          osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
289    #endif
290    
291          /* clear all existing cache images */
292          osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
293    
294          if(context->caches_displayed) {
295            memset(context->caches_displayed, 0,
296                   (cache_num+1) * sizeof(cache_display_t));
297    
298            /* draw search results and all other gpx files are semi-transparent */
299            map_draw_gpx(context->appdata, context->caches_displayed,
300                         context->widget, context->appdata->search_results,
301                         NULL, FALSE);
302    
303            gpx_t *gpx = context->appdata->gpx;
304            while(gpx) {
305              map_draw_gpx(context->appdata, context->caches_displayed,
306                           context->widget, gpx, NULL, TRUE);
307    
308              gpx = gpx->next;
309            }
310          }
311          name = g_strdup(_("Search results"));
312          context->state = MAP_SEARCH;
313        }
314      } else if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
315      if(context->state != MAP_ALL) {      if(context->state != MAP_ALL) {
316        printf("map_setup(ALL)\n");        printf("map_setup(ALL)\n");
317    
318          /* clear any pending balloon */
319          context->balloon = NULL;
320          osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
321    
322  #ifdef OSD_NAV  #ifdef OSD_NAV
323        /* no navigation in this mode */        /* no navigation in this mode */
324        osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));        osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
325  #endif  #endif
326    
327        /* clear all existing ccahe images */        /* clear all existing cache images */
328        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
329          if(context->caches_displayed) {
330        /* draw all geocaches */          memset(context->caches_displayed, 0,
331        gpx_t *gpx = context->appdata->gpx;                 (cache_num+1) * sizeof(cache_display_t));
332        while(gpx) {  
333          map_draw_gpx(context->appdata, context->widget, gpx);          /* draw all geocaches and none is semi-transparent */
334          gpx = gpx->next;          gpx_t *gpx = context->appdata->gpx;
335            while(gpx) {
336              map_draw_gpx(context->appdata, context->caches_displayed,
337                           context->widget, gpx, NULL, FALSE);
338              gpx = gpx->next;
339            }
340    
341            {
342              int i=0;
343              while(context->caches_displayed[i].id) i++;
344              printf("number of caches actually displayed: %d\n", i);
345            }
346        }        }
347        name = g_strdup(_("all"));        name = g_strdup(_("all"));
348        context->state = MAP_ALL;        context->state = MAP_ALL;
# Line 207  static void map_setup(map_context_t *con Line 351  static void map_setup(map_context_t *con
351      if(context->state != MAP_GPX) {      if(context->state != MAP_GPX) {
352        printf("map_setup(GPX)\n");        printf("map_setup(GPX)\n");
353    
354          /* clear any pending balloon */
355          context->balloon = NULL;
356          osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
357    
358  #ifdef OSD_NAV  #ifdef OSD_NAV
359        /* no navigation in this mode */        /* no navigation in this mode */
360        osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));        osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
361  #endif  #endif
362    
363        /* clear all existing ccahe images */        /* clear all existing cache images */
364        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
365          if(context->caches_displayed) {
366            memset(context->caches_displayed, 0,
367                   (cache_num+1) * sizeof(cache_display_t));
368    
369            /* draw all geocaches and all other gpx files are semi-transparent */
370            map_draw_gpx(context->appdata, context->caches_displayed,
371                         context->widget, context->appdata->cur_gpx, NULL, FALSE);
372    
373            gpx_t *gpx = context->appdata->gpx;
374            while(gpx) {
375              if(gpx != context->appdata->cur_gpx)
376                map_draw_gpx(context->appdata, context->caches_displayed,
377                             context->widget, gpx, NULL, TRUE);
378    
379              gpx = gpx->next;
380            }
381          }
382    
       map_draw_gpx(context->appdata, context->widget,  
                    context->appdata->cur_gpx);  
383        name = g_strdup(context->appdata->cur_gpx->name);        name = g_strdup(context->appdata->cur_gpx->name);
384        context->state = MAP_GPX;        context->state = MAP_GPX;
385      }      }
386    } else {    } else {
387      cache_t *cache = context->appdata->cur_cache;      cache_t *cache = context->appdata->cur_cache;
388    
389      printf("map_setp(CACHE)\n");      printf("map_setup(CACHE)\n");
390    
391      /* no balloons in this mode */      /* clear any pending balloon */
392      context->balloon = NULL;      context->balloon = NULL;
393      osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));      osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
394    
395      /* clear all existing ccahe images */      /* clear all existing ccahe images */
396      osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));      osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
397        if(context->caches_displayed) {
398      map_draw_cache(context->widget, cache);        memset(context->caches_displayed, 0,
399                 (cache_num+1) * sizeof(cache_display_t));
400    
401          /* Make sure we really work on the first copy in the list as */
402          /* only this is being used if duplicates exist */
403          cache = cache_search_first(context->appdata->gpx, cache);
404    
405          /* draw all geocaches and all but selected one are semi-transparent */
406          gpx_t *gpx = context->appdata->gpx;
407          while(gpx) {
408            map_draw_gpx(context->appdata, context->caches_displayed,
409                         context->widget, gpx, cache, FALSE);
410            gpx = gpx->next;
411          }
412        }
413    
414      name = g_strdup(cache->name);      name = g_strdup(cache->name);
415      context->state = MAP_CACHE;      context->state = MAP_CACHE;
416    
# Line 248  static void map_setup(map_context_t *con Line 426  static void map_setup(map_context_t *con
426  #endif  #endif
427    }    }
428    
429    if(name) {    /* also mark geomath position */
     char *title = g_strdup_printf(_("Map - %s"), name);  
     g_free(name);  
430    
431      gtk_window_set_title(GTK_WINDOW(context->window), title);    /* remove all existing appearances of this icon first */
432      osm_gps_map_remove_image(OSM_GPS_MAP(context->widget),
433      g_free(title);                             icon_get(ICON_MISC, 4));
434    } else  
435      printf("map_setup(keep)\n");    if(!isnan(context->appdata->geomath.lat) &&
436  }       !isnan(context->appdata->geomath.lon))  {
   
 static gboolean on_map_configure(GtkWidget *widget,  
                                  GdkEventConfigure *event,  
                                  map_context_t *context) {  
   
   /* for some reason there's a configure event with 1/1 */  
   /* on diablo. We just ignore this! */  
   
   printf("on_map_configure %d %d\n",  
          widget->allocation.width,  
          widget->allocation.height);  
   
   if(!context->map_complete &&  
      (widget->allocation.width > 100) &&  
      (widget->allocation.height > 100)) {  
   
     /* setup cache state */  
     map_setup(context);  
   
     /* set default values if they are invalid */  
     if(!context->appdata->map.zoom ||  
        isnan(context->appdata->map.pos.lat) ||  
        isnan(context->appdata->map.pos.lon)) {  
       printf("no valid map position found\n");  
   
       pos_t *refpos = get_pos(context->appdata);  
       if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {  
         printf("use refpos\n");  
   
         /* use gps position if present */  
         context->appdata->map.pos = *refpos;  
         context->appdata->map.zoom = GPS_DEFAULT_ZOOM;  
       } else {  
         printf("use zero pos\n");  
437    
438          /* use world map otherwise */      osm_gps_map_add_image(OSM_GPS_MAP(context->widget),
439          context->appdata->map.pos.lat = 0.0;                            context->appdata->geomath.lat,
440          context->appdata->map.pos.lon = 0.0;                            context->appdata->geomath.lon,
441          context->appdata->map.zoom = 1;                            icon_get(ICON_MISC, 4));
       }  
     }  
   
     /* jump to initial position */  
     printf("osm_gps_map_set_mapcenter(%f,%f,%d)\n",  
            context->appdata->map.pos.lat,  
            context->appdata->map.pos.lon,  
            context->appdata->map.zoom);  
   
     osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),  
                               context->appdata->map.pos.lat,  
                               context->appdata->map.pos.lon,  
                               context->appdata->map.zoom);  
     context->map_complete = TRUE;  
442    }    }
443    
444    return FALSE;    if(name) {
445        gtk_window_set_title(GTK_WINDOW(context->window), name);
446        g_free(name);
447      } else
448        printf("map_setup(keep)\n");
449  }  }
450    
451  static void  static void
# Line 339  map_cachelist_nearest(cache_t *cache, po Line 471  map_cachelist_nearest(cache_t *cache, po
471  static cache_t *map_closest(map_context_t *context, pos_t *pos) {  static cache_t *map_closest(map_context_t *context, pos_t *pos) {
472    cache_t *result = NULL;    cache_t *result = NULL;
473    float distance = NAN;    float distance = NAN;
474    
475    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {    if(context->appdata->search_results && !context->appdata->cur_cache) {
476        /* search search results */
477        map_cachelist_nearest(context->appdata->search_results->cache,
478                              pos, &result, &distance);
479      } else if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
480      /* search all geocaches */      /* search all geocaches */
481      gpx_t *gpx = context->appdata->gpx;      gpx_t *gpx = context->appdata->gpx;
482      while(gpx) {      while(gpx) {
# Line 348  static cache_t *map_closest(map_context_ Line 484  static cache_t *map_closest(map_context_
484        gpx = gpx->next;        gpx = gpx->next;
485      }      }
486    } else if(context->appdata->cur_gpx) {    } else if(context->appdata->cur_gpx) {
487        /* search in current gpx file */
488      map_cachelist_nearest(context->appdata->cur_gpx->cache,      map_cachelist_nearest(context->appdata->cur_gpx->cache,
489                            pos, &result, &distance);                            pos, &result, &distance);
490    } else    } else
491      result = context->appdata->cur_gpx->cache;      result = context->appdata->cur_cache;
492    
493      /* make sure this is the first hit */
494      if(context->caches_displayed)
495        result = cache_search_first(context->appdata->gpx, result);
496    
497    return result;    return result;
498  }  }
# Line 408  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 549  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
549                                 gdk_pixbuf_get_height(buf));                                 gdk_pixbuf_get_height(buf));
550    
551    // Create the new Context for the ImageSurface    // Create the new Context for the ImageSurface
552      g_assert(image_surface);
553    cairo_t *context = cairo_create(image_surface);    cairo_t *context = cairo_create(image_surface);
554    
555    // Draw the image on the new Context    // Draw the image on the new Context
# Line 421  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 563  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
563  }  }
564    
565  #ifndef BIG_BALLOONS  #ifndef BIG_BALLOONS
566  #define LINE_SKIP  7  #define ICON_SIZE  ICON_CACHE_TYPE
567  #else  #else
568  #define LINE_SKIP  12  #define ICON_SIZE  ICON_CACHE_TYPE_1_5X
569  #endif  #endif
570    
571    #ifndef BIG_BALLOONS
572    #define FONT_SIZE 14.0
573    #else
574    #define FONT_SIZE 22.0
575    #endif
576    #define LINE_SKIP  (FONT_SIZE/4)
577    
578    
579  static void  static void
580  balloon_cb(osm_gps_map_balloon_event_t *event, gpointer data) {  balloon_cb(osm_gps_map_balloon_event_t *event, gpointer data) {
581    printf("balloon event: ");    printf("balloon event: ");
# Line 451  balloon_cb(osm_gps_map_balloon_event_t * Line 601  balloon_cb(osm_gps_map_balloon_event_t *
601      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;
602    
603      /* draw the cache type icon ... */      /* draw the cache type icon ... */
604      GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);      GdkPixbuf *icon = icon_get(ICON_SIZE, cache->type);
605      cairo_draw_pixbuf(event->data.draw.cr, icon, x, y);      cairo_draw_pixbuf(event->data.draw.cr, icon, x, y);
606    
607      if(cache->notes && cache->notes->override) {      if(cache->notes && cache->notes->override) {
608        GdkPixbuf *over = icon_get(ICON_MISC, 1);        GdkPixbuf *over = icon_get(ICON_SIZE, 11);
609        cairo_draw_pixbuf(event->data.draw.cr, over, x, y);        cairo_draw_pixbuf(event->data.draw.cr, over, x, y);
610      }      }
611    
# Line 491  balloon_cb(osm_gps_map_balloon_event_t * Line 641  balloon_cb(osm_gps_map_balloon_event_t *
641      x = event->data.draw.rect->x;      x = event->data.draw.rect->x;
642    
643      /* everything from here uses the same font */      /* everything from here uses the same font */
644      cairo_select_font_face (event->data.draw.cr, "Sans", CAIRO_FONT_SLANT_NORMAL,      cairo_select_font_face (event->data.draw.cr, "Sans",
645                                CAIRO_FONT_SLANT_NORMAL,
646                              CAIRO_FONT_WEIGHT_NORMAL);                              CAIRO_FONT_WEIGHT_NORMAL);
647  #ifndef BIG_BALLOONS  
648      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  
649    
650      if(cache->name) {      if(cache->name) {
651        /* draw cache name */        /* draw cache name */
652        cairo_text_extents (event->data.draw.cr, cache->name, &extents);        cairo_text_extents (event->data.draw.cr, cache->name, &extents);
653        y += extents.height;        cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing);
       cairo_move_to (event->data.draw.cr, x, y);  
654        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
655        cairo_show_text (event->data.draw.cr, cache->name);        cairo_show_text (event->data.draw.cr, cache->name);
656        cairo_stroke (event->data.draw.cr);        cairo_stroke (event->data.draw.cr);
657    
658        /* return to the left border and below text */        /* return to the left border and below text */
659        y += LINE_SKIP;        y += LINE_SKIP + FONT_SIZE;
660        x = event->data.draw.rect->x;        x = event->data.draw.rect->x;
661      }      }
662    
663      if(cache->terrain) {      if(cache->terrain) {
664          int text_y = 0, icon_y = 0;
665    
666        /* draw cache rating */        /* draw cache rating */
667        const char *terrain = "Terrain:";        const char *terrain = "Terrain:";
668        icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));        icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));
669        cairo_text_extents (event->data.draw.cr, _(terrain), &extents);        cairo_text_extents (event->data.draw.cr, _(terrain), &extents);
670        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;  
671          if(gdk_pixbuf_get_height(icon) > FONT_SIZE)
672            text_y = (gdk_pixbuf_get_height(icon) - FONT_SIZE)/2;
673          else
674            icon_y = (FONT_SIZE - gdk_pixbuf_get_height(icon))/2;
675    
676        /* draw "Terrain:" string */        /* draw "Terrain:" string */
677        cairo_move_to (event->data.draw.cr, x, y);        cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing + text_y);
678        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
679        cairo_show_text (event->data.draw.cr, _(terrain));        cairo_show_text (event->data.draw.cr, _(terrain));
680        cairo_stroke (event->data.draw.cr);        cairo_stroke (event->data.draw.cr);
681        x += extents.width + 2;        x += extents.width + 2;
682    
683        /* draw terrain stars */        /* draw terrain stars */
684        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);  
685    
686        x += gdk_pixbuf_get_width(icon) + LINE_SKIP;        x += gdk_pixbuf_get_width(icon) + FONT_SIZE/2;
     y -= (gdk_pixbuf_get_height(icon) + extents.height)/2;  
687      }      }
688    
689      if(cache->difficulty) {      if(cache->difficulty) {
690          int text_y = 0, icon_y = 0;
691    
692        const char *difficulty = "Difficulty:";        const char *difficulty = "Difficulty:";
693          icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));
694        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;  
695    
696          if(gdk_pixbuf_get_height(icon) > FONT_SIZE)
697            text_y = (gdk_pixbuf_get_height(icon) - FONT_SIZE)/2;
698          else
699            icon_y = (FONT_SIZE - gdk_pixbuf_get_height(icon))/2;
700    
701        /* draw "Difficulty:" string */        /* draw "Difficulty:" string */
702        cairo_move_to (event->data.draw.cr, x, y);        cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing + text_y);
703        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
704        cairo_show_text (event->data.draw.cr, _(difficulty));        cairo_show_text (event->data.draw.cr, _(difficulty));
705        cairo_stroke (event->data.draw.cr);        cairo_stroke (event->data.draw.cr);
706        x += extents.width + 2;        x += extents.width + 2;
707    
708        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);  
709      }      }
710    
711        /* draw container info */
712        /* TODO ... */
713    
714    
715    } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {    } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {
716      printf("click %s event at %d %d\n",      printf("click %s event at %d %d\n",
717             event->data.click.down?"down":"up",             event->data.click.down?"down":"up",
718             event->data.click.x, event->data.click.y);             event->data.click.x, event->data.click.y);
719    
720      /* make the main screen jump to that cache */      /* make the main screen jump to that cache */
721      if(!event->data.click.down) {      if(!event->data.click.down) {
722        if(context->appdata->cur_cache) {        if(context->appdata->cur_cache) {
723          printf("ERROR: no current cache should be visible!\n");          printf("ERROR: no current cache should be visible!\n");
724        } else {        } else {
725          gpx_t *is_in = NULL;          gpx_t *is_in = NULL;
726    
727            if(context->appdata->search_results) {
728              printf("click while in \"search results\" view\n");
729    
730          if(!context->appdata->cur_gpx) {            is_in = context->appdata->search_results;
731            } else if(!context->appdata->cur_gpx) {
732            printf("click while in \"all\" view\n");            printf("click while in \"all\" view\n");
733    
734            /* we first need to figure out which gpx file this cache */            /* we first need to figure out which gpx file this cache */
735            /* is in so we can open it first */            /* is in so we can open it first */
736            gpx_t *gpx = context->appdata->gpx;            gpx_t *gpx = context->appdata->gpx;
# Line 581  balloon_cb(osm_gps_map_balloon_event_t * Line 746  balloon_cb(osm_gps_map_balloon_event_t *
746    
747            if(is_in)            if(is_in)
748              gpxlist_goto_cachelist(context->appdata, is_in);              gpxlist_goto_cachelist(context->appdata, is_in);
749    
750          } else          } else {
751              printf("click while in \"cachelist\" view\n");
752    
753            /* the simple case: there already is an open gpx file and */            /* the simple case: there already is an open gpx file and */
754            /* we just jump into the "cache" view */            /* we just jump into the "cache" view */
755            is_in = context->appdata->cur_gpx;            is_in = context->appdata->cur_gpx;
756            }
757    
758          if(is_in) {          if(is_in) {
759            printf("selecting %s in %s\n",            printf("selecting %s in %s\n",
760                   cache->id,                   cache->id,
761                     context->appdata->search_results?
762                     context->appdata->search_results->name:
763                   context->appdata->cur_gpx->name);                   context->appdata->cur_gpx->name);
764    
765            cachelist_goto_cache(context->appdata, cache);            cachelist_goto_cache(context->appdata, cache);
766    
767            /* give focus to main screen (important for maemo) */            /* give focus to main screen (important for maemo) */
768            printf("raising main window\n");            printf("raising main window\n");
769            gtk_window_present(GTK_WINDOW(context->appdata->window));            gtk_window_present(GTK_WINDOW(context->appdata->window));
# Line 614  on_map_button_release_event(GtkWidget *w Line 784  on_map_button_release_event(GtkWidget *w
784    /* in "MAP_CACHE" state only one cache is visible */    /* in "MAP_CACHE" state only one cache is visible */
785    /* and the map is in navigation mode. the balloon is */    /* and the map is in navigation mode. the balloon is */
786    /* pretty useless there */    /* pretty useless there */
787    if(context->press_on && (context->state != MAP_CACHE)) {    if(context->press_on) {
788    
789      coord_t coo;      coord_t coo;
790      coo = osm_gps_map_get_co_ordinates(map, event->x, event->y);      coo = osm_gps_map_get_co_ordinates(map, event->x, event->y);
# Line 672  static void on_window_destroy(GtkWidget Line 842  static void on_window_destroy(GtkWidget
842    gtk_timeout_remove(context->handler_id);    gtk_timeout_remove(context->handler_id);
843    gps_unregister_callback(appdata, context->cb_id);    gps_unregister_callback(appdata, context->cb_id);
844    
845      if(context->caches_displayed) {
846        g_free(context->caches_displayed);
847        context->caches_displayed = NULL;
848      }
849    
850      printf("destroy map context\n");
851    g_free(context);    g_free(context);
852    appdata->map.context = NULL;    appdata->map.context = NULL;
853  }  }
# Line 701  on_window_realize(GtkWidget *widget, gpo Line 877  on_window_realize(GtkWidget *widget, gpo
877    
878  static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event,  static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event,
879                           gpointer data) {                           gpointer data) {
880      map_context_t *context = (map_context_t*)data;
881    
882    printf("map got focus\n");    printf("map got focus\n");
883    map_setup((map_context_t*)data);  
884    #ifdef USE_MAEMO
885      /* re-enable refresh of map */
886      if(!context->handler_id)
887        context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
888    #endif
889    
890      map_setup(context);
891    return FALSE;    return FALSE;
892  }  }
893    
894    static gboolean on_focus_out(GtkWidget *widget, GdkEventFocus *event,
895                             gpointer data) {
896      map_context_t *context = (map_context_t*)data;
897    
898      printf("map lost focus\n");
899    
900      /* save new map position */
901      gfloat lat, lon;
902      g_object_get(widget, "latitude", &lat, "longitude", &lon, NULL);
903    
904      context->appdata->map.pos.lat = lat;
905      context->appdata->map.pos.lon = lon;
906    
907    #ifdef USE_MAEMO
908      gtk_timeout_remove(context->handler_id);
909      context->handler_id = 0;
910    #endif
911    
912      return FALSE;
913    }
914    
915  void map_update(appdata_t *appdata) {  void map_update(appdata_t *appdata) {
916    printf("map_update\n");    printf("map_update\n");
917  #ifndef USE_MAEMO  #ifndef USE_MAEMO
# Line 732  void map(appdata_t *appdata) { Line 938  void map(appdata_t *appdata) {
938    }    }
939    
940    context = appdata->map.context = g_new0(map_context_t, 1);    context = appdata->map.context = g_new0(map_context_t, 1);
941      printf("allocated new context at %p\n", context);
942    
943    context->appdata = appdata;    context->appdata = appdata;
   context->map_complete = FALSE;  
944    context->state = MAP_NONE;    context->state = MAP_NONE;
945    
946    /* cleanup old (pre 0.8.7) path if it exists */    /* cleanup old (pre 0.8.7) path if it exists */
# Line 778  void map(appdata_t *appdata) { Line 985  void map(appdata_t *appdata) {
985    
986    osm_gps_map_osd_classic_init(OSM_GPS_MAP(context->widget));    osm_gps_map_osd_classic_init(OSM_GPS_MAP(context->widget));
987    
988      /* set default values if they are invalid */
989      if(!context->appdata->map.zoom ||
990         isnan(context->appdata->map.pos.lat) ||
991         isnan(context->appdata->map.pos.lon)) {
992        printf("no valid map position found\n");
993    
994        pos_t *refpos = get_pos(context->appdata);
995        if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
996          printf("use refpos\n");
997    
998            /* use gps position if present */
999          context->appdata->map.pos = *refpos;
1000          context->appdata->map.zoom = GPS_DEFAULT_ZOOM;
1001        } else {
1002          printf("use zero pos\n");
1003    
1004          /* use world map otherwise */
1005          context->appdata->map.pos.lat = 0.0;
1006          context->appdata->map.pos.lon = 0.0;
1007          context->appdata->map.zoom = 1;
1008        }
1009      }
1010    
1011      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
1012                                context->appdata->map.pos.lat,
1013                                context->appdata->map.pos.lon,
1014                                context->appdata->map.zoom);
1015    
1016  #ifdef USE_MAEMO  #ifdef USE_MAEMO
1017    /* we don't use a stackable window here on fremantle, since */    /* we don't use a stackable window here on fremantle, since */
1018    /* this leaves the main window independent from the map and */    /* this leaves the main window independent from the map and */
# Line 799  void map(appdata_t *appdata) { Line 1034  void map(appdata_t *appdata) {
1034    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",
1035                     G_CALLBACK(on_focus_in), context);                     G_CALLBACK(on_focus_in), context);
1036    
1037    g_signal_connect(G_OBJECT(context->widget), "configure-event",    g_signal_connect(G_OBJECT(context->widget), "focus-out-event",
1038                     G_CALLBACK(on_map_configure), context);                     G_CALLBACK(on_focus_out), context);
1039    
1040    g_signal_connect(G_OBJECT(context->widget), "button-press-event",    g_signal_connect(G_OBJECT(context->widget), "button-press-event",
1041                     G_CALLBACK(on_map_button_press_event), context);                     G_CALLBACK(on_map_button_press_event), context);
# Line 823  void map(appdata_t *appdata) { Line 1058  void map(appdata_t *appdata) {
1058    
1059    gtk_container_add(GTK_CONTAINER(context->window), context->widget);    gtk_container_add(GTK_CONTAINER(context->window), context->widget);
1060    gtk_widget_show_all(GTK_WIDGET(context->window));    gtk_widget_show_all(GTK_WIDGET(context->window));
1061    
1062      /* setup cache state */
1063      map_setup(context);
1064  }  }
Legend:
Removed from v.149  
changed lines
  Added in v.255