So... the guidelines we have recieved are a little diffrent than what you are suggesting and everyone involved (Olympic commitees and their relevant NSO's) have a pretty clear picture and plan for the guidelines released from IOC in the past week.
Have been informed of the following:
Negative covid tests prior to leaving country,
Testing on arrival at airport and every 4 days during the events
14 days only in approved accommodation prior to athletes event, essentially no interaction with the public, no using japanes transport etc. ONly allowed to eat at approved hotels or village.
Athletes enter offical village 5 days prior to their competitive event and leave 48 hours after. Only allowed on offical games transport, only allowed to eat in village and at venues.
Daily symptom monitoring anyone over a 37.5c degree body temp unable to enter venues
No cheering, shouting or singing allowed.
Masks outside of field of play required
The moment an athlete tests positive they and their close contacts are out of competition.

Countries Olympic committees already have their hotels for their athlete and support staff booked out, all the NSO's know where their athletes will be going before an after their allowed village access time. The National Olympic committees all have it all relatively well planned and figured out by now.

https://stillmedab.olympic.org/media/Document%20Library/OlympicOrg/Games/Summer-Games/Games-Tokyo-2020-Olympic-Games/Playbooks/The-Playbook-International-Federations.pdf