Simplified and fixed GPXWriter