markus/lifo-dijkstraserv
1
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

Compare commits

base: markus:d219007e71b62230484d0fb85d0107256ab4d672
Branches Tags
markus:master
markus:wip/bound-for
markus:feature/trainlines-wip
markus:feature/trainlines
...
compare: markus:fff25e0a24a1e244f35c6ab9274f6d8a78fbba46
Branches Tags
markus:master
markus:wip/bound-for
markus:feature/trainlines-wip
markus:feature/trainlines

3 Commits
d219007e71 ... fff25e0a24

Author SHA1 Message Date
Markus Koch
fff25e0a24 Remove dots at end of walking directions 2020-05-06 14:14:30 +02:00
Markus Koch
601e617fe0 Add starting road to description 2020-05-06 14:14:05 +02:00
Markus Koch
0fbbd374a7 Fix walking direction heading 2020-05-06 14:13:04 +02:00
1 changed files with 6 additions and 7 deletions
Show Stats Expand all files Collapse all files

13
src/dijkstrasearch.c
View File

@ -248,21 +248,20 @@ int dijkstra_search_route_to_geojson(struct dijkstra_search *search,
for (l = route; l != NULL; l = l->next) { for (l = route; l != NULL; l = l->next) {
node = (struct dijkstra_node*) l->data; node = (struct dijkstra_node*) l->data;
if (node_last) { if (node_last) {
heading = atanf((node->position.y - node_last->position.y) / (node->position.x - node_last->position.x)) / (M_PI * 2) * 360; heading = atan2f((node->position.y - node_last->position.y), (node->position.x - node_last->position.x)) / (M_PI * 2) * 360;
heading = atanf((node->position.y - node_last->position.y) / (node->position.x - node_last->position.x)) / (M_PI * 2) * 360; if (last_heading - heading > 25) {
if (last_heading - heading > 10) {
relative_direction_str = "right"; relative_direction_str = "right";
} else if (last_heading - heading < -10) { } else if (last_heading - heading < -25) {
relative_direction_str = "left"; relative_direction_str = "left";
} else { } else {
relative_direction_str = "straight"; relative_direction_str = "straight";
} }
if (node_last == search->start) if (node_last == search->start)
format_str = "Start here."; format_str = "Start on %2$s";
else if (search->states[node_last->uid]->cheapest_path->name == search->states[node->uid]->cheapest_path->name) else if (search->states[node_last->uid]->cheapest_path->name == search->states[node->uid]->cheapest_path->name)
format_str = "Stay on %2$s by going %1$s."; format_str = "Stay on %2$s by going %1$s";
else else
format_str = "Go %s onto %s."; format_str = "Go %s onto %s";
if (node_last != search->start) if (node_last != search->start)
sdprintf(buf, &offset, ","); sdprintf(buf, &offset, ",");