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 238 by harbaum, Sat Dec 12 12:54:37 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 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  }  }
# Line 182  static void map_draw_gpx(appdata_t *appd Line 241  static void map_draw_gpx(appdata_t *appd
241  static void map_setup(map_context_t *context) {  static void map_setup(map_context_t *context) {
242    char *name = NULL;    char *name = NULL;
243    
244      int cache_num = gpx_total_caches_global(context->appdata->gpx);
245    
246      if(context->caches_displayed && (cache_num != context->cache_list_len)) {
247        //    printf("re-alloc because %p %d/%d\n", context->caches_displayed,
248        //     cache_num, context->cache_list_len);
249        g_free(context->caches_displayed);
250        context->caches_displayed = NULL;
251        context->cache_list_len = 0;
252      }
253    
254      /* allocate buffer */
255      if(cache_num && !context->caches_displayed) {
256        context->cache_list_len = cache_num;
257        context->caches_displayed = g_new0(cache_display_t, cache_num+1);
258        printf("allocated space to handle %d map icons\n", cache_num);
259      }
260    
261    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
262      if(context->state != MAP_ALL) {      if(context->state != MAP_ALL) {
263        printf("map_setup(ALL)\n");        printf("map_setup(ALL)\n");
264    
265          /* clear any pending balloon */
266          context->balloon = NULL;
267          osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
268    
269  #ifdef OSD_NAV  #ifdef OSD_NAV
270        /* no navigation in this mode */        /* no navigation in this mode */
271        osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));        osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
272  #endif  #endif
273    
274        /* clear all existing ccahe images */        /* clear all existing cache images */
275        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
276          memset(context->caches_displayed, 0,
277                 (cache_num+1) * sizeof(cache_display_t));
278    
279        /* draw all geocaches */        /* draw all geocaches and none is semi-transparent */
280        gpx_t *gpx = context->appdata->gpx;        gpx_t *gpx = context->appdata->gpx;
281        while(gpx) {        while(gpx) {
282          map_draw_gpx(context->appdata, context->widget, gpx);          map_draw_gpx(context->appdata, context->caches_displayed,
283                         context->widget, gpx, NULL, FALSE);
284          gpx = gpx->next;          gpx = gpx->next;
285        }        }
286    
287          {
288            int i=0;
289            while(context->caches_displayed[i].id) i++;
290            printf("number of caches actually displayed: %d\n", i);
291          }
292    
293        name = g_strdup(_("all"));        name = g_strdup(_("all"));
294        context->state = MAP_ALL;        context->state = MAP_ALL;
295      }      }
# Line 207  static void map_setup(map_context_t *con Line 297  static void map_setup(map_context_t *con
297      if(context->state != MAP_GPX) {      if(context->state != MAP_GPX) {
298        printf("map_setup(GPX)\n");        printf("map_setup(GPX)\n");
299    
300          /* clear any pending balloon */
301          context->balloon = NULL;
302          osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
303    
304  #ifdef OSD_NAV  #ifdef OSD_NAV
305        /* no navigation in this mode */        /* no navigation in this mode */
306        osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));        osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
307  #endif  #endif
308    
309        /* clear all existing ccahe images */        /* clear all existing cache images */
310        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
311          memset(context->caches_displayed, 0,
312                 (cache_num+1) * sizeof(cache_display_t));
313    
314          /* draw all geocaches and all other gpx files are semi-transparent */
315          map_draw_gpx(context->appdata, context->caches_displayed,
316                       context->widget, context->appdata->cur_gpx, NULL, FALSE);
317    
318          gpx_t *gpx = context->appdata->gpx;
319          while(gpx) {
320            if(gpx != context->appdata->cur_gpx)
321              map_draw_gpx(context->appdata, context->caches_displayed,
322                           context->widget, gpx, NULL, TRUE);
323    
324            gpx = gpx->next;
325          }
326    
       map_draw_gpx(context->appdata, context->widget,  
                    context->appdata->cur_gpx);  
