MapCamera - refactor