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

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

revision 87 by harbaum, Mon Aug 31 12:01:28 2009 UTC revision 112 by harbaum, Tue Sep 15 13:52:04 2009 UTC
# Line 66  typedef enum { Line 66  typedef enum {
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_OPENCYCLEMAP,      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_YAHOO_HYBRID)  #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;
# Line 150  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);
 #ifdef ENABLE_BALLOON  
 void osm_gps_map_draw_balloon (OsmGpsMap *map, float latitude, float longitude, OsmGpsMapBalloonCallback cb, gpointer data);  
 void osm_gps_map_clear_balloon (OsmGpsMap *map);  
 #endif  
158  #ifdef ENABLE_OSD  #ifdef ENABLE_OSD
159  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);
160  void osm_gps_map_redraw (OsmGpsMap *map);  void osm_gps_map_redraw (OsmGpsMap *map);
Legend:
Removed from v.87  
changed lines
  Added in v.112