Uses of "which" and "that".

I am not really sure when I should use "which" and "that".

Should I use "that" in this sentence?

New York is a city that attracts a lot of tourists.

And should I use "which" in this sentence?

New York is a city, which attracts a lot of tourists, is one of the most expensive cities in the United States.