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

Interpolate cost by using max of neighbours

Browse source
This commit is contained in:
Norbert Renner 2022-04-09 11:55:56 +02:00
parent 2f8ddfa9e7
commit 5dd801d714
1 changed files with 29 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

32
js/plugin/Routing.js
View file

@ -497,7 +497,20 @@ BR.Routing = L.Routing.extend({
return stdPath;
},
_interpolateBeelines(serialBeelines) {
_getCostFactor: function (line) {
let costFactor = null;
if (line) {
const props = line.feature.properties;
const length = props['track-length'];
const cost = props['cost'];
if (length) {
costFactor = cost / length;
}
}
return costFactor;
},
_interpolateBeelines: function (serialBeelines, before, after) {
let altStart = serialBeelines[0].getLatLngs()[0].alt;
const altEnd = serialBeelines[serialBeelines.length - 1].getLatLngs()[1].alt ?? altStart;
altStart ??= altEnd;
@ -511,6 +524,15 @@ BR.Routing = L.Routing.extend({
0
);
let beforeCostFactor = this._getCostFactor(before);
let afterCostFactor = this._getCostFactor(after);
let costFactor;
if (beforeCostFactor != null && afterCostFactor != null) {
costFactor = Math.max(beforeCostFactor, afterCostFactor);
} else {
costFactor = beforeCostFactor ?? afterCostFactor ?? 0;
}
for (const beeline of serialBeelines) {
const props = beeline.feature.properties;
const distance = props['track-length'];
@ -528,6 +550,8 @@ BR.Routing = L.Routing.extend({
}
props['plain-ascend'] = Math.trunc(deltaHeight + 0.5);
// do not set interpolated alt value, to explicitly show missing data, e.g. in height graph
props['cost'] = Math.round(distance * costFactor);
}
},
@ -535,20 +559,22 @@ BR.Routing = L.Routing.extend({
L.Routing.prototype._updateBeelines.call(this);
let serialBeelines = [];
let before = null;
this._eachSegment(function (m1, m2, line) {
if (line?._routing?.beeline) {
serialBeelines.push(line);
} else {
if (serialBeelines.length > 0) {
this._interpolateBeelines(serialBeelines);
this._interpolateBeelines(serialBeelines, before, line);
}
before = line;
serialBeelines = [];
}
});
if (serialBeelines.length > 0) {
this._interpolateBeelines(serialBeelines);
this._interpolateBeelines(serialBeelines, before, null);
}
},