Add:Core:More support for waypoints

git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@3552 ffa7fe5e-494d-0410-b361-a75ebd5db220

1 files changed, 24 insertions, 44 deletions

diff --git a/navit/route.h b/navit/route.h
index 3878ec4dc..0781339d4 100644
--- a/navit/route.h
+++ b/navit/route.h
@@ -66,63 +66,46 @@ struct street_data {
 };
 
 /* prototypes */
-enum item_type;
+enum attr_type;
+enum projection;
+struct attr;
+struct attr_iter;
 struct coord;
-struct displaylist;
 struct item;
+struct map;
 struct map_selection;
 struct mapset;
+struct pcoord;
 struct route;
 struct route_info;
-struct route_info_handle;
-struct route_path_coord_handle;
-struct route_path_handle;
-struct route_path_segment;
-struct route_preferences;
 struct street_data;
 struct tracking;
-struct transformation;
+struct vehicleprofile;
 struct route *route_new(struct attr *parent, struct attr **attrs);
-void route_set_mapset(struct route *, struct mapset *ms);
-void route_set_profile(struct route *, struct vehicleprofile *prof);
-struct mapset *route_get_mapset(struct route *);
-struct route_info *route_get_pos(struct route *);
-struct route_info *route_get_dst(struct route *);
-int *route_get_speedlist(struct route *);
-int route_get_path_set(struct route *);
-int route_set_speed(struct route *, enum item_type type, int value);
-int route_contains(struct route *, struct item *item);
-void route_set_position(struct route *, struct pcoord *pos);
-void route_set_position_from_tracking(struct route *, struct tracking *tracking, enum projection pro);
+void route_set_mapset(struct route *this, struct mapset *ms);
+void route_set_profile(struct route *this, struct vehicleprofile *prof);
+struct mapset *route_get_mapset(struct route *this);
+struct route_info *route_get_pos(struct route *this);
+struct route_info *route_get_dst(struct route *this);
+int route_get_path_set(struct route *this);
+int route_contains(struct route *this, struct item *item);
+int route_destination_reached(struct route *this);
+void route_set_position(struct route *this, struct pcoord *pos);
+void route_set_position_from_tracking(struct route *this, struct tracking *tracking, enum projection pro);
 struct map_selection *route_rect(int order, struct coord *c1, struct coord *c2, int rel, int abs);
-void route_set_destination(struct route *, struct pcoord *dst, int async);
-struct route_path_handle *route_path_open(struct route *);
-struct route_path_segment *route_path_get_segment(struct route_path_handle *h);
-struct coord *route_path_segment_get_start(struct route_path_segment *s);
-struct coord *route_path_segment_get_end(struct route_path_segment *s);
-struct item *route_path_segment_get_item(struct route_path_segment *s);
-int route_path_segment_get_length(struct route_path_segment *s);
-int route_path_segment_get_time(struct route_path_segment *s);
-void route_path_close(struct route_path_handle *h);
-struct route_path_coord_handle *route_path_coord_open(struct route *);
-struct coord *route_path_coord_get(struct route_path_coord_handle *h);
-void route_path_coord_close(struct route_path_coord_handle *h);
-int route_time(struct route_preferences *preferences, struct item *item, int len, int maxspeed);
-int route_info_length(struct route_info *pos, struct route_info *dst, int dir);
+void route_set_destinations(struct route *this, struct pcoord *dst, int count, int async);
+int route_get_destinations(struct route *this, struct pcoord *pc, int count);
+void route_set_destination(struct route *this, struct pcoord *dst, int async);
+void route_remove_waypoint(struct route *this);
+struct coord route_get_coord_dist(struct route *this_, int dist);
 struct street_data *street_get_data(struct item *item);
 struct street_data *street_data_dup(struct street_data *orig);
 void street_data_free(struct street_data *sd);
 void route_info_free(struct route_info *inf);
 struct street_data *route_info_street(struct route_info *rinf);
-struct coord *route_info_point(struct route_info *rinf, int point);
-struct route_info_handle *route_info_open(struct route_info *start, struct route_info *end, int dir);
-struct coord *route_info_get(struct route_info_handle *h);
-void route_info_close(struct route_info_handle *h);
-void route_draw(struct route *, struct transformation *t, struct displaylist *dsp);
-struct map *route_get_map(struct route *route);
-struct map *route_get_graph_map(struct route *route);
+struct map *route_get_map(struct route *this_);
+struct map *route_get_graph_map(struct route *this_);
 void route_set_projection(struct route *this_, enum projection pro);
-int route_destination_reached(struct route *);
 void route_set_destinations(struct route *this_, struct pcoord *dst, int count, int async);
 int route_set_attr(struct route *this_, struct attr *attr);
 int route_add_attr(struct route *this_, struct attr *attr);
@@ -131,10 +114,7 @@ struct attr_iter * route_attr_iter_new(void);
 void route_attr_iter_destroy(struct attr_iter *iter);
 int route_get_attr(struct route *this_, enum attr_type type, struct attr *attr, struct attr_iter *iter);
 void route_init(void);
-int route_pos_contains(struct route *, struct item *item);
-struct coord route_get_coord_dist(struct route *this_, int dist);
 void route_destroy(struct route *this_);
-
 /* end of prototypes */
 #ifdef __cplusplus
 }