FOSS
/
BangleApps
mirror of https://github.com/espruino/BangleApps
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

trail: fix distance when line is zero length.

pull/3616/head
Pavel Machek 2024-09-25 22:49:50 +02:00
parent 50cf977f79
commit 2b84cc3760
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
apps/trail/trail.app.js
View File

@ -267,6 +267,9 @@ let egt = {
if (s[1].split('=')[1] === undefined) { if (s[1].split('=')[1] === undefined) {
r.lat = 1 * s[0]; r.lat = 1 * s[0];
r.lon = 1 * s[1]; r.lon = 1 * s[1];
if (!r.lat || !r.lon) {
print("Parse error at ", l);
}
} }
for (let fi of s) { for (let fi of s) {
@ -378,19 +381,22 @@ function toCartesian(v) {
} }
function distSegment(x1, x2, xP) { function distSegment(x1, x2, xP) {
// Převod zeměpisných souřadnic na kartézské souřadnice // Translate geo to cartesian
const p1 = toCartesian(x1); const p1 = toCartesian(x1);
const p2 = toCartesian(x2); const p2 = toCartesian(x2);
const p = toCartesian(xP); const p = toCartesian(xP);
// Vektor p1p2
const dx = p2.x - p1.x; const dx = p2.x - p1.x;
const dy = p2.y - p1.y; const dy = p2.y - p1.y;
// Projekce bodu p na přímku definovanou body p1 a p2 const div = (dx * dx + dy * dy);
const dot = ((p.x - p1.x) * dx + (p.y - p1.y) * dy) / (dx * dx + dy * dy);
// Určení bodu na přímce, kde leží projekce // Project point p to line defined by p1 / p2.
let dot = 2;
if (div)
dot = ((p.x - p1.x) * dx + (p.y - p1.y) * dy) / div;
// Compute closest point to projection
let closestX, closestY; let closestX, closestY;
if (dot < 0) { if (dot < 0) {
closestX = p1.x; closestX = p1.x;
@ -403,7 +409,6 @@ function distSegment(x1, x2, xP) {
closestY = p1.y + dot * dy; closestY = p1.y + dot * dy;
} }
// Vzdálenost mezi bodem p a nejbližším bodem na úsečce
const distance = Math.sqrt((p.x - closestX) * (p.x - closestX) + (p.y - closestY) * (p.y - closestY)); const distance = Math.sqrt((p.x - closestX) * (p.x - closestX) + (p.y - closestY) * (p.y - closestY));
return distance * 1000; return distance * 1000;
@ -709,7 +714,10 @@ function recover() {
load_next(); load_next();
while(1) { while(1) {
let d = distSegment(track[0], track[1], pp); let d = distSegment(track[0], track[1], pp);
print("Recover, d", d); if (d === undefined) {
print("Distance wrong?");
}
print("Recover, d", d, track[0], track[1]);
if (d < 400) if (d < 400)
break; break;
track.shift(); track.shift();