removed dependency on mapview and replaced with mapviewmodel