edited MapView class