From ef111b795936786ab1de65ef3bb20d26a34ec27d Mon Sep 17 00:00:00 2001 From: Dennis Guse Date: Sat, 6 Dec 2025 10:23:21 +0100 Subject: [PATCH] Cleanup: removed import functionality for legacy format (coordinates 100 and 200 where special). Deadline was EOF 2021. --- .../file/importer/GPXTrackImporterTest.java | 67 ------------------- .../res/raw/legacy_gpx_pause_resume.gpx | 55 --------------- .../io/file/importer/TrackImporter.java | 18 ----- 3 files changed, 140 deletions(-) delete mode 100644 src/androidTest/res/raw/legacy_gpx_pause_resume.gpx diff --git a/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/GPXTrackImporterTest.java b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/GPXTrackImporterTest.java index bf0cd2d24..81179fbc1 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/GPXTrackImporterTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/GPXTrackImporterTest.java @@ -61,73 +61,6 @@ public class GPXTrackImporterTest { } } - /** - * Check that data that contains pause (lat=100, lng=0) and resume (lat=200, lng=0) locations are restored to a segment break. - */ - @LargeTest - @Test - public void gpx_with_pause_resume() throws IOException { - // given - XMLImporter importer = new XMLImporter(new GPXTrackImporter(context, trackImporter)); - InputStream inputStream = InstrumentationRegistry.getInstrumentation().getContext().getResources().openRawResource(de.dennisguse.opentracks.test.R.raw.legacy_gpx_pause_resume); - - // when - // 1. import - importTrackId = importer.importFile(inputStream).get(0); - - // then - // 2. track - Track importedTrack = contentProviderUtils.getTrack(importTrackId); - assertNotNull(importedTrack); - assertEquals(ActivityType.UNKNOWN, importedTrack.activityType()); - assertEquals("the category", importedTrack.activityTypeLocalized()); - assertEquals("the description", importedTrack.description()); - assertEquals("2021-01-07 22:51", importedTrack.name()); - assertEquals(ActivityType.UNKNOWN, importedTrack.activityType()); - - //TODO Check trackstatistics - - // 3. trackpoints - List importedTrackPoints = TestDataUtil.getTrackPoints(contentProviderUtils, importTrackId); - assertEquals(6, importedTrackPoints.size()); - - // first segment - TrackPointAssert a = new TrackPointAssert(); - a.assertEquals(List.of( - new TrackPoint(TrackPoint.Type.SEGMENT_START_AUTOMATIC, - new Position( - Instant.parse("2021-01-07T21:51:59.179Z"), - 3d, 14d, null, - Altitude.WGS84.of(10), null, - null, - null)), - new TrackPoint(TrackPoint.Type.TRACKPOINT, - new Position( - Instant.parse("2021-01-07T21:52:00.653Z"), - 3d, 14.001, null, - Altitude.WGS84.of(10), null, - null, - Speed.of(75.4192))), - new TrackPoint(TrackPoint.Type.TRACKPOINT, - new Position( - Instant.parse("2021-01-07T21:52:01.010Z"), - 3d, 14.002, null, - Altitude.WGS84.of(10), null, - null, Speed.of(311.3948))), - new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL, Instant.parse("2021-01-07T21:52:02.658Z")), - - // created resume trackpoint with time of next valid trackpoint - new TrackPoint(TrackPoint.Type.SEGMENT_START_MANUAL, Instant.parse("2021-01-07T21:52:03.873Z")), - new TrackPoint(TrackPoint.Type.TRACKPOINT, - new Position( - Instant.parse("2021-01-07T21:52:04.103Z"), - 3d, 14.003, null, - Altitude.WGS84.of(10), null, - null, - null)) - ), importedTrackPoints); - } - @LargeTest @Test public void gpx_without_speed() throws IOException { diff --git a/src/androidTest/res/raw/legacy_gpx_pause_resume.gpx b/src/androidTest/res/raw/legacy_gpx_pause_resume.gpx deleted file mode 100644 index 2f3f1a54a..000000000 --- a/src/androidTest/res/raw/legacy_gpx_pause_resume.gpx +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - 10 - - - - - - - 10 - - - - - - - - - - - c0c0c0 - 7002101e-4198-4613-8c24-544e01ca3981 - - - - 10 - - - - 10 - - - - 10 - - - - - - - - - - - 10 - - - - - \ No newline at end of file diff --git a/src/main/java/de/dennisguse/opentracks/io/file/importer/TrackImporter.java b/src/main/java/de/dennisguse/opentracks/io/file/importer/TrackImporter.java index 4a070b947..e597e53e4 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/importer/TrackImporter.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/importer/TrackImporter.java @@ -173,24 +173,6 @@ public class TrackImporter { * NOTE: Modifies content of trackPoints. */ private void adjustTrackPoints() { - for (int i = 0; i < trackPoints.size(); i++) { - TrackPoint current = trackPoints.get(i); - - if (current.hasLocation()) { - Instant time = current.getTime(); - if (current.getPosition().latitude() == 100) { - //TODO Remove by 31st December 2021. - trackPoints.set(i, new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL, time)); - } else if (current.getPosition().latitude() == 200) { - //TODO Remove by 31st December 2021. - trackPoints.set(i, new TrackPoint(TrackPoint.Type.SEGMENT_START_MANUAL, time)); - //TODO Delete location - } else if (!current.getPosition().hasValidLocation()) { - throw new ImportParserException("Invalid location detected: " + current); - } - } - } - for (int i = 1; i < trackPoints.size(); i++) { TrackPoint previous = trackPoints.get(i - 1); TrackPoint current = trackPoints.get(i);