Calculate trip time

Fix merge conflict after adding methods.