see #4029 - fix problem when MapView is about to be loaded (nmea import)


git-svn-id: http://josm.openstreetmap.de/svn/trunk@6205 0c6e7542-c601-0410-84e7-c038aed88b3b
fixed #8323 - Add support for GPX routes (<rte> element)


git-svn-id: http://josm.openstreetmap.de/svn/trunk@6206 0c6e7542-c601-0410-84e7-c038aed88b3b
Merge branch 'master' into mirror