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

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

revision 155 by harbaum, Tue Nov 3 08:38:23 2009 UTC revision 240 by harbaum, Sat Dec 12 20:56:23 2009 UTC
# Line 24  Line 24 
24    
25  /*  /*
26   * TODO:   * TODO:
  * - draw caches only once  
  * - prefer duplicates from selected files  
27   * - make semi-transparent caches selectable   * - make semi-transparent caches selectable
28   */   */
29    
# Line 55  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 76  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 89  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 116  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 154  static gboolean map_gps_update(gpointer Line 161  static gboolean map_gps_update(gpointer
161  }  }
162    
163  static void map_draw_cache(GtkWidget *map, cache_t *cache, gboolean semi) {  static void map_draw_cache(GtkWidget *map, cache_t *cache, gboolean semi) {
164    GdkPixbuf *icon = icon_get(semi?ICON_CACHE_TYPE_SEMI:ICON_CACHE_TYPE,    int type = semi?ICON_CACHE_TYPE_SEMI:ICON_CACHE_TYPE;
165                               cache->type);  
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    
# Line 193  static void map_draw_gpx(appdata_t *appd Line 222  static void map_draw_gpx(appdata_t *appd
222        /* if nav is not given do what semi sais */        /* if nav is not given do what semi sais */
223        map_draw_cache(map, cache, nav?(cache != nav):semi);        map_draw_cache(map, cache, nav?(cache != nav):semi);
224        caches[i].id = cache->id;        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;
# Line 220  static void map_setup(map_context_t *con Line 275  static void map_setup(map_context_t *con
275      printf("allocated space to handle %d map icons\n", cache_num);      printf("allocated space to handle %d map icons\n", cache_num);
276    }    }
277    
278    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {    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          memset(context->caches_displayed, 0,
294                 (cache_num+1) * sizeof(cache_display_t));
295    
296          /* draw search results and all other gpx files are semi-transparent */
297          map_draw_gpx(context->appdata, context->caches_displayed,
298                       context->widget, context->appdata->search_results,
299                       NULL, FALSE);
300    
301          gpx_t *gpx = context->appdata->gpx;
302          while(gpx) {
303            map_draw_gpx(context->appdata, context->caches_displayed,
304                         context->widget, gpx, NULL, TRUE);
305    
306            gpx = gpx->next;
307          }
308    
309          name = g_strdup(_("Search results"));
310          context->state = MAP_SEARCH;
311        }
312      } else if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
313      if(context->state != MAP_ALL) {      if(context->state != MAP_ALL) {
314        printf("map_setup(ALL)\n");        printf("map_setup(ALL)\n");
315    
316          /* clear any pending balloon */
317          context->balloon = NULL;
318          osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
319    
320  #ifdef OSD_NAV  #ifdef OSD_NAV
321        /* no navigation in this mode */        /* no navigation in this mode */
322        osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));        osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
# Line 255  static void map_setup(map_context_t *con Line 348  static void map_setup(map_context_t *con
348      if(context->state != MAP_GPX) {      if(context->state != MAP_GPX) {
349        printf("map_setup(GPX)\n");        printf("map_setup(GPX)\n");
350    
351          /* clear any pending balloon */
352          context->balloon = NULL;
353          osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
354    
355  #ifdef OSD_NAV  #ifdef OSD_NAV
356        /* no navigation in this mode */        /* no navigation in this mode */
357        osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));        osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
358  #endif  #endif
359    
360        /* clear all existing ccahe images */        /* clear all existing cache images */
361        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
362        memset(context->caches_displayed, 0,        memset(context->caches_displayed, 0,
363               (cache_num+1) * sizeof(cache_display_t));               (cache_num+1) * sizeof(cache_display_t));
# Line 286  static void map_setup(map_context_t *con Line 383  static void map_setup(map_context_t *con
383    
384      printf("map_setup(CACHE)\n");      printf("map_setup(CACHE)\n");
385    
386      /* no balloons in this mode */      /* clear any pending balloon */
387      context->balloon = NULL;      context->balloon = NULL;
388      osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));      osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
389    
# Line 294  static void map_setup(map_context_t *con Line 391  static void map_setup(map_context_t *con
391      osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));      osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
392      memset(context->caches_displayed, 0,      memset(context->caches_displayed, 0,
393             (cache_num+1) * sizeof(cache_display_t));             (cache_num+1) * sizeof(cache_display_t));
394    
395        /* Make sure we really work on the first copy in the list as */
396        /* only this is being used if duplicates exist */
397        cache = cache_search_first(context->appdata->gpx, cache);
398    
399      /* draw all geocaches and all but selected one are semi-transparent */      /* draw all geocaches and all but selected one are semi-transparent */
400      gpx_t *gpx = context->appdata->gpx;      gpx_t *gpx = context->appdata->gpx;
# Line 318  static void map_setup(map_context_t *con Line 419  static void map_setup(map_context_t *con
419  #endif  #endif
420    }    }
421    
422      /* also mark geomath position */
423    
424      /* remove all existing appearances of this icon first */
425      osm_gps_map_remove_image(OSM_GPS_MAP(context->widget),
426                               icon_get(ICON_MISC, 4));
427    
428      if(!isnan(context->appdata->geomath.lat) &&
429         !isnan(context->appdata->geomath.lon))  {
430    
431        osm_gps_map_add_image(OSM_GPS_MAP(context->widget),
432                              context->appdata->geomath.lat,
433                              context->appdata->geomath.lon,
434                              icon_get(ICON_MISC, 4));
435      }
436    
437    if(name) {    if(name) {
438      char *title = g_strdup_printf(_("Map - %s"), name);      char *title = g_strdup_printf(_("Map - %s"), name);
439      g_free(name);      g_free(name);
# Line 329  static void map_setup(map_context_t *con Line 445  static void map_setup(map_context_t *con
445      printf("map_setup(keep)\n");      printf("map_setup(keep)\n");
446  }  }
447    
 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;  
 }  
   
