From 94dde6433ae5b53f9c73bf7ebd90d27a91538f4f Mon Sep 17 00:00:00 2001 From: Greg Knisely Date: Fri, 16 Mar 2018 17:03:02 -0400 Subject: [PATCH] workaround to support tests that set left vs right driving side. If left, load the admins_left.sqlite db; otherwise, admins_right.sqlite --- features/support/data.js | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/features/support/data.js b/features/support/data.js index aa77e1224..dfe70e286 100644 --- a/features/support/data.js +++ b/features/support/data.js @@ -268,7 +268,15 @@ module.exports = function () { // --mjolnir-timezone ${PWD}/valhalla_tiles/timezones.sqlite // --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) => { if (error) { throw error; } @@ -324,7 +332,7 @@ module.exports = function () { let p = {extractArgs: this.extractArgs, contractArgs: this.contractArgs, partitionArgs: this.partitionArgs, customizeArgs: this.customizeArgs, profileFile: this.profileFile, inputCacheFile: this.inputCacheFile, - inputCacheFilePBF: this.inputCacheFilePBF, + inputCacheFilePBF: this.inputCacheFilePBF, vahallaAdminDB: this.vahallaAdminDB, processedCacheFile: this.processedCacheFile, environment: this.environment, inputCacheDir: this.featureProcessedCacheDirectory, scenarioID: this.scenarioID };