Fixes for issue 845

[rodney757]

No description provided.

[paulproteus]

Hi @rodney757 !

This is a good set of changes, but I'd like to ask you to revise it so it can be great! The one crucial thing is that the test suite should definitely use the code's own geocode function, rather than reimplementing it; and the second thing is that the test should basically-definitely avoid hitting the network.

If you're willing to factor it out into more commits so that the commit log can serve as historical documentation for why the lines changed, that'd be even better; but the above is the only essential one, and for simplicity I'd accept the above changes as a commit on top of this.

(But on the other hand, I love revising history with git, and I hope you gain that love too in the long run!)

[paulproteus]

Marking "Closed" for now, pending those changes.