Astyle map.h and map.cpp

I'm going to be starting work again sometime next week, and I'd like to get this astyle through until then, as I'll be heavily modifying map.h and map.cpp and would rather not have to deal with formatting issues at that point.