Skip to content

Add 'else' statements to task functions in async.waterfall #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
astrotars merged 1 commit into from
Nov 16, 2016
Merged

Add 'else' statements to task functions in async.waterfall #14

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
40 changes: 20 additions & 20 deletions api/routes/uploads.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,10 +254,10 @@ server.post('/uploads', function(req, res, next) {

if (err || result.statusCode != 200) {
cb(err);
}

cb(null);
} else {

cb(null);
}
});

},
Expand All @@ -273,25 +273,25 @@ server.post('/uploads', function(req, res, next) {

if (err) {
cb(err);
}
} else {

// if the location was found
if (location.features.length) {

// if the location was found
if (location.features.length) {
// extract coorindates
var coords = location.features[0].geometry.coordinates;
if (coords.length) {

// extract coorindates
var coords = location.features[0].geometry.coordinates;
if (coords.length) {
// assign to latitude and longitude in data object
data.longitude = coords[0];
data.latitude = coords[1];

// assign to latitude and longitude in data object
data.longitude = coords[0];
data.latitude = coords[1];
}

}

cb(null)
}

cb(null)

});

},
Expand All @@ -304,13 +304,13 @@ server.post('/uploads', function(req, res, next) {

if (err) {
cb(err);
}
} else {

// use object assign to merge the object id
result = Object.assign({}, { id: result.insertId }, data);

cb(null, result);
// use object assign to merge the object id
result = Object.assign({}, { id: result.insertId }, data);

cb(null, result);
}
});

},
Expand Down