City reaches land swap deal with Weston and Frost