Map boundary check

:)
Merge remote-tracking branch 'origin/map' into slipy12
Revert "Map boundary check"

This reverts commit e4058546e68593d136777e515faa2b54063e5fbe.