Waco ISD, city agree to swap land