Thinking about treating the other half to a couple of nights at the Waldorf on our trip to China in September. Thing is, I'm not sure which room option to go for so could use some advice. I want a room with a view of the famous Shanghai skyline. So is that the city view or river view room? thanks!