route_protected.h (navit-0.5.5) | : | route_protected.h (navit-0.5.6) | ||
---|---|---|---|---|
skipping to change at line 142 | skipping to change at line 142 | |||
struct route_segment_data data; /**< The segment data */ | struct route_segment_data data; /**< The segment data */ | |||
}; | }; | |||
/** | /** | |||
* @brief A complete route graph | * @brief A complete route graph | |||
* | * | |||
* The route graph holds all routable segments along with the connections betwee n them and the cost of | * The route graph holds all routable segments along with the connections betwee n them and the cost of | |||
* each segment. | * each segment. | |||
*/ | */ | |||
struct route_graph { | struct route_graph { | |||
int busy; /**< The graph is being built | int busy; /**< Route calculation is in | |||
*/ | progress: the graph is being built, | |||
* flooded or the path is b | ||||
eing built (a more detailed status can be | ||||
* obtained from the route’ | ||||
s status attribute) */ | ||||
struct map_selection *sel; /**< The rectangle selection for the graph */ | struct map_selection *sel; /**< The rectangle selection for the graph */ | |||
struct mapset_handle *h; /**< Handle to the mapset */ | struct mapset_handle *h; /**< Handle to the mapset */ | |||
struct map *m; /**< Pointer to the currently active map */ | struct map *m; /**< Pointer to the currently active map */ | |||
struct map_rect *mr; /**< Pointer to the currently active map rectangle */ | struct map_rect *mr; /**< Pointer to the currently active map rectangle */ | |||
struct vehicleprofile *vehicleprofile; /**< The vehicle profile */ | struct vehicleprofile *vehicleprofile; /**< The vehicle profile */ | |||
struct callback *idle_cb; /**< Idle callback to process the graph */ | struct callback *idle_cb; /**< Idle callback to process the graph */ | |||
struct callback *done_cb; /**< Callback when graph is d one */ | struct callback *done_cb; /**< Callback when graph is d one */ | |||
struct event_idle *idle_ev; /**< The pointer to the idle event */ | struct event_idle *idle_ev; /**< The pointer to the idle event */ | |||
struct route_graph_segment *route_segments; /**< Pointer to the first rou te_graph_segment in the linked list of all segments */ | struct route_graph_segment *route_segments; /**< Pointer to the first rou te_graph_segment in the linked list of all segments */ | |||
struct route_graph_segment *avoid_seg; | struct route_graph_segment *avoid_seg; /**< Segment to which a turna round penalty (if active) applies */ | |||
struct fibheap *heap; /**< Priority queue for point s to be expanded */ | struct fibheap *heap; /**< Priority queue for point s to be expanded */ | |||
#define HASH_SIZE 8192 | #define HASH_SIZE 8192 | |||
struct route_graph_point *hash[HASH_SIZE]; /**< A hashtable containing a ll route_graph_points in this graph */ | struct route_graph_point *hash[HASH_SIZE]; /**< A hashtable containing a ll route_graph_points in this graph */ | |||
}; | }; | |||
/* prototypes */ | /* prototypes */ | |||
struct route_graph * route_get_graph(struct route *this_); | struct route_graph * route_get_graph(struct route *this_); | |||
struct map_selection * route_get_selection(struct route * this_); | struct map_selection * route_get_selection(struct route * this_); | |||
void route_free_selection(struct map_selection *sel); | ||||
void route_add_traffic_distortion(struct route *this_, struct item *item); | void route_add_traffic_distortion(struct route *this_, struct item *item); | |||
void route_remove_traffic_distortion(struct route *this_, struct item *item); | void route_remove_traffic_distortion(struct route *this_, struct item *item); | |||
void route_change_traffic_distortion(struct route *this_, struct item *item); | void route_change_traffic_distortion(struct route *this_, struct item *item); | |||
struct route_graph_point * route_graph_add_point(struct route_graph *this, struc t coord *f); | struct route_graph_point * route_graph_add_point(struct route_graph *this, struc t coord *f); | |||
void route_graph_add_turn_restriction(struct route_graph *this, struct item *ite m); | void route_graph_add_turn_restriction(struct route_graph *this, struct item *ite m); | |||
void route_graph_free_points(struct route_graph *this); | void route_graph_free_points(struct route_graph *this); | |||
struct route_graph_point *route_graph_get_point(struct route_graph *this, struct coord *c); | struct route_graph_point *route_graph_get_point(struct route_graph *this, struct coord *c); | |||
struct route_graph_point *route_graph_get_point_next(struct route_graph *this, s truct coord *c, | struct route_graph_point *route_graph_get_point_next(struct route_graph *this, s truct coord *c, | |||
struct route_graph_point *last); | struct route_graph_point *last); | |||
void route_graph_add_segment(struct route_graph *this, struct route_graph_point *start, | void route_graph_add_segment(struct route_graph *this, struct route_graph_point *start, | |||
End of changes. 3 change blocks. | ||||
3 lines changed or deleted | 8 lines changed or added |