Add location for activity without GPS dara

For my pool swims or indoor bikerides I would like to add a location, like the name of the pool.

Something similar as the gear option. 
A text field would be nice..

I do not favour of putting it in the title. Difficult for selections.