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

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

revision 144 by harbaum, Tue Oct 27 08:38:31 2009 UTC revision 167 by harbaum, Mon Nov 9 07:50: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     * - draw caches only once
28     * - prefer duplicates from selected files
29     * - make semi-transparent caches selectable
30     */
31    
32  #include "gpxview.h"  #include "gpxview.h"
33  #include "converter.h"  #include "converter.h"
34  #include <math.h>    // for isnan  #include <math.h>    // for isnan
# Line 48  static const char *get_proxy_uri(appdata Line 55  static const char *get_proxy_uri(appdata
55    /* use environment settings if preset */    /* use environment settings if preset */
56    const char *proxy = g_getenv("http_proxy");    const char *proxy = g_getenv("http_proxy");
57    if(proxy) {    if(proxy) {
58      printf("http_proxy: %s\n", proxy);      printf("map http proxy from env: %s\n", proxy);
59      return proxy;      return proxy;
60    }    }
61    
# Line 69  static const char *get_proxy_uri(appdata Line 76  static const char *get_proxy_uri(appdata
76    
77        snprintf(proxy_buffer, sizeof(proxy_buffer),        snprintf(proxy_buffer, sizeof(proxy_buffer),
78                 "http://%s:%u", host, port);                 "http://%s:%u", host, port);
79          printf("map http proxy from gconf: %s\n ", proxy_buffer);
80    
81        g_free(host);        g_free(host);
82      }      }
# Line 109  static int dist2pixel(map_context_t *con Line 117  static int dist2pixel(map_context_t *con
117    
118  static gboolean map_gps_update(gpointer data) {  static gboolean map_gps_update(gpointer data) {
119    map_context_t *context = (map_context_t*)data;    map_context_t *context = (map_context_t*)data;
120      static gboolean goto_is_enabled = FALSE;
121    
122    /* get reference position ... */    /* get reference position ... */
123    pos_t *refpos = get_pos(context->appdata);    pos_t *refpos = get_pos(context->appdata);
124    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);
125    
126    /* ... and enable "goto" button if it's valid */    /* ... and enable "goto" button if it's valid */
127    osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),    if(ok != goto_is_enabled) {
128                   OSM_GPS_MAP_OSD_CALLBACK(ok?cb_map_gps:NULL), context);      osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),
129                    OSM_GPS_MAP_OSD_CALLBACK(ok?cb_map_gps:NULL), context);
130        goto_is_enabled = ok;
131      }
132    
133    if(ok) {    if(ok) {
134      float heading = NAN;      float heading = NAN;
# Line 131  static gboolean map_gps_update(gpointer Line 143  static gboolean map_gps_update(gpointer
143          radius = dist2pixel(context, eph/1000, refpos->lat);          radius = dist2pixel(context, eph/1000, refpos->lat);
144      }      }
145    
146        /* TODO: in order to save energy: only draw if state actually changed */
147    
148      g_object_set(context->widget, "gps-track-highlight-radius", radius, NULL);      g_object_set(context->widget, "gps-track-highlight-radius", radius, NULL);
149      osm_gps_map_draw_gps(OSM_GPS_MAP(context->widget),      osm_gps_map_draw_gps(OSM_GPS_MAP(context->widget),
150                           refpos->lat, refpos->lon, heading);                           refpos->lat, refpos->lon, heading);
# Line 140  static gboolean map_gps_update(gpointer Line 154  static gboolean map_gps_update(gpointer
154    return TRUE;    return TRUE;
155  }  }
156    
157  static void map_draw_cache(GtkWidget *map, cache_t *cache) {  static void map_draw_cache(GtkWidget *map, cache_t *cache, gboolean semi) {
158    GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);    GdkPixbuf *icon = icon_get(semi?ICON_CACHE_TYPE_SEMI:ICON_CACHE_TYPE,
159                                 cache->type);
160    
161    /* check if there's also an overwritten coordinate */    /* check if there's also an overwritten coordinate */
162    if(cache->notes && cache->notes->override) {    if(cache->notes && cache->notes->override) {
# Line 159  static void map_draw_cache(GtkWidget *ma Line 174  static void map_draw_cache(GtkWidget *ma
174    }    }
175  }  }
176    
177  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,
178                             GtkWidget *map, gpx_t *gpx,
179                             cache_t *nav, gboolean semi) {
180    if(!gpx->notes_loaded) {    if(!gpx->notes_loaded) {
181      notes_load_all(appdata, gpx);      notes_load_all(appdata, gpx);
182      gpx->notes_loaded = TRUE;      gpx->notes_loaded = TRUE;
# Line 167  static void map_draw_gpx(appdata_t *appd Line 184  static void map_draw_gpx(appdata_t *appd
184    
185    cache_t *cache = gpx->cache;    cache_t *cache = gpx->cache;
186    while(cache) {    while(cache) {
187      map_draw_cache(map, cache);      /* search if we have that cache already in our list/displayed */
188        int i=0;
189        while(caches[i].id && (strcmp(caches[i].id, cache->id) != 0))
190          i++;
191    
192        if(!caches[i].id) {
193          /* if nav is given draw all other caches semitransparent. */
194          /* if nav is not given do what semi sais */
195          map_draw_cache(map, cache, nav?(cache != nav):semi);
196          caches[i].id = cache->id;
197        }
198    
199      cache = cache->next;      cache = cache->next;
200    }    }
201  }  }
# Line 176  static void map_draw_gpx(appdata_t *appd Line 204  static void map_draw_gpx(appdata_t *appd
204  static void map_setup(map_context_t *context) {  static void map_setup(map_context_t *context) {
205    char *name = NULL;    char *name = NULL;
206    
207      int cache_num = gpx_total_caches_global(context->appdata->gpx);
208    
209      if(context->caches_displayed && (cache_num != context->cache_list_len)) {
210        //    printf("re-alloc because %p %d/%d\n", context->caches_displayed,
211        //     cache_num, context->cache_list_len);
212        g_free(context->caches_displayed);
213        context->caches_displayed = NULL;
214        context->cache_list_len = 0;
215      }
216    
217      /* allocate buffer */
218      if(cache_num && !context->caches_displayed) {
219        context->cache_list_len = cache_num;
220        context->caches_displayed = g_new0(cache_display_t, cache_num+1);
221        printf("allocated space to handle %d map icons\n", cache_num);
222      }
223    
224    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
225      if(context->state != MAP_ALL) {      if(context->state != MAP_ALL) {
226        printf("map_setup(ALL)\n");        printf("map_setup(ALL)\n");
# Line 185  static void map_setup(map_context_t *con Line 230  static void map_setup(map_context_t *con
230        osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));        osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
231  #endif  #endif
232    
233        /* clear all existing ccahe images */        /* clear all existing cache images */
234        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
235          memset(context->caches_displayed, 0,
236                 (cache_num+1) * sizeof(cache_display_t));
237    
238        /* draw all geocaches */        /* draw all geocaches and none is semi-transparent */
239        gpx_t *gpx = context->appdata->gpx;        gpx_t *gpx = context->appdata->gpx;
240        while(gpx) {        while(gpx) {
241          map_draw_gpx(context->appdata, context->widget, gpx);          map_draw_gpx(context->appdata, context->caches_displayed,
242                         context->widget, gpx, NULL, FALSE);
243          gpx = gpx->next;          gpx = gpx->next;
244        }        }
245    
246          {
247            int i=0;
248            while(context->caches_displayed[i].id) i++;
249            printf("number of caches actually displayed: %d\n", i);
250          }
251    
252        name = g_strdup(_("all"));        name = g_strdup(_("all"));
253        context->state = MAP_ALL;        context->state = MAP_ALL;
254      }      }
# Line 208  static void map_setup(map_context_t *con Line 263  static void map_setup(map_context_t *con
263    
264        /* clear all existing ccahe images */        /* clear all existing ccahe images */
265        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
266          memset(context->caches_displayed, 0,
267                 (cache_num+1) * sizeof(cache_display_t));
268    
269          /* draw all geocaches and all other gpx files are semi-transparent */
270          map_draw_gpx(context->appdata, context->caches_displayed,
271                       context->widget, context->appdata->cur_gpx, NULL, FALSE);
272    
273          gpx_t *gpx = context->appdata->gpx;
274          while(gpx) {
275            if(gpx != context->appdata->cur_gpx)
276              map_draw_gpx(context->appdata, context->caches_displayed,
277                           context->widget, gpx, NULL, TRUE);
278    
279            gpx = gpx->next;
280          }
281    
       map_draw_gpx(context->appdata, context->widget,  
                    context->appdata->cur_gpx);  
282        name = g_strdup(context->appdata->cur_gpx->name);        name = g_strdup(context->appdata->cur_gpx->name);
283        context->state = MAP_GPX;        context->state = MAP_GPX;
284      }      }
285    } else {    } else {
286      cache_t *cache = context->appdata->cur_cache;      cache_t *cache = context->appdata->cur_cache;
287    
288      printf("map_setp(CACHE)\n");      printf("map_setup(CACHE)\n");
289    
290      /* no balloons in this mode */      /* no balloons in this mode */
291      context->balloon = NULL;      context->balloon = NULL;
# Line 225  static void map_setup(map_context_t *con Line 293  static void map_setup(map_context_t *con
293    
294      /* clear all existing ccahe images */      /* clear all existing ccahe images */
295      osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));      osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
296        memset(context->caches_displayed, 0,
297               (cache_num+1) * sizeof(cache_display_t));
298    
299      map_draw_cache(context->widget, cache);      /* draw all geocaches and all but selected one are semi-transparent */
300        gpx_t *gpx = context->appdata->gpx;
301        while(gpx) {
302          map_draw_gpx(context->appdata, context->caches_displayed,
303                       context->widget, gpx, cache, FALSE);
304          gpx = gpx->next;
305        }
306    
307      name = g_strdup(cache->name);      name = g_strdup(cache->name);
308      context->state = MAP_CACHE;      context->state = MAP_CACHE;
309    
# Line 402  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 479  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
479                                 gdk_pixbuf_get_height(buf));                                 gdk_pixbuf_get_height(buf));
480    
481    // Create the new Context for the ImageSurface    // Create the new Context for the ImageSurface
482      g_assert(image_surface);
483    cairo_t *context = cairo_create(image_surface);    cairo_t *context = cairo_create(image_surface);
484    
485    // Draw the image on the new Context    // Draw the image on the new Context
# Line 664  static void on_window_destroy(GtkWidget Line 742  static void on_window_destroy(GtkWidget
742  #endif  #endif
743    
744    gtk_timeout_remove(context->handler_id);    gtk_timeout_remove(context->handler_id);
745      gps_unregister_callback(appdata, context->cb_id);
746    
747      if(context->caches_displayed) {
748        g_free(context->caches_displayed);
749        context->caches_displayed = NULL;
750      }
751    
752    g_free(context);    g_free(context);
753    appdata->map.context = NULL;    appdata->map.context = NULL;
# Line 694  on_window_realize(GtkWidget *widget, gpo Line 778  on_window_realize(GtkWidget *widget, gpo
778    
779  static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event,  static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event,
780                           gpointer data) {                           gpointer data) {
781      map_context_t *context = (map_context_t*)data;
782    
783    printf("map got focus\n");    printf("map got focus\n");
784    map_setup((map_context_t*)data);  
785    #ifdef USE_MAEMO
786      /* re-enable refresh of map */
787      if(!context->handler_id)
788        context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
789    #endif
790    
791      map_setup(context);
792    return FALSE;    return FALSE;
793  }  }
794    
795    #ifdef USE_MAEMO
796    static gboolean on_focus_out(GtkWidget *widget, GdkEventFocus *event,
797                             gpointer data) {
798      map_context_t *context = (map_context_t*)data;
799    
800      printf("map lost focus\n");
801      gtk_timeout_remove(context->handler_id);
802      context->handler_id = 0;
803    
804      return FALSE;
805    }
806    #endif
807    
808  void map_update(appdata_t *appdata) {  void map_update(appdata_t *appdata) {
809    printf("map_update\n");    printf("map_update\n");
810  #ifndef USE_MAEMO  #ifndef USE_MAEMO
# Line 707  void map_update(appdata_t *appdata) { Line 813  void map_update(appdata_t *appdata) {
813  #endif  #endif
814  }  }
815    
816    /* callback called by the gps layer whenever gps state changes */
817    static void
818    gps_callback(struct gps_state *state, gpointer data) {
819      printf("map: gps callback\n");
820    }
821    
822  void map(appdata_t *appdata) {  void map(appdata_t *appdata) {
823    map_context_t *context = NULL;    map_context_t *context = NULL;
824    
# Line 786  void map(appdata_t *appdata) { Line 898  void map(appdata_t *appdata) {
898    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",
899                     G_CALLBACK(on_focus_in), context);                     G_CALLBACK(on_focus_in), context);
900    
901    #ifdef USE_MAEMO
902      g_signal_connect(G_OBJECT(context->widget), "focus-out-event",
903                       G_CALLBACK(on_focus_out), context);
904    #endif
905    
906    g_signal_connect(G_OBJECT(context->widget), "configure-event",    g_signal_connect(G_OBJECT(context->widget), "configure-event",
907                     G_CALLBACK(on_map_configure), context);                     G_CALLBACK(on_map_configure), context);
908    
# Line 797  void map(appdata_t *appdata) { Line 914  void map(appdata_t *appdata) {
914    
915    /* install handler for timed updates of the gps button */    /* install handler for timed updates of the gps button */
916    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
917      context->cb_id = gps_register_callback(appdata, gps_callback, context);
918    
919  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
920    /* prevent some of the main screen things */    /* prevent some of the main screen things */
Legend:
Removed from v.144  
changed lines
  Added in v.167