Revert "Astyle map.h and map.cpp"

This reverts commit 14f3fc748a2cab235ba72bc9115091050a4aa221.

CIB was right, I should have waited on this one.
Merge pull request #8258 from KA101/revert-map-astyle

Revert "Astyle map.h and map.cpp"