Added back correct calculation of map bouding box