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

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

revision 53 by harbaum, Wed Aug 12 19:18:53 2009 UTC revision 56 by harbaum, Fri Aug 14 12:19:45 2009 UTC
# Line 1  Line 1 
1  /*  /*
2   * Copyright (C) 2008 Till Harbaum <till@harbaum.org>.   * Copyright (C) 2008-2009 Till Harbaum <till@harbaum.org>.
3   *   *
4   * This file is part of GPXView.   * This file is part of GPXView.
5   *   *
# Line 24  Line 24 
24  #include "osm-gps-map.h"  #include "osm-gps-map.h"
25  #endif  #endif
26    
27    #define MAP_SOURCE  OSM_GPS_MAP_SOURCE_OPENSTREETMAP
28  #define GPS_DEFAULT_ZOOM 13  #define GPS_DEFAULT_ZOOM 13
29    
30  /* equatorial radius in meters */  /* equatorial radius in meters */
# Line 32  Line 33 
33  #define RAD2DEG(a)  (((a)*180.0)/M_PI)  #define RAD2DEG(a)  (((a)*180.0)/M_PI)
34  #define DEG2RAD(a)  (((a)*M_PI)/180.0)  #define DEG2RAD(a)  (((a)*M_PI)/180.0)
35    
 typedef struct {  
   appdata_t *appdata;  
   GtkWidget *widget;  
   GtkWidget *zoomin, *zoomout, *gps;  
   gint handler_id;  
   cache_t *press_on;  
 #if MAEMO_VERSION_MAJOR == 5  
   GtkWidget *old_view;  
 #endif  
 } map_context_t;  
   
