Fix current_city
Move coordinates logic to service