+ started re factor for map view logic