Moved the geoData converting methods to a new util class and improved the saving of the picture refs #2499