Restore City3, clarify hardcoded parameters
Update test for new geocoding