Add more files to be renamed; fix launch error

This commit is contained in:
Lauren Budorick 2016-03-25 10:50:46 -07:00 committed by Patrick Niklaus
parent e9be9dd8d0
commit 9752cb8e4d
2 changed files with 4 additions and 4 deletions

View File

@ -222,7 +222,7 @@ module.exports = function () {
});
};
['osrm','osrm.names','osrm.restrictions','osrm.ebg','osrm.enw','osrm.edges','osrm.fileIndex','osrm.geometry','osrm.nodes','osrm.ramIndex'].forEach(file => {
['osrm','osrm.names','osrm.restrictions','osrm.ebg','osrm.enw','osrm.edges','osrm.fileIndex','osrm.geometry','osrm.nodes','osrm.ramIndex','osrm.properties'].forEach(file => {
q.defer(rename, file);
});
@ -272,11 +272,11 @@ module.exports = function () {
var q = d3.queue();
['osrm.hsgr','osrm.fileIndex','osrm.geometry','osrm.nodes','osrm.ramIndex','osrm.core','osrm.edges'].forEach((file) => {
['osrm.hsgr','osrm.fileIndex','osrm.geometry','osrm.nodes','osrm.ramIndex','osrm.core','osrm.edges','osrm.datasource_indexes','osrm.datasource_names','osrm.level'].forEach((file) => {
q.defer(rename, file);
});
['osrm.names','osrm.restrictions','osrm'].forEach((file) => {
['osrm.names','osrm.restrictions','osrm.properties','osrm'].forEach((file) => {
q.defer(copy, file);
});

View File

@ -111,7 +111,7 @@ var OSRMDatastoreLoader = class extends OSRMBaseLoader {
loadData (callback) {
this.scope.runBin('osrm-datastore', this.inputFile, (err) => {
if (err) return callback(new this.LaunchError(this.exitCode, 'datastore', err));
if (err) return callback(this.scope.LaunchError(this.exitCode, 'datastore', err));
callback();
});
}