Diff of /trunk/src/osm-gps-map.h

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

revision 58 by harbaum, Mon Aug 17 10:51:56 2009 UTC revision 97 by harbaum, Mon Sep 7 06:16:06 2009 UTC
# Line 25  Line 25 
25  #ifndef _OSM_GPS_MAP_H_  #ifndef _OSM_GPS_MAP_H_
26  #define _OSM_GPS_MAP_H_  #define _OSM_GPS_MAP_H_
27    
28    #include "config.h"
29    
30  #include <glib.h>  #include <glib.h>
31  #include <glib-object.h>  #include <glib-object.h>
32  #include <gtk/gtk.h>  #include <gtk/gtk.h>
# Line 63  typedef enum { Line 65  typedef enum {
65      OSM_GPS_MAP_SOURCE_NULL,      OSM_GPS_MAP_SOURCE_NULL,
66      OSM_GPS_MAP_SOURCE_OPENSTREETMAP,      OSM_GPS_MAP_SOURCE_OPENSTREETMAP,
67      OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER,      OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER,
68      OSM_GPS_MAP_SOURCE_OPENAERIALMAP,      OSM_GPS_MAP_SOURCE_OPENCYCLEMAP,
69      OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE,      OSM_GPS_MAP_SOURCE_OSMC_TRAILS,
70      OSM_GPS_MAP_SOURCE_GOOGLE_STREET,      OSM_GPS_MAP_SOURCE_GOOGLE_STREET,
71      OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE,      OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE,
     OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID,  
72      OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET,      OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET,
73      OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_SATELLITE,      OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_SATELLITE,
74      OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_HYBRID,      OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_HYBRID,
75      OSM_GPS_MAP_SOURCE_YAHOO_STREET,  
76      OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE,      /* entries below are currently unusable */
77      OSM_GPS_MAP_SOURCE_YAHOO_HYBRID      OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE,    /* not enough details */
78        OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID,    /* disabled by google */
79        OSM_GPS_MAP_SOURCE_YAHOO_STREET,     /* no implemented yet */
80        OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE,  /* no implemented yet */
81        OSM_GPS_MAP_SOURCE_YAHOO_HYBRID      /* no implemented yet */
82  } OsmGpsMapSource_t;  } OsmGpsMapSource_t;
83    
84    #define OSM_GPS_MAP_SOURCE_LAST  (OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_HYBRID)
85    
86    #define OSM_GPS_MAP_INVALID  (0.0/0.0)
87    
88  typedef struct {  typedef struct {
89      gint x, y, w, h;      gint x, y, w, h;
90  } OsmGpsMapRect_t;  } OsmGpsMapRect_t;
91    
92    typedef enum {
93        OSD_NONE = 0,
94        OSD_BG,
95        OSD_UP,
96        OSD_DOWN,
97        OSD_LEFT,
98        OSD_RIGHT,
99        OSD_IN,
100        OSD_OUT,
101        OSD_CUSTOM   // first custom buttom
102    } osd_button_t;
103    
104    typedef void (*OsmGpsMapOsdCallback)(osd_button_t but, gpointer data);
105    #define OSM_GPS_MAP_OSD_CALLBACK(f) ((OsmGpsMapOsdCallback) (f))
106    
107    /* the osd structure mainly contains various callbacks */
108    /* required to draw and update the OSD */
109    typedef struct osm_gps_map_osd_s {
110        GtkWidget *widget;   // the main map widget (to get its stlye info)
111    
112        void(*render)(struct osm_gps_map_osd_s *);
113        void(*draw)(struct osm_gps_map_osd_s *, GdkDrawable *);
114        osd_button_t(*check)(struct osm_gps_map_osd_s *,gint, gint);       /* check if x/y lies within OSD */
115        gboolean(*busy)(struct osm_gps_map_osd_s *);
116        void(*free)(struct osm_gps_map_osd_s *);
117    
118        OsmGpsMapOsdCallback cb;
119        gpointer data;
120    
121        gpointer priv;
122    } osm_gps_map_osd_t;
123    
124  typedef void (*OsmGpsMapBalloonCallback)(cairo_t *, OsmGpsMapRect_t *rect,  typedef void (*OsmGpsMapBalloonCallback)(cairo_t *, OsmGpsMapRect_t *rect,
125                                           gpointer data);                                           gpointer data);
126  #define OSM_GPS_MAP_BALLOON_CALLBACK(f) ((OsmGpsMapBalloonCallback) (f))  #define OSM_GPS_MAP_BALLOON_CALLBACK(f) ((OsmGpsMapBalloonCallback) (f))
# Line 102  void osm_gps_map_clear_tracks (OsmGpsMap Line 143  void osm_gps_map_clear_tracks (OsmGpsMap
143  void osm_gps_map_add_image (OsmGpsMap *map, float latitude, float longitude, GdkPixbuf *image);  void osm_gps_map_add_image (OsmGpsMap *map, float latitude, float longitude, GdkPixbuf *image);
144  gboolean osm_gps_map_remove_image (OsmGpsMap *map, GdkPixbuf *image);  gboolean osm_gps_map_remove_image (OsmGpsMap *map, GdkPixbuf *image);
145  void osm_gps_map_clear_images (OsmGpsMap *map);  void osm_gps_map_clear_images (OsmGpsMap *map);
 void osm_gps_map_osd_speed (OsmGpsMap *map, float speed);  
146  void osm_gps_map_draw_gps (OsmGpsMap *map, float latitude, float longitude, float heading);  void osm_gps_map_draw_gps (OsmGpsMap *map, float latitude, float longitude, float heading);
147  void osm_gps_map_clear_gps (OsmGpsMap *map);  void osm_gps_map_clear_gps (OsmGpsMap *map);
148  coord_t osm_gps_map_get_co_ordinates (OsmGpsMap *map, int pixel_x, int pixel_y);  coord_t osm_gps_map_get_co_ordinates (OsmGpsMap *map, int pixel_x, int pixel_y);
# Line 115  void osm_gps_map_geographic_to_screen (O Line 155  void osm_gps_map_geographic_to_screen (O
155                                         gint *pixel_x, gint *pixel_y);                                         gint *pixel_x, gint *pixel_y);
156  void osm_gps_map_scroll (OsmGpsMap *map, gint dx, gint dy);  void osm_gps_map_scroll (OsmGpsMap *map, gint dx, gint dy);
157  float osm_gps_map_get_scale(OsmGpsMap *map);  float osm_gps_map_get_scale(OsmGpsMap *map);
158    #ifdef ENABLE_BALLOON
159  void osm_gps_map_draw_balloon (OsmGpsMap *map, float latitude, float longitude, OsmGpsMapBalloonCallback cb, gpointer data);  void osm_gps_map_draw_balloon (OsmGpsMap *map, float latitude, float longitude, OsmGpsMapBalloonCallback cb, gpointer data);
160  void osm_gps_map_clear_balloon (OsmGpsMap *map);  void osm_gps_map_clear_balloon (OsmGpsMap *map);
161    #endif
162    #ifdef ENABLE_OSD
163    void osm_gps_map_register_osd(OsmGpsMap *map, osm_gps_map_osd_t *osd);
164    void osm_gps_map_redraw (OsmGpsMap *map);
165    osm_gps_map_osd_t *osm_gps_map_osd_get(OsmGpsMap *map);
166    void osm_gps_map_repaint (OsmGpsMap *map);
167    #endif
168    
169    
170  G_END_DECLS  G_END_DECLS
171    
Legend:
Removed from v.58  
changed lines
  Added in v.97