Simplify annotations
Add trk serialization for ol.format.GPX