Diff of /trunk/src/osm-gps-map-osd-classic.c

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

revision 132 by harbaum, Thu Oct 1 08:09:00 2009 UTC revision 133 by harbaum, Mon Oct 12 20:27:55 2009 UTC
# Line 82  typedef struct { Line 82  typedef struct {
82          cairo_surface_t *surface;          cairo_surface_t *surface;
83          float lat, lon;          float lat, lon;
84          char *name;          char *name;
85            gboolean imperial;    // display distance imperial/metric
86      } nav;      } nav;
87  #endif  #endif
88    
# Line 1209  osd_render_coordinates(osm_gps_map_osd_t Line 1210  osd_render_coordinates(osm_gps_map_osd_t
1210    
1211  #ifdef OSD_NAV  #ifdef OSD_NAV
1212  #define OSD_NAV_W  (8*OSD_COORDINATES_FONT_SIZE+2*OSD_COORDINATES_OFFSET)  #define OSD_NAV_W  (8*OSD_COORDINATES_FONT_SIZE+2*OSD_COORDINATES_OFFSET)
1213  #define OSD_NAV_H  (130)  #define OSD_NAV_H  (11*OSD_COORDINATES_FONT_SIZE)
1214    
1215  /* http://mathforum.org/library/drmath/view/55417.html */  /* http://mathforum.org/library/drmath/view/55417.html */
1216  static float get_bearing(float lat1, float lon1, float lat2, float lon2) {  static float get_bearing(float lat1, float lon1, float lat2, float lon2) {
# Line 1312  osd_render_nav(osm_gps_map_osd_t *osd) Line 1313  osd_render_nav(osm_gps_map_osd_t *osd)
1313                          deg2rad(priv->nav.lat), deg2rad(priv->nav.lon));                          deg2rad(priv->nav.lat), deg2rad(priv->nav.lon));
1314    
1315          char *dist_str = NULL;          char *dist_str = NULL;
1316          if(dist<1000)          if(!priv->nav.imperial) {
1317              dist_str = g_strdup_printf("%u m", (int)dist);              /* metric is easy ... */
1318          else              if(dist<1000)
1319              dist_str = g_strdup_printf("%.1f km", dist/1000);                  dist_str = g_strdup_printf("%u m", (int)dist);
1320                else
1321                    dist_str = g_strdup_printf("%.1f km", dist/1000);
1322            } else {
1323                /* and now the hard part: scale for useful imperial values :-( */
1324                /* try to convert to feet, 1ft == 0.3048 m */
1325    
1326                if(dist/(3*0.3048) >= 1760.0)      /* more than 1760 yard? */
1327                    dist_str = g_strdup_printf("%.1f mi", dist/(0.3048*3*1760.0));
1328                else if(dist/0.3048 >= 100)        /* more than 100 feet? */
1329                    dist_str = g_strdup_printf("%.1f yd", dist/(0.3048*3));
1330                else
1331                    dist_str = g_strdup_printf("%.0f ft", dist/0.3048);
1332            }
1333    
1334          y = osd_render_centered_text(cr, y, OSD_NAV_W, dist_str);          y = osd_render_centered_text(cr, y, OSD_NAV_W, dist_str);
1335          g_free(dist_str);          g_free(dist_str);
# Line 1344  void osm_gps_map_osd_clear_nav (OsmGpsMa Line 1358  void osm_gps_map_osd_clear_nav (OsmGpsMa
1358  }  }
1359    
1360  void  void
1361  osm_gps_map_osd_draw_nav (OsmGpsMap *map, float latitude, float longitude,  osm_gps_map_osd_draw_nav (OsmGpsMap *map, gboolean imperial,
1362                            char *name) {                            float latitude, float longitude, char *name) {
1363      g_return_if_fail (OSM_IS_GPS_MAP (map));      g_return_if_fail (OSM_IS_GPS_MAP (map));
1364    
1365      osm_gps_map_osd_t *osd = osm_gps_map_osd_get(map);      osm_gps_map_osd_t *osd = osm_gps_map_osd_get(map);
# Line 1364  osm_gps_map_osd_draw_nav (OsmGpsMap *map Line 1378  osm_gps_map_osd_draw_nav (OsmGpsMap *map
1378      priv->nav.lat = latitude;      priv->nav.lat = latitude;
1379      priv->nav.lon = longitude;      priv->nav.lon = longitude;
1380      priv->nav.name = g_strdup(name);      priv->nav.name = g_strdup(name);
1381        priv->nav.imperial = imperial;
1382    
1383      osd_render_nav(osd);      osd_render_nav(osd);
1384    
Legend:
Removed from v.132  
changed lines
  Added in v.133