327        name = g_strdup(context->appdata->cur_gpx->name);        name = g_strdup(context->appdata->cur_gpx->name);
328        context->state = MAP_GPX;        context->state = MAP_GPX;
329      }      }
330    } else {    } else {
331      cache_t *cache = context->appdata->cur_cache;      cache_t *cache = context->appdata->cur_cache;
332    
333      printf("map_setp(CACHE)\n");      printf("map_setup(CACHE)\n");
334    
335      /* no balloons in this mode */      /* clear any pending balloon */
336      context->balloon = NULL;      context->balloon = NULL;
337      osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));      osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
338    
339      /* clear all existing ccahe images */      /* clear all existing ccahe images */
340      osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));      osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
341        memset(context->caches_displayed, 0,
342               (cache_num+1) * sizeof(cache_display_t));
343    
344      map_draw_cache(context->widget, cache);      /* draw all geocaches and all but selected one are semi-transparent */
345        gpx_t *gpx = context->appdata->gpx;
346        while(gpx) {
347          map_draw_gpx(context->appdata, context->caches_displayed,
348                       context->widget, gpx, cache, FALSE);
349          gpx = gpx->next;
350        }
351    
352      name = g_strdup(cache->name);      name = g_strdup(cache->name);
353      context->state = MAP_CACHE;      context->state = MAP_CACHE;
354    
# Line 248  static void map_setup(map_context_t *con Line 364  static void map_setup(map_context_t *con
364  #endif  #endif
365    }    }
366    
367      /* also mark geomath position */
368    
369      /* remove all existing appearances of this icon first */
370      osm_gps_map_remove_image(OSM_GPS_MAP(context->widget),
371                               icon_get(ICON_MISC, 4));
372    
373      if(!isnan(context->appdata->geomath.lat) &&
374         !isnan(context->appdata->geomath.lon))  {
375    
376        osm_gps_map_add_image(OSM_GPS_MAP(context->widget),
377                              context->appdata->geomath.lat,
378                              context->appdata->geomath.lon,
379                              icon_get(ICON_MISC, 4));
380      }
381    
382    if(name) {    if(name) {
383      char *title = g_strdup_printf(_("Map - %s"), name);      char *title = g_strdup_printf(_("Map - %s"), name);
384      g_free(name);      g_free(name);
# Line 259  static void map_setup(map_context_t *con Line 390  static void map_setup(map_context_t *con
390      printf("map_setup(keep)\n");      printf("map_setup(keep)\n");
391  }  }
392    
 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");  
   
         /* use world map otherwise */  
         context->appdata->map.pos.lat = 0.0;  
         context->appdata->map.pos.lon = 0.0;  
         context->appdata->map.zoom = 1;  
       }  
     }  
   
     /* 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;  
   }  
   
   return FALSE;  
 }  
   
393  static void  static void
394  map_cachelist_nearest(cache_t *cache, pos_t *pos,  map_cachelist_nearest(cache_t *cache, pos_t *pos,
395                        cache_t **result, float *distance) {                        cache_t **result, float *distance) {
# Line 408  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 482  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
482                                 gdk_pixbuf_get_height(buf));                                 gdk_pixbuf_get_height(buf));
483    
484    // Create the new Context for the ImageSurface    // Create the new Context for the ImageSurface
485      g_assert(image_surface);
486    cairo_t *context = cairo_create(image_surface);    cairo_t *context = cairo_create(image_surface);
487    
488    // Draw the image on the new Context    // Draw the image on the new Context
# Line 421  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 496  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
496  }  }
497    
498  #ifndef BIG_BALLOONS  #ifndef BIG_BALLOONS
499  #define LINE_SKIP  7  #define ICON_SIZE  ICON_CACHE_TYPE
500    #else
501    #define ICON_SIZE  ICON_CACHE_TYPE_1_5X
502    #endif
503    
504    #ifndef BIG_BALLOONS
505    #define FONT_SIZE 14.0
506  #else  #else
507  #define LINE_SKIP  12  #define FONT_SIZE 22.0
508  #endif  #endif
509    #define LINE_SKIP  (FONT_SIZE/4)
510    
511    
512  static void  static void
513  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 534  balloon_cb(osm_gps_map_balloon_event_t *
534      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;
535    
536      /* draw the cache type icon ... */      /* draw the cache type icon ... */
537      GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);      GdkPixbuf *icon = icon_get(ICON_SIZE, cache->type);
538      cairo_draw_pixbuf(event->data.draw.cr, icon, x, y);      cairo_draw_pixbuf(event->data.draw.cr, icon, x, y);
539    
540      if(cache->notes && cache->notes->override) {      if(cache->notes && cache->notes->override) {
541        GdkPixbuf *over = icon_get(ICON_MISC, 1);        GdkPixbuf *over = icon_get(ICON_SIZE, 11);
542        cairo_draw_pixbuf(event->data.draw.cr, over, x, y);        cairo_draw_pixbuf(event->data.draw.cr, over, x, y);
543      }      }
544    
# Line 491  balloon_cb(osm_gps_map_balloon_event_t * Line 574  balloon_cb(osm_gps_map_balloon_event_t *
574      x = event->data.draw.rect->x;      x = event->data.draw.rect->x;
575    
576      /* everything from here uses the same font */      /* everything from here uses the same font */
577      cairo_select_font_face (event->data.draw.cr, "Sans", CAIRO_FONT_SLANT_NORMAL,      cairo_select_font_face (event->data.draw.cr, "Sans",
578                                CAIRO_FONT_SLANT_NORMAL,
579                              CAIRO_FONT_WEIGHT_NORMAL);                              CAIRO_FONT_WEIGHT_NORMAL);
580  #ifndef BIG_BALLOONS  
581      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  
582    
583      if(cache->name) {      if(cache->name) {
584        /* draw cache name */        /* draw cache name */
585        cairo_text_extents (event->data.draw.cr, cache->name, &extents);        cairo_text_extents (event->data.draw.cr, cache->name, &extents);
586        y += extents.height;        cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing);
       cairo_move_to (event->data.draw.cr, x, y);  
587        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
588        cairo_show_text (event->data.draw.cr, cache->name);        cairo_show_text (event->data.draw.cr, cache->name);
589        cairo_stroke (event->data.draw.cr);        cairo_stroke (event->data.draw.cr);
590    
591        /* return to the left border and below text */        /* return to the left border and below text */
592        y += LINE_SKIP;        y += LINE_SKIP + FONT_SIZE;
593        x = event->data.draw.rect->x;        x = event->data.draw.rect->x;
594      }      }
595    
596      if(cache->terrain) {      if(cache->terrain) {
597          int text_y = 0, icon_y = 0;
598    
599        /* draw cache rating */        /* draw cache rating */
600        const char *terrain = "Terrain:";        const char *terrain = "Terrain:";
601        icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));        icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));
602        cairo_text_extents (event->data.draw.cr, _(terrain), &extents);        cairo_text_extents (event->data.draw.cr, _(terrain), &extents);
603        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;  
604          if(gdk_pixbuf_get_height(icon) > FONT_SIZE)
605            text_y = (gdk_pixbuf_get_height(icon) - FONT_SIZE)/2;
606          else
607            icon_y = (FONT_SIZE - gdk_pixbuf_get_height(icon))/2;
608    
609        /* draw "Terrain:" string */        /* draw "Terrain:" string */
610        cairo_move_to (event->data.draw.cr, x, y);        cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing + text_y);
611        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
612        cairo_show_text (event->data.draw.cr, _(terrain));        cairo_show_text (event->data.draw.cr, _(terrain));
613        cairo_stroke (event->data.draw.cr);        cairo_stroke (event->data.draw.cr);
614        x += extents.width + 2;        x += extents.width + 2;
615    
616        /* draw terrain stars */        /* draw terrain stars */
617        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);  
618    
619        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;  
620      }      }
621    
622      if(cache->difficulty) {      if(cache->difficulty) {
623          int text_y = 0, icon_y = 0;
624    
625        const char *difficulty = "Difficulty:";        const char *difficulty = "Difficulty:";
626          icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));
627        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;  
628    
629          if(gdk_pixbuf_get_height(icon) > FONT_SIZE)
630            text_y = (gdk_pixbuf_get_height(icon) - FONT_SIZE)/2;
631          else
632            icon_y = (FONT_SIZE - gdk_pixbuf_get_height(icon))/2;
633    
634        /* draw "Difficulty:" string */        /* draw "Difficulty:" string */
635        cairo_move_to (event->data.draw.cr, x, y);        cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing + text_y);
636        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
637        cairo_show_text (event->data.draw.cr, _(difficulty));        cairo_show_text (event->data.draw.cr, _(difficulty));
638        cairo_stroke (event->data.draw.cr);        cairo_stroke (event->data.draw.cr);
639        x += extents.width + 2;        x += extents.width + 2;
640    
641        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);  
642      }      }
643    
644        /* draw container info */
645        /* TODO ... */
646    
647    
648    } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {    } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {
649      printf("click %s event at %d %d\n",      printf("click %s event at %d %d\n",
650             event->data.click.down?"down":"up",             event->data.click.down?"down":"up",
# Line 614  on_map_button_release_event(GtkWidget *w Line 708  on_map_button_release_event(GtkWidget *w
708    /* in "MAP_CACHE" state only one cache is visible */    /* in "MAP_CACHE" state only one cache is visible */
709    /* and the map is in navigation mode. the balloon is */    /* and the map is in navigation mode. the balloon is */
710    /* pretty useless there */    /* pretty useless there */
711    if(context->press_on && (context->state != MAP_CACHE)) {    if(context->press_on) {
712    
713      coord_t coo;      coord_t coo;
714      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 766  static void on_window_destroy(GtkWidget
766    gtk_timeout_remove(context->handler_id);    gtk_timeout_remove(context->handler_id);
767    gps_unregister_callback(appdata, context->cb_id);    gps_unregister_callback(appdata, context->cb_id);
768    
769      if(context->caches_displayed) {
770        g_free(context->caches_displayed);
771        context->caches_displayed = NULL;
772      }
773    
774      printf("destroy map context\n");
775    g_free(context);    g_free(context);
776    appdata->map.context = NULL;    appdata->map.context = NULL;
777  }  }
# Line 701  on_window_realize(GtkWidget *widget, gpo Line 801  on_window_realize(GtkWidget *widget, gpo
801    
802  static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event,  static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event,
803                           gpointer data) {                           gpointer data) {
804      map_context_t *context = (map_context_t*)data;
805    
806    printf("map got focus\n");    printf("map got focus\n");
807    map_setup((map_context_t*)data);  
808    #ifdef USE_MAEMO
809      /* re-enable refresh of map */
810      if(!context->handler_id)
811        context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
812    #endif
813    
814      map_setup(context);
815    return FALSE;    return FALSE;
816  }  }
817    
818    static gboolean on_focus_out(GtkWidget *widget, GdkEventFocus *event,
819                             gpointer data) {
820      map_context_t *context = (map_context_t*)data;
821    
822      printf("map lost focus\n");
823    
824      /* save new map position */
825      gfloat lat, lon;
826      g_object_get(widget, "latitude", &lat, "longitude", &lon, NULL);
827    
828      context->appdata->map.pos.lat = lat;
829      context->appdata->map.pos.lon = lon;
830    
831    #ifdef USE_MAEMO
832      gtk_timeout_remove(context->handler_id);
833      context->handler_id = 0;
834    #endif
835    
836      return FALSE;
837    }
838    
839  void map_update(appdata_t *appdata) {  void map_update(appdata_t *appdata) {
840    printf("map_update\n");    printf("map_update\n");
841  #ifndef USE_MAEMO  #ifndef USE_MAEMO
# Line 732  void map(appdata_t *appdata) { Line 862  void map(appdata_t *appdata) {
862    }    }
863    
864    context = appdata->map.context = g_new0(map_context_t, 1);    context = appdata->map.context = g_new0(map_context_t, 1);
865      printf("allocated new context at %p\n", context);
866    
867    context->appdata = appdata;    context->appdata = appdata;
   context->map_complete = FALSE;  
868    context->state = MAP_NONE;    context->state = MAP_NONE;
869    
870    /* 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 909  void map(appdata_t *appdata) {
909    
910    osm_gps_map_osd_classic_init(OSM_GPS_MAP(context->widget));    osm_gps_map_osd_classic_init(OSM_GPS_MAP(context->widget));
911    
912      /* set default values if they are invalid */
913      if(!context->appdata->map.zoom ||
914         isnan(context->appdata->map.pos.lat) ||
915         isnan(context->appdata->map.pos.lon)) {
916        printf("no valid map position found\n");
917    
918        pos_t *refpos = get_pos(context->appdata);
919        if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
920          printf("use refpos\n");
921    
922            /* use gps position if present */
923          context->appdata->map.pos = *refpos;
924          context->appdata->map.zoom = GPS_DEFAULT_ZOOM;
925        } else {
926          printf("use zero pos\n");
927    
928          /* use world map otherwise */
929          context->appdata->map.pos.lat = 0.0;
930          context->appdata->map.pos.lon = 0.0;
931          context->appdata->map.zoom = 1;
932        }
933      }
934    
935      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
936                                context->appdata->map.pos.lat,
937                                context->appdata->map.pos.lon,
938                                context->appdata->map.zoom);
939    
940  #ifdef USE_MAEMO  #ifdef USE_MAEMO
941    /* we don't use a stackable window here on fremantle, since */    /* we don't use a stackable window here on fremantle, since */
942    /* 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 958  void map(appdata_t *appdata) {
958    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",
959                     G_CALLBACK(on_focus_in), context);                     G_CALLBACK(on_focus_in), context);
960    
961    g_signal_connect(G_OBJECT(context->widget), "configure-event",    g_signal_connect(G_OBJECT(context->widget), "focus-out-event",
962                     G_CALLBACK(on_map_configure), context);                     G_CALLBACK(on_focus_out), context);
963    
964    g_signal_connect(G_OBJECT(context->widget), "button-press-event",    g_signal_connect(G_OBJECT(context->widget), "button-press-event",
965                     G_CALLBACK(on_map_button_press_event), context);                     G_CALLBACK(on_map_button_press_event), context);
# Line 823  void map(appdata_t *appdata) { Line 982  void map(appdata_t *appdata) {
982    
983    gtk_container_add(GTK_CONTAINER(context->window), context->widget);    gtk_container_add(GTK_CONTAINER(context->window), context->widget);
984    gtk_widget_show_all(GTK_WIDGET(context->window));    gtk_widget_show_all(GTK_WIDGET(context->window));
985    
986      /* setup cache state */
987      map_setup(context);
988  }  }
Legend:
Removed from v.149  
changed lines
  Added in v.238