City, GDOT agree on water line funding