Redistricting redux: Council approves second map on 7-6 vote