switch geocoding service to google
Merge branch 'enhancements'