Refactor functions to LocationService
Merge pull request #42 from jakecadams/locfix

Refactor functions to LocationService