Added inbounds check to MapView