36  #define PROXY_KEY  "/system/http_proxy/"  #define PROXY_KEY  "/system/http_proxy/"
37    
38  static const char *get_proxy_uri(appdata_t *appdata) {  static const char *get_proxy_uri(appdata_t *appdata) {
# Line 88  static void map_zoom(map_context_t *cont Line 78  static void map_zoom(map_context_t *cont
78    zoom = osm_gps_map_set_zoom(map, zoom+step);    zoom = osm_gps_map_set_zoom(map, zoom+step);
79    
80    /* enable/disable zoom buttons as required */    /* enable/disable zoom buttons as required */
81    gtk_widget_set_sensitive(context->zoomin, zoom<17);    gtk_widget_set_sensitive(context->zoomin,
82    gtk_widget_set_sensitive(context->zoomout, zoom>1);             zoom < osm_gps_map_source_get_max_zoom(MAP_SOURCE));
83      gtk_widget_set_sensitive(context->zoomout,
84               zoom > osm_gps_map_source_get_min_zoom(MAP_SOURCE));
85    
86      /* hmm ... this doesn't really work */
87      osm_gps_map_osd_speed(map, zoom);
88    
89    /* save new zoom */    /* save new zoom */
90    context->appdata->map.zoom = zoom;    context->appdata->map.zoom = zoom;
# Line 134  static GtkWidget Line 129  static GtkWidget
129    return button;    return button;
130  }  }
131    
132    static int dist2pixel(map_context_t *context, float km, float lat) {
133      return 1000.0*km/osm_gps_map_get_scale(OSM_GPS_MAP(context->widget));
134    }
135    
136  static gboolean map_gps_update(gpointer data) {  static gboolean map_gps_update(gpointer data) {
137    map_context_t *context = (map_context_t*)data;    map_context_t *context = (map_context_t*)data;
138    
# Line 146  static gboolean map_gps_update(gpointer Line 145  static gboolean map_gps_update(gpointer
145    
146    if(ok) {    if(ok) {
147      float heading = NAN;      float heading = NAN;
148      int radius = 20;      int radius = 0;
149    
150      if(context->appdata->use_gps) {      if(context->appdata->use_gps) {
151        heading = gps_get_heading(context->appdata);        heading = gps_get_heading(context->appdata);
152    
153        /* get error */        /* get error */
154        float eph = gps_get_eph(context->appdata);        float eph = gps_get_eph(context->appdata);
155        if(!isnan(eph)) {        if(!isnan(eph))
156            radius = dist2pixel(context, eph/1000, refpos->lat);
         /* world at zoom 1 == 512 pixels */  
         gint zoom;  
         g_object_get(OSM_GPS_MAP(context->widget), "zoom", &zoom, NULL);  
         float m_per_pix =  
           cos(DEG2RAD(refpos->lat))*2*M_PI*EQ_RADIUS/(1<<(8+zoom));  
   
         radius = eph/m_per_pix;  
       }  
157      }      }
158    
159      g_object_set(context->widget, "gps-track-highlight-radius", radius, NULL);      g_object_set(context->widget, "gps-track-highlight-radius", radius, NULL);
# Line 222  typedef struct { Line 213  typedef struct {
213    appdata_t *appdata;    appdata_t *appdata;
214    GtkWidget *window;    GtkWidget *window;
215    GMainLoop *loop;    GMainLoop *loop;
216      cache_t *cache;
217  } popup_context_t;  } popup_context_t;
218    
219  /* draw shape */  /* draw shape */
# Line 232  typedef struct { Line 224  typedef struct {
224  #define POPUP_WIDTH  300  #define POPUP_WIDTH  300
225  #define POPUP_HEIGHT 100  #define POPUP_HEIGHT 100
226  #else  #else
227  #define POPUP_WIDTH  350  #define POPUP_WIDTH  360
228  #define POPUP_HEIGHT 120  #define POPUP_HEIGHT 120
229  #endif  #endif
230    
# Line 393  GtkWidget *gtk_label_big_left_new(char * Line 385  GtkWidget *gtk_label_big_left_new(char *
385  }  }
386  #endif  #endif
387    
388    static gboolean
389    on_cache_button_clicked(GtkButton *button, popup_context_t *context) {
390      printf("clicked %s\n", context->cache->name);
391      return FALSE;
392    }
393    
394  void cache_popup(map_context_t *mcontext, cache_t *cache) {  void cache_popup(map_context_t *mcontext, cache_t *cache) {
395    popup_context_t pcontext;    popup_context_t pcontext;
396    pcontext.appdata = mcontext->appdata;    pcontext.appdata = mcontext->appdata;
397      pcontext.cache = cache;
398    
399    pcontext.window = gtk_window_new(GTK_WINDOW_POPUP);    pcontext.window = gtk_window_new(GTK_WINDOW_POPUP);
400    gtk_widget_realize(pcontext.window);    gtk_widget_realize(pcontext.window);
# Line 461  void cache_popup(map_context_t *mcontext Line 460  void cache_popup(map_context_t *mcontext
460    
461    /* --- actual content ---- */    /* --- actual content ---- */
462    GtkWidget *vbox = gtk_vbox_new(FALSE, 0);    GtkWidget *vbox = gtk_vbox_new(FALSE, 0);
463      GtkWidget *hbox = gtk_hbox_new(FALSE, 0);
464    
465    if(cache->id) {    gtk_box_pack_start(GTK_BOX(hbox),
466      GtkWidget *ihbox = gtk_hbox_new(FALSE, 0);                       icon_get_widget(ICON_CACHE_TYPE, cache->type),
467                         FALSE, FALSE, 5);
468    
469      if(cache->id)
470        gtk_box_pack_start_defaults(GTK_BOX(hbox),
471                                    gtk_label_big_left_new(cache->id));
472    
473      gtk_box_pack_start(GTK_BOX(ihbox),  #if 0
474         icon_get_widget(ICON_CACHE_TYPE, cache->type),    GtkWidget *button = gtk_button_new();
475         FALSE, FALSE, 5);    gtk_button_set_image(GTK_BUTTON(button), icon_get_widget(ICON_MISC, 12));
476      g_signal_connect(button, "clicked",
477      gtk_box_pack_start_defaults(GTK_BOX(ihbox),                     G_CALLBACK(on_cache_button_clicked), &pcontext);
478                  gtk_label_big_left_new(cache->id));    gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
479    #endif
480    
481      gtk_box_pack_start_defaults(GTK_BOX(vbox), ihbox);    gtk_box_pack_start_defaults(GTK_BOX(vbox), hbox);
   }  
482    
483    if(cache->name) {    if(cache->name) {
484      GtkWidget *label = gtk_label_small_left_new(cache->name);      GtkWidget *label = gtk_label_small_left_new(cache->name);
# Line 481  void cache_popup(map_context_t *mcontext Line 486  void cache_popup(map_context_t *mcontext
486      gtk_box_pack_start_defaults(GTK_BOX(vbox), label);      gtk_box_pack_start_defaults(GTK_BOX(vbox), label);
487    }    }
488    
489    GtkWidget *hbox = gtk_hbox_new(FALSE, 0);    hbox = gtk_hbox_new(FALSE, 0);
490    if(cache->terrain) {    if(cache->terrain) {
491      GtkWidget *ihbox = gtk_hbox_new(FALSE, 0);      GtkWidget *ihbox = gtk_hbox_new(FALSE, 0);
492      gtk_box_pack_start(GTK_BOX(ihbox),      gtk_box_pack_start(GTK_BOX(ihbox),
# Line 576  pos_t coord2pos(coord_t coo) { Line 581  pos_t coord2pos(coord_t coo) {
581    return pos;    return pos;
582  }  }
583    
 static int dist2pixel(map_context_t *context, float km, float lat) {  
   gint zoom;  
   g_object_get(OSM_GPS_MAP(context->widget), "zoom", &zoom, NULL);  
   
   /* world at zoom 1 == 512 pixels */  
   float m_per_pix =  
     cos(DEG2RAD(lat))*2*M_PI*EQ_RADIUS/(1<<(8+zoom));  
   
   return 1000.0*km/m_per_pix;  
 }  
   
584  #define CLICK_FUZZ (24)  #define CLICK_FUZZ (24)
585    
586  static gboolean  static gboolean
# Line 640  on_map_button_release_event(GtkWidget *w Line 634  on_map_button_release_event(GtkWidget *w
634    return FALSE;    return FALSE;
635  }  }
636    
637  static void save_map_state(map_context_t *context) {  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {
638      appdata_t *appdata = context->appdata;
639    
640      printf("destroy map window\n");
641    
642    /* save map parameters */    /* save map parameters */
643    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
644    gint zoom;    gint zoom;
# Line 651  static void save_map_state(map_context_t Line 649  static void save_map_state(map_context_t
649    g_object_get(map, "latitude", &lat, "longitude", &lon, NULL);    g_object_get(map, "latitude", &lat, "longitude", &lon, NULL);
650    context->appdata->map.pos.lat = lat;    context->appdata->map.pos.lat = lat;
651    context->appdata->map.pos.lon = lon;    context->appdata->map.pos.lon = lon;
 }  
652    
653  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
 static void on_window_destroy(GtkWidget *widget, map_context_t *context) {  
   printf("destroy map view\n");  
   
   save_map_state(context);  
   
654    /* restore cur_view */    /* restore cur_view */
655    context->appdata->cur_view = context->old_view;    context->appdata->cur_view = context->old_view;
656    #endif
657    
658    gtk_timeout_remove(context->handler_id);    gtk_timeout_remove(context->handler_id);
659    
660    g_free(context);    g_free(context);
661      appdata->map.context = NULL;
662  }  }
 #endif  
663    
664  void map(appdata_t *appdata) {  void map(appdata_t *appdata) {
665    map_context_t *context = g_new0(map_context_t, 1);    map_context_t *context = NULL;
666    
667      /* if the map window already exists, just raise it */
668      if(appdata->map.context) {
669        gtk_window_present(GTK_WINDOW(appdata->map.context->window));
670        return;
671      }
672    
673      context = appdata->map.context = g_new0(map_context_t, 1);
674    context->appdata = appdata;    context->appdata = appdata;
675    
676    GtkWidget *hbox = gtk_hbox_new(FALSE, 0);    GtkWidget *hbox = gtk_hbox_new(FALSE, 0);
# Line 677  void map(appdata_t *appdata) { Line 679  void map(appdata_t *appdata) {
679    const char *proxy = get_proxy_uri(appdata);    const char *proxy = get_proxy_uri(appdata);
680    
681    context->widget = g_object_new(OSM_TYPE_GPS_MAP,    context->widget = g_object_new(OSM_TYPE_GPS_MAP,
682                   "repo-uri",             MAP_SOURCE_OPENSTREETMAP,                   "map-source",               MAP_SOURCE,
683                   "tile-cache",           path,                   "tile-cache",               path,
684                   "auto-center",          FALSE,                   "auto-center",              FALSE,
685                   "record-trip-history",  FALSE,                   "record-trip-history",      FALSE,
686                   "show-trip-history",    FALSE,                   "show-trip-history",        FALSE,
687                     proxy?"proxy-uri":NULL,     proxy,
688                   NULL);                   NULL);
689    
   if(proxy)  
     g_object_set(OSM_GPS_MAP(context->widget), "proxy-uri", proxy, NULL);  
   
690    g_free(path);    g_free(path);
691    
692    char *name = NULL;    char *name = NULL;
# Line 710  void map(appdata_t *appdata) { Line 710  void map(appdata_t *appdata) {
710    char *title = g_strdup_printf(_("Map - %s"), name);    char *title = g_strdup_printf(_("Map - %s"), name);
711    g_free(name);    g_free(name);
712    
713  #if MAEMO_VERSION_MAJOR == 5  #ifdef USE_MAEMO
714    GtkWidget *window = hildon_stackable_window_new();  #ifdef USE_STACKABLE_WINDOW
715    gtk_window_set_title(GTK_WINDOW(window), title);    context->window = hildon_stackable_window_new();
716  #else  #else
717    GtkWidget *dialog = gtk_dialog_new_with_buttons(title,    context->window = hildon_window_new();
718                            GTK_WINDOW(appdata->window),  #endif
                           GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,  
                           GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,  
                           NULL);  
   
 #ifndef USE_MAEMO  
   gtk_window_set_default_size(GTK_WINDOW(dialog), 640, 480);  
719  #else  #else
720    gtk_window_set_default_size(GTK_WINDOW(dialog), 800, 480);    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
721  #endif  #endif
722    
723      gtk_window_set_title(GTK_WINDOW(context->window), title);
724    
725    #ifndef USE_MAEMO
726      gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);
727  #endif  #endif
728    
729    g_free(title);    g_free(title);
# Line 756  void map(appdata_t *appdata) { Line 755  void map(appdata_t *appdata) {
755      map_add_button(9, G_CALLBACK(cb_map_gps),      map_add_button(9, G_CALLBACK(cb_map_gps),
756                     context, _("Jump to GPS position"));                     context, _("Jump to GPS position"));
757    gtk_widget_set_sensitive(context->gps, FALSE);    gtk_widget_set_sensitive(context->gps, FALSE);
758    
759    /* install handler for timed updates of the gps button */    /* install handler for timed updates of the gps button */
760    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
761    gtk_box_pack_start(GTK_BOX(vbox), context->gps, FALSE, FALSE, 0);    gtk_box_pack_start(GTK_BOX(vbox), context->gps, FALSE, FALSE, 0);
# Line 766  void map(appdata_t *appdata) { Line 766  void map(appdata_t *appdata) {
766    /* prevent some of the main screen things */    /* prevent some of the main screen things */
767    context->old_view = appdata->cur_view;    context->old_view = appdata->cur_view;
768    appdata->cur_view = NULL;    appdata->cur_view = NULL;
769    #endif
770    
771    g_signal_connect(G_OBJECT(window), "destroy",    g_signal_connect(G_OBJECT(context->window), "destroy",
772                     G_CALLBACK(on_window_destroy), context);                     G_CALLBACK(on_window_destroy), context);
773    
774    gtk_container_add(GTK_CONTAINER(window), hbox);    gtk_container_add(GTK_CONTAINER(context->window), hbox);
775    gtk_widget_show_all(GTK_WIDGET(window));    gtk_widget_show_all(GTK_WIDGET(context->window));
   
 #else  
   gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox);  
   gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_CLOSE);  
   gtk_widget_show_all(dialog);  
   gtk_dialog_run(GTK_DIALOG(dialog));  
   save_map_state(context);  
   gtk_timeout_remove(context->handler_id);  
   gtk_widget_destroy(dialog);  
   g_free(context);  
 #endif  
776  }  }
Legend:
Removed from v.53  
changed lines
  Added in v.56