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

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

revision 112 by harbaum, Tue Sep 15 13:52:04 2009 UTC revision 132 by harbaum, Thu Oct 1 08:09:00 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,
     OSM_GPS_MAP_SOURCE_OSMC_TRAILS,  
69      OSM_GPS_MAP_SOURCE_GOOGLE_STREET,      OSM_GPS_MAP_SOURCE_GOOGLE_STREET,
70      OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE,      OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE,
71      OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET,      OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET,
# Line 74  typedef enum { Line 73  typedef enum {
73      OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_HYBRID,      OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_HYBRID,
74    
75      /* entries below are currently unusable */      /* entries below are currently unusable */
76        OSM_GPS_MAP_SOURCE_OSMC_TRAILS,      /* only germany       */
77      OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE,    /* not enough details */      OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE,    /* not enough details */
78      OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID,    /* disabled by google */      OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID,    /* disabled by google */
79      OSM_GPS_MAP_SOURCE_YAHOO_STREET,     /* no implemented yet */      OSM_GPS_MAP_SOURCE_YAHOO_STREET,     /* no implemented yet */
# Line 111  typedef struct osm_gps_map_osd_s { Line 111  typedef struct osm_gps_map_osd_s {
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 *, GdkDrawable *);      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 */      osd_button_t(*check)(struct osm_gps_map_osd_s *,gboolean,gint, gint);       /* check if x/y lies within OSD */
115      gboolean(*busy)(struct osm_gps_map_osd_s *);      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    
# Line 160  void osm_gps_map_register_osd(OsmGpsMap Line 160  void osm_gps_map_register_osd(OsmGpsMap
160  void osm_gps_map_redraw (OsmGpsMap *map);  void osm_gps_map_redraw (OsmGpsMap *map);
161  osm_gps_map_osd_t *osm_gps_map_osd_get(OsmGpsMap *map);  osm_gps_map_osd_t *osm_gps_map_osd_get(OsmGpsMap *map);
162  void osm_gps_map_repaint (OsmGpsMap *map);  void osm_gps_map_repaint (OsmGpsMap *map);
163    coord_t *osm_gps_map_get_gps (OsmGpsMap *map);
164  #endif  #endif
165    
166    
Legend:
Removed from v.112  
changed lines
  Added in v.132