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

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

revision 73 by harbaum, Sun Aug 23 19:38:15 2009 UTC revision 97 by harbaum, Mon Sep 7 06:16:06 2009 UTC
# Line 65  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;
# Line 100  typedef void (*OsmGpsMapOsdCallback)(osd Line 107  typedef void (*OsmGpsMapOsdCallback)(osd
107  /* the osd structure mainly contains various callbacks */  /* the osd structure mainly contains various callbacks */
108  /* required to draw and update the OSD */  /* required to draw and update the OSD */
109  typedef struct osm_gps_map_osd_s {  typedef struct osm_gps_map_osd_s {
     GdkPixmap *pixmap;   // the main pixmap (to draw on it)  
110      GtkWidget *widget;   // the main map widget (to get its stlye info)      GtkWidget *widget;   // the main map widget (to get its stlye info)
111    
112      void(*render)(struct osm_gps_map_osd_s *);      void(*render)(struct osm_gps_map_osd_s *);
113      void(*draw)(struct osm_gps_map_osd_s *, gint, gint);      void(*draw)(struct osm_gps_map_osd_s *, GdkDrawable *);
114      void(*restore)(struct osm_gps_map_osd_s *) ;      osd_button_t(*check)(struct osm_gps_map_osd_s *,gint, gint);       /* check if x/y lies within OSD */
115      osd_button_t(*check)(gint, gint);       /* check if x/y lies within OSD */      gboolean(*busy)(struct osm_gps_map_osd_s *);
116      void(*free)(struct osm_gps_map_osd_s *);      void(*free)(struct osm_gps_map_osd_s *);
117    
118      OsmGpsMapOsdCallback cb;      OsmGpsMapOsdCallback cb;
# Line 137  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 158  void osm_gps_map_clear_balloon (OsmGpsMa Line 163  void osm_gps_map_clear_balloon (OsmGpsMa
163  void osm_gps_map_register_osd(OsmGpsMap *map, osm_gps_map_osd_t *osd);  void osm_gps_map_register_osd(OsmGpsMap *map, osm_gps_map_osd_t *osd);
164  void osm_gps_map_redraw (OsmGpsMap *map);  void osm_gps_map_redraw (OsmGpsMap *map);
165  osm_gps_map_osd_t *osm_gps_map_osd_get(OsmGpsMap *map);  osm_gps_map_osd_t *osm_gps_map_osd_get(OsmGpsMap *map);
166    void osm_gps_map_repaint (OsmGpsMap *map);
167  #endif  #endif
168    
169    
Legend:
Removed from v.73  
changed lines
  Added in v.97