Added auto return on map corner for simulator mode