further clean up in MapPane & added a simple check to avoid that the map can be moved out of the window
fixed test
Merge pull request #54 from Mario-S/2.2

Cleanup