From 364daca6a7fc75d095cfdacf1dcabd6645f99152 Mon Sep 17 00:00:00 2001 From: Greg Knisely Date: Thu, 1 Mar 2018 15:16:57 -0500 Subject: [PATCH] fixed typo .stamp_valhalla_tartiles and no need to generate entries for tz or admin db. for now just save them to /data/valhalla --- features/support/data.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/features/support/data.js b/features/support/data.js index 9b9ee79f4..aa77e1224 100644 --- a/features/support/data.js +++ b/features/support/data.js @@ -268,10 +268,7 @@ 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`, - `--mjolnir-tile-extract`, `${p.inputCacheDir}/${p.scenarioID}_valhalla_tiles.tar`, - `--mjolnir-timezone`, `${p.inputCacheDir}/${p.scenarioID}_valhalla_tiles/timezones.sqlite`, - `--mjolnir-admin`, `${p.inputCacheDir}/${p.scenarioID}_valhalla_tiles/admins.sqlite`]; + var params = [`--mjolnir-tile-dir`, `${p.inputCacheDir}/${p.scenarioID}_valhalla_tiles`]; child_process.execFile(`${process.env.VALHALLA_HOME}/scripts/valhalla_build_config`, params, {}, (error, stdout, stderr) => { if (error) { throw error; } @@ -305,7 +302,7 @@ module.exports = function () { }; this.valhallaTarTiles = (p, callback) => { - let stamp = p.processedCacheFile + '.stamp_valhalla_tartiles'; + let stamp = p.processedCacheFile + '.stamp_valhalla_tiles'; fs.exists(stamp, (exists) => { if (exists) return callback(); var params = [`cf`,`${p.inputCacheDir}/${p.scenarioID}_valhalla_tiles.tar`,