I would use 1 for someone from abroad going to Japan and 2 for someone in Japan going on a trip when I was not there.
If you have a question about the English language and would like to ask one of our many English teachers and language experts, please click the button below to let us know: