Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
uses: actions/configure-pages@v2

- name: Upload artifact
uses: actions/upload-pages-artifact@v1
uses: actions/upload-pages-artifact@v3
with:
path: 'documentation/_build/html'

Expand Down
19 changes: 15 additions & 4 deletions src/js/sources/valhallaSource.js
Original file line number Diff line number Diff line change
Expand Up @@ -187,9 +187,14 @@ module.exports = class valhallaSource extends Source {
locationsString += "]";

const costingString = `"costing":"${this._costs[request.profile][request.optimization].costing}"`;
let costingOptionsString = `"costing_options":{"${this._costs[request.profile][request.optimization].costing}":{`;
if (this._costs[request.profile][request.optimization].costing === "pedestrian") {
costingOptionsString += `"walking_speed": 4`;
}
costingOptionsString += "}}";
// Permet de grandement se simplifier le parsing !!
const optionsString = `"directions_options":{"format":"osrm"}`;
const commandString = `valhalla_service ${this._configuration.storage.config} route '{${locationsString},${costingString},${optionsString}}' `;
const commandString = `valhalla_service ${this._configuration.storage.config} route '{${locationsString},${costingString},${costingOptionsString},${optionsString}}' `;
const options = { maxBuffer: maxBuffer, timeout: execTimeout };
LOGGER.info(commandString);

Expand Down Expand Up @@ -281,13 +286,19 @@ module.exports = class valhallaSource extends Source {
const locationsString = `"locations":[{"lat":${tmpPoint[1]},"lon":${tmpPoint[0]}}]`;
const costingString = `"costing":"${this._costs[request.profile][request.costType].costing}"`;
let costingOptionsString = `"costing_options":{"${this._costs[request.profile][request.costType].costing}":{`;
if (this._costs[request.profile][request.costType].costing === "pedestrian") {
costingOptionsString += `"walking_speed": 4`;
if (constraints.length >= 1) {
costingOptionsString += ",";
}
}
for (let i = 0; i < constraints.length; i++) {
costingOptionsString += `"${constraints[i]}": "1"`
costingOptionsString += `"${constraints[i]}": "1"`;
if (i != constraints.length - 1) {
costingOptionsString += ","
costingOptionsString += ",";
}
}
costingOptionsString += "}}"
costingOptionsString += "}}";
const contoursString = `"contours":[{"${request.costType}":${costValue}}]`;
const reverseString = `"reverse":${reverse}`;
const polygonsString = `"polygons":true`;
Expand Down
Loading