Federer has 6,600 ranking points to Nadal's 6,055. If Nadal can have a half-decent hard court season, he will take over #1 given that Federer has a ton of hard courts ranking points from last season to defend. Unless of course Federer wins in Canada, Cincinnati and New York. I'm not sure how the Olympics affects anything if at all.