ben/brouter-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Replaced logic to find nearest segment with turf.nearestPointOnLine()

Browse source 
More accurate on routes that are shaped like an 'U' for whatever reason.
This commit is contained in:
Tobias 2022-11-02 20:00:55 +01:00
parent f2d034ce8a
commit aae95877b6
1 changed files with 9 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

28
js/control/TrackMessages.js
View file

@ -241,32 +241,22 @@ BR.TrackMessages = L.Class.extend({
// 1.1 meters of a point on the chart (there are 111,111 meters in a degree) // 1.1 meters of a point on the chart (there are 111,111 meters in a degree)
const exactMatchRounding = 1.1 / 111111; const exactMatchRounding = 1.1 / 111111;
let idx = 0; const point = turf.point([evt.latlng.lng, evt.latlng.lat]);
let idxOffset = 0;
outer: for (let segment of this.segments) { outer: for (let segment of this.segments) {
for (let coord of segment.feature.geometry.coordinates) { const bestPointForSegement = turf.nearestPointOnLine(segment.feature, point);
let latDiff = evt.latlng.lat - coord[1]; if (bestPointForSegement.properties.dist < closestDistance) {
let lngDiff = evt.latlng.lng - coord[0]; closestPointIdx = idxOffset + bestPointForSegement.properties.index;
// first check for an almost exact match; it's simple and avoid further calculations closestDistance = bestPointForSegement.properties.dist;
if (Math.abs(latDiff) < exactMatchRounding && Math.abs(lngDiff) < exactMatchRounding) {
closestPointIdx = idx;
break outer;
}
// calculate the squared distance from the current to the given;
// it's the squared distance, to avoid the expensive square root
const distance = Math.pow(latDiff, 2) + Math.pow(lngDiff, 2);
if (distance < closestDistance) {
closestPointIdx = idx;
closestDistance = distance;
}
idx++;
} }
idxOffset += segment.feature.geometry.coordinates.length;
} }
if (closestPointIdx) { if (closestPointIdx !== null) {
// Now map point to next data row // Now map point to next data row
let rowIdx = -1; let rowIdx = -1;
for (let i = 0; i < this.trackEdges.edges.length; i++) { for (let i = 0; i < this.trackEdges.edges.length; i++) {
if (closestPointIdx <= this.trackEdges.edges[i]) { if (closestPointIdx < this.trackEdges.edges[i]) {
rowIdx = i; rowIdx = i;
break; break;
} }