Feature/current pos to map