improvements to gpx upload in opentrail; further refactoring of hikar