增加测试数据：shanghai.gpx
Merge remote-tracking branch 'origin/master'