448  static void  static void
449  map_cachelist_nearest(cache_t *cache, pos_t *pos,  map_cachelist_nearest(cache_t *cache, pos_t *pos,
450                        cache_t **result, float *distance) {                        cache_t **result, float *distance) {
# Line 409  map_cachelist_nearest(cache_t *cache, po Line 468  map_cachelist_nearest(cache_t *cache, po
468  static cache_t *map_closest(map_context_t *context, pos_t *pos) {  static cache_t *map_closest(map_context_t *context, pos_t *pos) {
469    cache_t *result = NULL;    cache_t *result = NULL;
470    float distance = NAN;    float distance = NAN;
471    
472    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {    if(context->appdata->search_results && !context->appdata->cur_cache) {
473        /* search search results */
474        map_cachelist_nearest(context->appdata->search_results->cache,
475                              pos, &result, &distance);
476      } else if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
477      /* search all geocaches */      /* search all geocaches */
478      gpx_t *gpx = context->appdata->gpx;      gpx_t *gpx = context->appdata->gpx;
479      while(gpx) {      while(gpx) {
# Line 418  static cache_t *map_closest(map_context_ Line 481  static cache_t *map_closest(map_context_
481        gpx = gpx->next;        gpx = gpx->next;
482      }      }
483    } else if(context->appdata->cur_gpx) {    } else if(context->appdata->cur_gpx) {
484        /* search in current gpx file */
485      map_cachelist_nearest(context->appdata->cur_gpx->cache,      map_cachelist_nearest(context->appdata->cur_gpx->cache,
486                            pos, &result, &distance);                            pos, &result, &distance);
487    } else    } else
488      result = context->appdata->cur_gpx->cache;      result = context->appdata->cur_cache;
489    
490      /* make sure this is the first hit */
491      result = cache_search_first(context->appdata->gpx, result);
492    
493    return result;    return result;
494  }  }
# Line 492  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 559  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
559  }  }
560    
561  #ifndef BIG_BALLOONS  #ifndef BIG_BALLOONS
562  #define LINE_SKIP  7  #define ICON_SIZE  ICON_CACHE_TYPE
563  #else  #else
564  #define LINE_SKIP  12  #define ICON_SIZE  ICON_CACHE_TYPE_1_5X
565  #endif  #endif
566    
567    #ifndef BIG_BALLOONS
568    #define FONT_SIZE 14.0
569    #else
570    #define FONT_SIZE 22.0
571    #endif
572    #define LINE_SKIP  (FONT_SIZE/4)
573    
574    
575  static void  static void
576  balloon_cb(osm_gps_map_balloon_event_t *event, gpointer data) {  balloon_cb(osm_gps_map_balloon_event_t *event, gpointer data) {
577    printf("balloon event: ");    printf("balloon event: ");
# Line 522  balloon_cb(osm_gps_map_balloon_event_t * Line 597  balloon_cb(osm_gps_map_balloon_event_t *
597      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;
598    
599      /* draw the cache type icon ... */      /* draw the cache type icon ... */
600      GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);      GdkPixbuf *icon = icon_get(ICON_SIZE, cache->type);
601      cairo_draw_pixbuf(event->data.draw.cr, icon, x, y);      cairo_draw_pixbuf(event->data.draw.cr, icon, x, y);
602    
603      if(cache->notes && cache->notes->override) {      if(cache->notes && cache->notes->override) {
604        GdkPixbuf *over = icon_get(ICON_MISC, 1);        GdkPixbuf *over = icon_get(ICON_SIZE, 11);
605        cairo_draw_pixbuf(event->data.draw.cr, over, x, y);        cairo_draw_pixbuf(event->data.draw.cr, over, x, y);
606      }      }
607    
# Line 562  balloon_cb(osm_gps_map_balloon_event_t * Line 637  balloon_cb(osm_gps_map_balloon_event_t *
637      x = event->data.draw.rect->x;      x = event->data.draw.rect->x;
638    
639      /* everything from here uses the same font */      /* everything from here uses the same font */
640      cairo_select_font_face (event->data.draw.cr, "Sans", CAIRO_FONT_SLANT_NORMAL,      cairo_select_font_face (event->data.draw.cr, "Sans",
641                                CAIRO_FONT_SLANT_NORMAL,
642                              CAIRO_FONT_WEIGHT_NORMAL);                              CAIRO_FONT_WEIGHT_NORMAL);
643  #ifndef BIG_BALLOONS  
644      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  
645    
646      if(cache->name) {      if(cache->name) {
647        /* draw cache name */        /* draw cache name */
648        cairo_text_extents (event->data.draw.cr, cache->name, &extents);        cairo_text_extents (event->data.draw.cr, cache->name, &extents);
649        y += extents.height;        cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing);
       cairo_move_to (event->data.draw.cr, x, y);  
650        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
651        cairo_show_text (event->data.draw.cr, cache->name);        cairo_show_text (event->data.draw.cr, cache->name);
652        cairo_stroke (event->data.draw.cr);        cairo_stroke (event->data.draw.cr);
653    
654        /* return to the left border and below text */        /* return to the left border and below text */
655        y += LINE_SKIP;        y += LINE_SKIP + FONT_SIZE;
656        x = event->data.draw.rect->x;        x = event->data.draw.rect->x;
657      }      }
658    
659      if(cache->terrain) {      if(cache->terrain) {
660          int text_y = 0, icon_y = 0;
661    
662        /* draw cache rating */        /* draw cache rating */
663        const char *terrain = "Terrain:";        const char *terrain = "Terrain:";
664        icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));        icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));
665        cairo_text_extents (event->data.draw.cr, _(terrain), &extents);        cairo_text_extents (event->data.draw.cr, _(terrain), &extents);
666        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;  
667          if(gdk_pixbuf_get_height(icon) > FONT_SIZE)
668            text_y = (gdk_pixbuf_get_height(icon) - FONT_SIZE)/2;
669          else
670            icon_y = (FONT_SIZE - gdk_pixbuf_get_height(icon))/2;
671    
672        /* draw "Terrain:" string */        /* draw "Terrain:" string */
673        cairo_move_to (event->data.draw.cr, x, y);        cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing + text_y);
674        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
675        cairo_show_text (event->data.draw.cr, _(terrain));        cairo_show_text (event->data.draw.cr, _(terrain));
676        cairo_stroke (event->data.draw.cr);        cairo_stroke (event->data.draw.cr);
677        x += extents.width + 2;        x += extents.width + 2;
678    
679        /* draw terrain stars */        /* draw terrain stars */
680        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);  
681    
682        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;  
683      }      }
684    
685      if(cache->difficulty) {      if(cache->difficulty) {
686          int text_y = 0, icon_y = 0;
687    
688        const char *difficulty = "Difficulty:";        const char *difficulty = "Difficulty:";
689          icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));
690        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;  
691    
692          if(gdk_pixbuf_get_height(icon) > FONT_SIZE)
693            text_y = (gdk_pixbuf_get_height(icon) - FONT_SIZE)/2;
694          else
695            icon_y = (FONT_SIZE - gdk_pixbuf_get_height(icon))/2;
696    
697        /* draw "Difficulty:" string */        /* draw "Difficulty:" string */
698        cairo_move_to (event->data.draw.cr, x, y);        cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing + text_y);
699        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
700        cairo_show_text (event->data.draw.cr, _(difficulty));        cairo_show_text (event->data.draw.cr, _(difficulty));
701        cairo_stroke (event->data.draw.cr);        cairo_stroke (event->data.draw.cr);
702        x += extents.width + 2;        x += extents.width + 2;
703    
704        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);  
705      }      }
706    
707        /* draw container info */
708        /* TODO ... */
709    
710    
711    } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {    } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {
712      printf("click %s event at %d %d\n",      printf("click %s event at %d %d\n",
713             event->data.click.down?"down":"up",             event->data.click.down?"down":"up",
# Line 685  on_map_button_release_event(GtkWidget *w Line 771  on_map_button_release_event(GtkWidget *w
771    /* in "MAP_CACHE" state only one cache is visible */    /* in "MAP_CACHE" state only one cache is visible */
772    /* and the map is in navigation mode. the balloon is */    /* and the map is in navigation mode. the balloon is */
773    /* pretty useless there */    /* pretty useless there */
774    if(context->press_on && (context->state != MAP_CACHE)) {    if(context->press_on) {
775    
776      coord_t coo;      coord_t coo;
777      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 748  static void on_window_destroy(GtkWidget Line 834  static void on_window_destroy(GtkWidget
834      context->caches_displayed = NULL;      context->caches_displayed = NULL;
835    }    }
836    
837      printf("destroy map context\n");
838    g_free(context);    g_free(context);
839    appdata->map.context = NULL;    appdata->map.context = NULL;
840  }  }
# Line 777  on_window_realize(GtkWidget *widget, gpo Line 864  on_window_realize(GtkWidget *widget, gpo
864    
865  static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event,  static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event,
866                           gpointer data) {                           gpointer data) {
867      map_context_t *context = (map_context_t*)data;
868    
869    printf("map got focus\n");    printf("map got focus\n");
870    map_setup((map_context_t*)data);  
871    #ifdef USE_MAEMO
872      /* re-enable refresh of map */
873      if(!context->handler_id)
874        context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
875    #endif
876    
877      map_setup(context);
878    return FALSE;    return FALSE;
879  }  }
880    
881    static gboolean on_focus_out(GtkWidget *widget, GdkEventFocus *event,
882                             gpointer data) {
883      map_context_t *context = (map_context_t*)data;
884    
885      printf("map lost focus\n");
886    
887      /* save new map position */
888      gfloat lat, lon;
889      g_object_get(widget, "latitude", &lat, "longitude", &lon, NULL);
890    
891      context->appdata->map.pos.lat = lat;
892      context->appdata->map.pos.lon = lon;
893    
894    #ifdef USE_MAEMO
895      gtk_timeout_remove(context->handler_id);
896      context->handler_id = 0;
897    #endif
898    
899      return FALSE;
900    }
901    
902  void map_update(appdata_t *appdata) {  void map_update(appdata_t *appdata) {
903    printf("map_update\n");    printf("map_update\n");
904  #ifndef USE_MAEMO  #ifndef USE_MAEMO
# Line 808  void map(appdata_t *appdata) { Line 925  void map(appdata_t *appdata) {
925    }    }
926    
927    context = appdata->map.context = g_new0(map_context_t, 1);    context = appdata->map.context = g_new0(map_context_t, 1);
928      printf("allocated new context at %p\n", context);
929    
930    context->appdata = appdata;    context->appdata = appdata;
   context->map_complete = FALSE;  
931    context->state = MAP_NONE;    context->state = MAP_NONE;
932    
933    /* cleanup old (pre 0.8.7) path if it exists */    /* cleanup old (pre 0.8.7) path if it exists */
# Line 854  void map(appdata_t *appdata) { Line 972  void map(appdata_t *appdata) {
972    
973    osm_gps_map_osd_classic_init(OSM_GPS_MAP(context->widget));    osm_gps_map_osd_classic_init(OSM_GPS_MAP(context->widget));
974    
975      /* set default values if they are invalid */
976      if(!context->appdata->map.zoom ||
977         isnan(context->appdata->map.pos.lat) ||
978         isnan(context->appdata->map.pos.lon)) {
979        printf("no valid map position found\n");
980    
981        pos_t *refpos = get_pos(context->appdata);
982        if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
983          printf("use refpos\n");
984    
985            /* use gps position if present */
986          context->appdata->map.pos = *refpos;
987          context->appdata->map.zoom = GPS_DEFAULT_ZOOM;
988        } else {
989          printf("use zero pos\n");
990    
991          /* use world map otherwise */
992          context->appdata->map.pos.lat = 0.0;
993          context->appdata->map.pos.lon = 0.0;
994          context->appdata->map.zoom = 1;
995        }
996      }
997    
998      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
999                                context->appdata->map.pos.lat,
1000                                context->appdata->map.pos.lon,
1001                                context->appdata->map.zoom);
1002    
1003  #ifdef USE_MAEMO  #ifdef USE_MAEMO
1004    /* we don't use a stackable window here on fremantle, since */    /* we don't use a stackable window here on fremantle, since */
1005    /* this leaves the main window independent from the map and */    /* this leaves the main window independent from the map and */
# Line 875  void map(appdata_t *appdata) { Line 1021  void map(appdata_t *appdata) {
1021    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",
1022                     G_CALLBACK(on_focus_in), context);                     G_CALLBACK(on_focus_in), context);
1023    
1024    g_signal_connect(G_OBJECT(context->widget), "configure-event",    g_signal_connect(G_OBJECT(context->widget), "focus-out-event",
1025                     G_CALLBACK(on_map_configure), context);                     G_CALLBACK(on_focus_out), context);
1026    
1027    g_signal_connect(G_OBJECT(context->widget), "button-press-event",    g_signal_connect(G_OBJECT(context->widget), "button-press-event",
1028                     G_CALLBACK(on_map_button_press_event), context);                     G_CALLBACK(on_map_button_press_event), context);
# Line 899  void map(appdata_t *appdata) { Line 1045  void map(appdata_t *appdata) {
1045    
1046    gtk_container_add(GTK_CONTAINER(context->window), context->widget);    gtk_container_add(GTK_CONTAINER(context->window), context->widget);
1047    gtk_widget_show_all(GTK_WIDGET(context->window));    gtk_widget_show_all(GTK_WIDGET(context->window));
1048    
1049      /* setup cache state */
1050      map_setup(context);
1051  }  }
Legend:
Removed from v.155  
changed lines
  Added in v.240