GPX Viewer app have editable waypoint or add waypoint to the map. Hope Suunto will come out with that function.