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

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

revision 47 by harbaum, Thu Aug 6 20:23:12 2009 UTC revision 51 by harbaum, Wed Aug 12 12:16:05 2009 UTC
# Line 24  Line 24 
24  #include "osm-gps-map.h"  #include "osm-gps-map.h"
25  #endif  #endif
26    
27    #define GPS_DEFAULT_ZOOM 13
28    
29  /* equatorial radius in meters */  /* equatorial radius in meters */
30  #define EQ_RADIUS     (6378137.0)  #define EQ_RADIUS     (6378137.0)
31    
# Line 80  static const char *get_proxy_uri(appdata Line 82  static const char *get_proxy_uri(appdata
82  }  }
83    
84  static void map_zoom(map_context_t *context, int step) {  static void map_zoom(map_context_t *context, int step) {
85    int zoom;    gint zoom;
86    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
87    g_object_get(map, "zoom", &zoom, NULL);    g_object_get(map, "zoom", &zoom, NULL);
88    zoom = osm_gps_map_set_zoom(map, zoom+step);    zoom = osm_gps_map_set_zoom(map, zoom+step);
# Line 88  static void map_zoom(map_context_t *cont Line 90  static void map_zoom(map_context_t *cont
90    /* enable/disable zoom buttons as required */    /* enable/disable zoom buttons as required */
91    gtk_widget_set_sensitive(context->zoomin, zoom<17);    gtk_widget_set_sensitive(context->zoomin, zoom<17);
92    gtk_widget_set_sensitive(context->zoomout, zoom>1);    gtk_widget_set_sensitive(context->zoomout, zoom>1);
93    
94      /* save new zoom */
95      context->appdata->map.zoom = zoom;
96  }  }
97    
98  static gboolean  static gboolean
# Line 107  cb_map_gps(GtkButton *button, map_contex Line 112  cb_map_gps(GtkButton *button, map_contex
112    pos_t *refpos = get_pos(context->appdata);    pos_t *refpos = get_pos(context->appdata);
113    if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {    if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
114      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
115                                refpos->lat, refpos->lon, 14);                        refpos->lat, refpos->lon, GPS_DEFAULT_ZOOM);
116    } else {    } else {
117      /* no coordinates given: display the entire world */      /* no coordinates given: display the entire world */
118      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
# Line 118  cb_map_gps(GtkButton *button, map_contex Line 123  cb_map_gps(GtkButton *button, map_contex
123  }  }
124    
125  static GtkWidget  static GtkWidget
126  *map_add_button(const gchar *icon, GCallback cb, gpointer data,  *map_add_button(int icon, GCallback cb, gpointer data,
127                  char *tooltip) {                  char *tooltip) {
128    GtkWidget *button = gtk_button_new();    GtkWidget *button = gtk_button_new();
129    gtk_button_set_image(GTK_BUTTON(button),    gtk_button_set_image(GTK_BUTTON(button), icon_get_widget(ICON_MISC, icon));
                        gtk_image_new_from_stock(icon, GTK_ICON_SIZE_BUTTON));  
130    g_signal_connect(button, "clicked", cb, data);    g_signal_connect(button, "clicked", cb, data);
131  #ifndef USE_MAEMO  #ifndef USE_MAEMO
132    gtk_widget_set_tooltip_text(button, tooltip);    gtk_widget_set_tooltip_text(button, tooltip);
# Line 133  static GtkWidget Line 137  static GtkWidget
137  static gboolean map_gps_update(gpointer data) {  static gboolean map_gps_update(gpointer data) {
138    map_context_t *context = (map_context_t*)data;    map_context_t *context = (map_context_t*)data;
139    
140      /* get reference position ... */
141    pos_t *refpos = get_pos(context->appdata);    pos_t *refpos = get_pos(context->appdata);
142    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);
143    
144    /* get reference position and go there */    /* ... and enable "goto" button if it's valid */
145    gtk_widget_set_sensitive(context->gps, ok);    gtk_widget_set_sensitive(context->gps, ok);
146    
147      if(ok) {
148        float heading = context->appdata->use_gps?
149          gps_get_heading(context->appdata):NAN;
150    
151       osm_gps_map_draw_gps(OSM_GPS_MAP(context->widget),
152                             refpos->lat, refpos->lon, heading);
153      } else
154        osm_gps_map_clear_gps(OSM_GPS_MAP(context->widget));
155    
156    return TRUE;    return TRUE;
157  }  }
158    
# Line 146  static gboolean on_map_configure(GtkWidg Line 160  static gboolean on_map_configure(GtkWidg
160                                   GdkEventConfigure *event,                                   GdkEventConfigure *event,
161                                   map_context_t *context) {                                   map_context_t *context) {
162    
163    cb_map_gps(NULL, context);    /* set default values if they are invalid */
164      if(!context->appdata->map.zoom ||
165         isnan(context->appdata->map.pos.lat) ||
166         isnan(context->appdata->map.pos.lon)) {
167        printf("no valid map position found\n");
168    
169        pos_t *refpos = get_pos(context->appdata);
170        if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
171          /* use gps position if present */
172          context->appdata->map.pos = *refpos;
173          context->appdata->map.zoom = GPS_DEFAULT_ZOOM;
174        } else {
175          /* use world map otherwise */
176          context->appdata->map.pos.lat = 0.0;
177          context->appdata->map.pos.lon = 0.0;
178          context->appdata->map.zoom = 1;
179        }
180      }
181    
182      /* jump to initial position */
183      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
184                                context->appdata->map.pos.lat,
185                                context->appdata->map.pos.lon,
186                                context->appdata->map.zoom);
187    
188    return FALSE;    return FALSE;
189  }  }
190    
# Line 522  pos_t coord2pos(coord_t coo) { Line 559  pos_t coord2pos(coord_t coo) {
559  }  }
560    
561  static int dist2pixel(map_context_t *context, float km, float lat) {  static int dist2pixel(map_context_t *context, float km, float lat) {
562    int zoom;    gint zoom;
563    g_object_get(OSM_GPS_MAP(context->widget), "zoom", &zoom, NULL);    g_object_get(OSM_GPS_MAP(context->widget), "zoom", &zoom, NULL);
564    
565    /* world at zoom 1 == 512 pixels */    /* world at zoom 1 == 512 pixels */
# Line 561  on_map_button_press_event(GtkWidget *wid Line 598  on_map_button_press_event(GtkWidget *wid
598  static gboolean  static gboolean
599  on_map_button_release_event(GtkWidget *widget,  on_map_button_release_event(GtkWidget *widget,
600                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
601    if(context->press_on) {    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
     OsmGpsMap *map = OSM_GPS_MAP(context->widget);  
602    
603      if(context->press_on) {
604      pos_t pos =      pos_t pos =
605        coord2pos(osm_gps_map_get_co_ordinates(map, event->x, event->y));        coord2pos(osm_gps_map_get_co_ordinates(map, event->x, event->y));
606    
# Line 574  on_map_button_release_event(GtkWidget *w Line 611  on_map_button_release_event(GtkWidget *w
611          cache_popup(context, nearest);          cache_popup(context, nearest);
612      }      }
613      context->press_on = NULL;      context->press_on = NULL;
614      } else {
615        /* save new map position */
616        gfloat lat, lon;
617        g_object_get(map, "latitude", &lat, "longitude", &lon, NULL);
618        context->appdata->map.pos.lat = lat;
619        context->appdata->map.pos.lon = lon;
620    }    }
621    
622    return FALSE;    return FALSE;
623  }  }
624    
625    static void save_map_state(map_context_t *context) {
626      /* save map parameters */
627      OsmGpsMap *map = OSM_GPS_MAP(context->widget);
628      gint zoom;
629      g_object_get(map, "zoom", &zoom, NULL);
630      context->appdata->map.zoom = zoom;
631    
632      gfloat lat, lon;
633      g_object_get(map, "latitude", &lat, "longitude", &lon, NULL);
634      context->appdata->map.pos.lat = lat;
635      context->appdata->map.pos.lon = lon;
636    }
637    
638  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
639  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {
640    printf("destroy map view\n");    printf("destroy map view\n");
641    
642      save_map_state(context);
643    
644    /* restore cur_view */    /* restore cur_view */
645    context->appdata->cur_view = context->old_view;    context->appdata->cur_view = context->old_view;
646    
# Line 602  void map(appdata_t *appdata) { Line 659  void map(appdata_t *appdata) {
659    const char *proxy = get_proxy_uri(appdata);    const char *proxy = get_proxy_uri(appdata);
660    
661    context->widget = g_object_new(OSM_TYPE_GPS_MAP,    context->widget = g_object_new(OSM_TYPE_GPS_MAP,
662                  "repo-uri", MAP_SOURCE_OPENSTREETMAP,                   "repo-uri",             MAP_SOURCE_OPENSTREETMAP,
663                  "tile-cache", path,                   "tile-cache",           path,
664                  proxy?"proxy-uri":NULL, proxy,                   "auto-center",          FALSE,
665                     "record-trip-history",  FALSE,
666                     "show-trip-history",    FALSE,
667                   NULL);                   NULL);
668    
669      if(proxy)
670        g_object_set(OSM_GPS_MAP(context->widget),
671                     "proxy-uri", proxy, NULL);
672    
673    g_free(path);    g_free(path);
674    
675    char *name = NULL;    char *name = NULL;
# Line 663  void map(appdata_t *appdata) { Line 726  void map(appdata_t *appdata) {
726    GtkWidget *vbox = gtk_vbox_new(FALSE,0);    GtkWidget *vbox = gtk_vbox_new(FALSE,0);
727    
728    context->zoomin =    context->zoomin =
729      map_add_button(GTK_STOCK_ZOOM_IN, G_CALLBACK(cb_map_zoomin),      map_add_button(10, G_CALLBACK(cb_map_zoomin),
730                     context, _("Zoom in"));                     context, _("Zoom in"));
731    gtk_box_pack_start(GTK_BOX(vbox), context->zoomin, FALSE, FALSE, 0);    gtk_box_pack_start(GTK_BOX(vbox), context->zoomin, FALSE, FALSE, 0);
732    
733    context->zoomout =    context->zoomout =
734      map_add_button(GTK_STOCK_ZOOM_OUT, G_CALLBACK(cb_map_zoomout),      map_add_button(11, G_CALLBACK(cb_map_zoomout),
735                     context, _("Zoom out"));                     context, _("Zoom out"));
736    gtk_box_pack_start(GTK_BOX(vbox), context->zoomout, FALSE, FALSE, 0);    gtk_box_pack_start(GTK_BOX(vbox), context->zoomout, FALSE, FALSE, 0);
737    
738    context->gps =    context->gps =
739      map_add_button(GTK_STOCK_HOME, G_CALLBACK(cb_map_gps),      map_add_button(9, G_CALLBACK(cb_map_gps),
740                     context, _("Jump to GPS position"));                     context, _("Jump to GPS position"));
741    gtk_widget_set_sensitive(context->gps, FALSE);    gtk_widget_set_sensitive(context->gps, FALSE);
742    /* install handler for timed updates of the gps button */    /* install handler for timed updates of the gps button */
# Line 698  void map(appdata_t *appdata) { Line 761  void map(appdata_t *appdata) {
761    gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_CLOSE);    gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_CLOSE);
762    gtk_widget_show_all(dialog);    gtk_widget_show_all(dialog);
763    gtk_dialog_run(GTK_DIALOG(dialog));    gtk_dialog_run(GTK_DIALOG(dialog));
764      save_map_state(context);
765    gtk_timeout_remove(context->handler_id);    gtk_timeout_remove(context->handler_id);
766    gtk_widget_destroy(dialog);    gtk_widget_destroy(dialog);
767    g_free(context);    g_free(context);
Legend:
Removed from v.47  
changed lines
  Added in v.51