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

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

revision 75 by harbaum, Mon Aug 24 12:57:15 2009 UTC revision 89 by harbaum, Tue Sep 1 11:16:30 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_MAPS_FOR_FREE,
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_GOOGLE_HYBRID,    /* disabled by google */
78        OSM_GPS_MAP_SOURCE_YAHOO_STREET,     /* no implemented yet */
79        OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE,  /* no implemented yet */
80        OSM_GPS_MAP_SOURCE_YAHOO_HYBRID      /* no implemented yet */
81  } OsmGpsMapSource_t;  } OsmGpsMapSource_t;
82    
83    #define OSM_GPS_MAP_SOURCE_LAST  (OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_HYBRID)
84    
85  typedef struct {  typedef struct {
86      gint x, y, w, h;      gint x, y, w, h;
87  } OsmGpsMapRect_t;  } OsmGpsMapRect_t;
# Line 104  typedef struct osm_gps_map_osd_s { Line 108  typedef struct osm_gps_map_osd_s {
108    
109      void(*render)(struct osm_gps_map_osd_s *);      void(*render)(struct osm_gps_map_osd_s *);
110      void(*draw)(struct osm_gps_map_osd_s *, GdkDrawable *);      void(*draw)(struct osm_gps_map_osd_s *, GdkDrawable *);
111      osd_button_t(*check)(gint, gint);       /* check if x/y lies within OSD */      osd_button_t(*check)(struct osm_gps_map_osd_s *,gint, gint);       /* check if x/y lies within OSD */
112        gboolean(*busy)(struct osm_gps_map_osd_s *);
113      void(*free)(struct osm_gps_map_osd_s *);      void(*free)(struct osm_gps_map_osd_s *);
114    
115      OsmGpsMapOsdCallback cb;      OsmGpsMapOsdCallback cb;
# Line 155  void osm_gps_map_clear_balloon (OsmGpsMa Line 160  void osm_gps_map_clear_balloon (OsmGpsMa
160  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);
161  void osm_gps_map_redraw (OsmGpsMap *map);  void osm_gps_map_redraw (OsmGpsMap *map);
162  osm_gps_map_osd_t *osm_gps_map_osd_get(OsmGpsMap *map);  osm_gps_map_osd_t *osm_gps_map_osd_get(OsmGpsMap *map);
163    void osm_gps_map_repaint (OsmGpsMap *map);
164  #endif  #endif
165    
166    
Legend:
Removed from v.75  
changed lines
  Added in v.89