Compare commits
2 Commits
d24904c2d0
...
a01fbe4bea
Author | SHA1 | Date | |
---|---|---|---|
a01fbe4bea | |||
8f9d5c254a |
@ -548,6 +548,8 @@ struct dijkstra_node *dijkstra_node_find_closest_node(struct dijkstra_solver *so
|
|||||||
|
|
||||||
for (l = solver->nodes; l != NULL; l = l->next) {
|
for (l = solver->nodes; l != NULL; l = l->next) {
|
||||||
node = (struct dijkstra_node*) l->data;
|
node = (struct dijkstra_node*) l->data;
|
||||||
|
if (node->layer->type != STREET)
|
||||||
|
continue;
|
||||||
distance = dijkstra_position_get_distance(position, &node->position);
|
distance = dijkstra_position_get_distance(position, &node->position);
|
||||||
if (!closest_node || distance < closest_distance) {
|
if (!closest_node || distance < closest_distance) {
|
||||||
closest_node = node;
|
closest_node = node;
|
||||||
|
@ -280,8 +280,8 @@ int dijkstra_search_route_to_geojson(struct dijkstra_search *search,
|
|||||||
format_str = "Waypoint for %2$s (going %1$s)"; // TODO: check whether we are passing a station
|
format_str = "Waypoint for %2$s (going %1$s)"; // TODO: check whether we are passing a station
|
||||||
else
|
else
|
||||||
format_str = "Stay on %2$s by going %1$s";
|
format_str = "Stay on %2$s by going %1$s";
|
||||||
} else if (node->layer->type == TRAINLINE || node->layer->type == ACCESS) {
|
} else if ((node->layer->type == TRAINLINE || node->layer->type == ACCESS) && node_last->layer->type == ACCESS) {
|
||||||
format_str = "[T] Take the %2$s";
|
format_str = "[T] Take the %2$s"; // TODO: Somewhere here we probably also have the interchange
|
||||||
} else {
|
} else {
|
||||||
if (node_last->layer->type == TRAINLINE)
|
if (node_last->layer->type == TRAINLINE)
|
||||||
format_str = "[T] Leave the train at %2$s";
|
format_str = "[T] Leave the train at %2$s";
|
||||||
|
@ -102,7 +102,7 @@ int main(int argc, char *argv[])
|
|||||||
file_name = strchr(argv[i], ':');
|
file_name = strchr(argv[i], ':');
|
||||||
if (!file_name) {
|
if (!file_name) {
|
||||||
file_name = argv[i];
|
file_name = argv[i];
|
||||||
file_type = "street";
|
file_type = "streets";
|
||||||
} else {
|
} else {
|
||||||
*file_name = '\0';
|
*file_name = '\0';
|
||||||
file_name++;
|
file_name++;
|
||||||
|
Loading…
Reference in New Issue
Block a user