Camera and map refactoring