From ca6f973360a845c3d916b1bb2e10c18ada6ba0a0 Mon Sep 17 00:00:00 2001
From: Dennis Guse <dennis.guse@alumni.tu-berlin.de>
Date: Thu, 5 Mar 2026 20:00:42 +0100
Subject: [PATCH] Cleanup.

---
 .../opentracks/data/models/MarkerBuilder.java        |  9 ---------
 .../opentracks/data/models/TrackPoint.java           |  3 ++-
 .../io/file/importer/GPXTrackImporter.java           | 12 +++++++++++-
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/main/java/de/dennisguse/opentracks/data/models/MarkerBuilder.java b/src/main/java/de/dennisguse/opentracks/data/models/MarkerBuilder.java
index 38f54c09c..c170cc29e 100644
--- a/src/main/java/de/dennisguse/opentracks/data/models/MarkerBuilder.java
+++ b/src/main/java/de/dennisguse/opentracks/data/models/MarkerBuilder.java
@@ -28,7 +28,6 @@ import androidx.annotation.VisibleForTesting;
  * @author Leif Hendrik Wilden
  * @author Rodrigo Damazio
  */
-//TODO All data should be final; no default values.
 public final class MarkerBuilder {
 
     private Marker.Id id;
@@ -57,14 +56,6 @@ public final class MarkerBuilder {
         this.position = trackPoint.position();
     }
 
-    public MarkerBuilder(@Nullable Track.Id trackId, @NonNull TrackPoint trackPoint, String name, String description, String typeLocalized, Uri photoUrl) {
-        this(trackId, trackPoint);
-        this.name = name;
-        this.description = description;
-        this.typeLocalized = typeLocalized;
-        this.photoUrl = photoUrl;
-    }
-
     public MarkerBuilder(Marker marker) {
         this.id = marker.id();
         this.trackId = marker.trackId();
diff --git a/src/main/java/de/dennisguse/opentracks/data/models/TrackPoint.java b/src/main/java/de/dennisguse/opentracks/data/models/TrackPoint.java
index 2744be7a6..9c0d81d9f 100644
--- a/src/main/java/de/dennisguse/opentracks/data/models/TrackPoint.java
+++ b/src/main/java/de/dennisguse/opentracks/data/models/TrackPoint.java
@@ -20,6 +20,7 @@ import android.os.Parcelable;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
 
 import java.time.Instant;
 
@@ -63,7 +64,7 @@ public record TrackPoint(
         );
     }
 
-    @Deprecated //TOOD Private?
+    @VisibleForTesting
     public TrackPoint(Type type, Instant now) {
         this(
                 null,
diff --git a/src/main/java/de/dennisguse/opentracks/io/file/importer/GPXTrackImporter.java b/src/main/java/de/dennisguse/opentracks/io/file/importer/GPXTrackImporter.java
index 0c4f82465..1cd877c83 100644
--- a/src/main/java/de/dennisguse/opentracks/io/file/importer/GPXTrackImporter.java
+++ b/src/main/java/de/dennisguse/opentracks/io/file/importer/GPXTrackImporter.java
@@ -297,7 +297,17 @@ public class GPXTrackImporter extends DefaultHandler implements XMLImporter.Trac
         }
 
         if (latitude == null || longitude == null) {
-            return new TrackPoint(TrackPoint.Type.TRACKPOINT, parsedTime.toInstant());
+            return new TrackPoint(
+                    null,
+                    TrackPoint.Type.TRACKPOINT,
+                    Position.of(parsedTime.toInstant()),
+                    null,
+                    null,
+                    null,
+                    null,
+                    null,
+                    null
+            );
         }
 
         double latitudeParsed;