Merge branch 'master' into search

This commit is contained in:
Axel Uhl
2014-06-03 01:11:54 +02:00
4 changed files with 29700 additions and 212 deletions
File diff suppressed because one or more lines are too long
@@ -39,7 +39,7 @@ public class TrackFileImportTest {
@Test
public void testKmlOnlyLatLong() throws IOException, FormatNotSupportedException {
InputStream in = getClass().getResourceAsStream("/sam002903 - COMPETITORS.kml");
InputStream in = getClass().getResourceAsStream("/Cardiff Race22 - COMPETITORS.kml");
new RouteConverterGPSFixImporterImpl().importFixes(in, new Callback() {
@Override
public void addFix(GPSFix fix, TrackFileImportDeviceIdentifier device) {