bryan
/
BangleApps_old
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gipy: fix for nearest segment detection

master
frederic wagner 2023-09-21 16:50:49 +02:00
parent e753efbd47
commit 7f91bceb5c
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/gipy/ChangeLog
View File

@ -114,3 +114,4 @@
* Better position in elevation profiles * Better position in elevation profiles
* Integrating fixes in upstream rust heatshrink crate * Integrating fixes in upstream rust heatshrink crate
* Small path optimisations with brouter (removing looplets) * Small path optimisations with brouter (removing looplets)
* Bugfix in nearest segment detection

23
apps/gipy/app.js
View File

@ -822,28 +822,24 @@ class Status {
if (this.path !== null) { if (this.path !== null) {
// detect segment we are on now // detect segment we are on now
let res = this.path.nearest_segment( let next_segment = this.path.nearest_segment(
this.displayed_position, this.displayed_position,
Math.max(0, this.current_segment - 1), Math.max(0, this.current_segment - 1),
Math.min(this.current_segment + 2, this.path.len - 1), Math.min(this.current_segment + 2, this.path.len - 1),
cos_direction, cos_direction,
sin_direction sin_direction
); );
let orientation = res[0];
let next_segment = res[1];
if (this.is_lost(next_segment)) { if (this.is_lost(next_segment)) {
// start_profiling(); // start_profiling();
// it did not work, try anywhere // it did not work, try anywhere
res = this.path.nearest_segment( next_segment = this.path.nearest_segment(
this.displayed_position, this.displayed_position,
0, 0,
this.path.len - 1, this.path.len - 1,
cos_direction, cos_direction,
sin_direction sin_direction
); );
orientation = res[0];
next_segment = res[1];
// end_profiling("repositioning"); // end_profiling("repositioning");
} }
// now check if we strayed away from path or back to it // now check if we strayed away from path or back to it
@ -865,7 +861,7 @@ class Status {
this.current_segment = next_segment; this.current_segment = next_segment;
// check if we are nearing the next point on our path and alert the user // check if we are nearing the next point on our path and alert the user
let next_point = this.current_segment + (1 - orientation); let next_point = this.current_segment + (go_backwards ? 0 : 1);
this.distance_to_next_point = Math.ceil( this.distance_to_next_point = Math.ceil(
this.position.distance(this.path.point(next_point)) this.position.distance(this.path.point(next_point))
); );
@ -1459,7 +1455,7 @@ class Path {
} }
// return index of segment which is nearest from point. // return index of segment which is nearest from point.
// we need a direction because we need there is an ambiguity // we need a direction because there is an ambiguity
// for overlapping segments which are taken once to go and once to come back. // for overlapping segments which are taken once to go and once to come back.
// (in the other direction). // (in the other direction).
nearest_segment(point, start, end, cos_direction, sin_direction) { nearest_segment(point, start, end, cos_direction, sin_direction) {
@ -1476,7 +1472,7 @@ class Path {
let dot = let dot =
cos_direction * (p2.lon - p1.lon) + sin_direction * (p2.lat - p1.lat); cos_direction * (p2.lon - p1.lon) + sin_direction * (p2.lat - p1.lat);
let orientation = +(dot < 0); // index 0 is good orientation let orientation = +(dot < 0); // index 0 is good orientation (if you go forward)
if (distance <= mins[orientation]) { if (distance <= mins[orientation]) {
mins[orientation] = distance; mins[orientation] = distance;
indices[orientation] = i - 1; indices[orientation] = i - 1;
@ -1485,12 +1481,13 @@ class Path {
p1 = p2; p1 = p2;
} }
// by default correct orientation (0) wins // by default correct orientation (0 forward, 1 backward) wins
// but if other one is really closer, return other one // but if other one is really closer, return other one
if (mins[1] < mins[0] / 100.0) { let good_orientation = go_backwards ? 1 : 0;
return [1, indices[1]]; if (mins[1-good_orientation] < mins[good_orientation] / 100.0) {
return indices[1-good_orientation];
} else { } else {
return [0, indices[0]]; return indices[good_orientation];
} }
} }
get len() { get len() {