Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

workaround to support tests that set left vs right driving side. If left, load the admins_left.sqlite db; otherwise, admins_right.sqlite

Browse Source
This commit is contained in:
Greg Knisely 2018-03-16 17:03:02 -04:00
parent 34d1aa950d
commit 94dde6433a
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
features/support/data.js
View File

@ -268,7 +268,15 @@ module.exports = function () {
// --mjolnir-timezone ${PWD}/valhalla_tiles/timezones.sqlite // --mjolnir-timezone ${PWD}/valhalla_tiles/timezones.sqlite
// --mjolnir-admin ${PWD}/valhalla_tiles/admins.sqlite > valhalla.json // --mjolnir-admin ${PWD}/valhalla_tiles/admins.sqlite > valhalla.json
var params = [`--mjolnir-tile-dir`, `${p.inputCacheDir}/${p.scenarioID}_valhalla_tiles`]; var params = [];
if (p.vahallaAdminDB === 'left') {
params = [`--mjolnir-tile-dir`, `${p.inputCacheDir}/${p.scenarioID}_valhalla_tiles`,
`--mjolnir-admin`, `/data/valhalla/admins_left.sqlite`];
} else {
params = [`--mjolnir-tile-dir`, `${p.inputCacheDir}/${p.scenarioID}_valhalla_tiles`,
`--mjolnir-admin`, `/data/valhalla/admins_right.sqlite`];
}
child_process.execFile(`${process.env.VALHALLA_HOME}/scripts/valhalla_build_config`, params, {}, (error, stdout, stderr) => { child_process.execFile(`${process.env.VALHALLA_HOME}/scripts/valhalla_build_config`, params, {}, (error, stdout, stderr) => {
if (error) { throw error; } if (error) { throw error; }
@ -324,7 +332,7 @@ module.exports = function () {
let p = {extractArgs: this.extractArgs, contractArgs: this.contractArgs, let p = {extractArgs: this.extractArgs, contractArgs: this.contractArgs,
partitionArgs: this.partitionArgs, customizeArgs: this.customizeArgs, partitionArgs: this.partitionArgs, customizeArgs: this.customizeArgs,
profileFile: this.profileFile, inputCacheFile: this.inputCacheFile, profileFile: this.profileFile, inputCacheFile: this.inputCacheFile,
inputCacheFilePBF: this.inputCacheFilePBF, inputCacheFilePBF: this.inputCacheFilePBF, vahallaAdminDB: this.vahallaAdminDB,
processedCacheFile: this.processedCacheFile, environment: this.environment, processedCacheFile: this.processedCacheFile, environment: this.environment,
inputCacheDir: this.featureProcessedCacheDirectory, inputCacheDir: this.featureProcessedCacheDirectory,
scenarioID: this.scenarioID }; scenarioID: this.scenarioID };