Combine extra functions from old track.* and route.*

[mapper] / src / route.h

diff --git a/src/route.h b/src/route.h
index f1200ffe84d48308254e3c9b5089d8c5b96fcfd5..cdb81eff7e6cce1152073e04834287f5694e729f 100644 (file)
--- a/src/route.h
+++ b/src/route.h
@@ -18,25 +18,12 @@
 
 #include "utils.h"
 #include "mapper-types.h"
+#include "path.h"
+#include "position.h"
 
 /** The current route. */
 Path *_route;
 
-/** Data for tracking waypoints for the purpose of announcement. */
-
-/* _near_point is the route point to which we are closest. */
-Point *_near_point;
-guint64 _near_point_dist_squared;
-
-/* _next_way is what we currently interpret to be the next waypoint. */
-WayPoint *_next_way;
-guint64 _next_way_dist_squared;
-gchar *_last_spoken_phrase;
-
-/* _next_wpt is the route point immediately following _next_way. */
-Point *_next_wpt;
-guint64 _next_wpt_dist_squared;
-
 /** The singleton auto-route-download data. */
 AutoRouteDownloadData _autoroute_data;
 
@@ -46,7 +33,6 @@ gboolean route_download(Path *route, gchar *to);
 gboolean route_clear(Path *route);
 
 void route_check_waypoint_announce(Path *route, GpsData *gps);
-void route_autoroute_check(Path *route);
 
 gboolean route_auto_route_dl_idle_cb();
 void route_cancel_autoroute(Path *route, gboolean temporary);
@@ -56,6 +42,8 @@ WayPoint *route_find_nearest_waypoint(Path *route, guint unitx, guint unity);
 
 gboolean route_update_nears(Path *route, gboolean quick);
 
+gboolean route_set_destination_from_last(Path *route, Position *pos);
+
 gboolean route_show_distance_to(Path *route, Point *point);
 void route_show_distance_to_last(Path *route);
 void route_show_distance_to_next(Path *route);