[Review]: PEP-8 fixes to several files in the map/ directory.

New pull request after the last one (#984)  accidentally included previous changes.

I only made PEP8 changes here, maybe they were in a past version?
Do you think I should take them out?