Refactor geonames services into one GeoData service
.