Partisan and race-based redistricting