Should I put a comma after a state before a country?

Solution 1:

I think these commas are appropriate, as each hyper-location serves as an apposition. However, the postal service discourages punctuation, as it is just noise for their OCR machines.