Removed currentLocation property from map View Ccontroller
Added expected time to every site calculation