From 3c67ca43b36b5bd736be8c3befce2a2093127d7b Mon Sep 17 00:00:00 2001 From: Jan Meinl Date: Thu, 14 May 2026 15:26:06 +0200 Subject: [PATCH] Refactor track model: replace `TrackCoordinate` with `TrackPoint`, add `TrackHeader` for header data --- .../coph/flightscore/backend/track/Track.java | 9 ++++----- .../TrackPoint.java} | 9 ++++++--- .../backend/track/header/TrackHeader.java | 17 +++++++++++++++++ 3 files changed, 27 insertions(+), 8 deletions(-) rename src/main/java/dev/coph/flightscore/backend/{coordinate/TrackCoordinate.java => track/TrackPoint.java} (57%) create mode 100644 src/main/java/dev/coph/flightscore/backend/track/header/TrackHeader.java diff --git a/src/main/java/dev/coph/flightscore/backend/track/Track.java b/src/main/java/dev/coph/flightscore/backend/track/Track.java index 39dbb92..6fc4f25 100644 --- a/src/main/java/dev/coph/flightscore/backend/track/Track.java +++ b/src/main/java/dev/coph/flightscore/backend/track/Track.java @@ -1,7 +1,7 @@ package dev.coph.flightscore.backend.track; -import dev.coph.flightscore.backend.coordinate.Coordinate; import dev.coph.flightscore.backend.pilot.Pilot; +import dev.coph.flightscore.backend.track.header.TrackHeader; import lombok.Getter; import lombok.experimental.Accessors; @@ -13,11 +13,10 @@ import java.util.List; public class Track { private Pilot pilot; - private List trackPoints; - + private TrackHeader header; + private List trackPoints; private List declarations; private List markerDrops; private File trackFile; - - + } diff --git a/src/main/java/dev/coph/flightscore/backend/coordinate/TrackCoordinate.java b/src/main/java/dev/coph/flightscore/backend/track/TrackPoint.java similarity index 57% rename from src/main/java/dev/coph/flightscore/backend/coordinate/TrackCoordinate.java rename to src/main/java/dev/coph/flightscore/backend/track/TrackPoint.java index 7461f13..f66845f 100644 --- a/src/main/java/dev/coph/flightscore/backend/coordinate/TrackCoordinate.java +++ b/src/main/java/dev/coph/flightscore/backend/track/TrackPoint.java @@ -1,5 +1,8 @@ -package dev.coph.flightscore.backend.coordinate; +package dev.coph.flightscore.backend.track; +import dev.coph.flightscore.backend.coordinate.Altitude; +import dev.coph.flightscore.backend.coordinate.Coordinate; +import dev.coph.flightscore.backend.coordinate.PositionValid; import lombok.Getter; import lombok.experimental.Accessors; @@ -7,7 +10,7 @@ import java.time.Instant; @Getter @Accessors(fluent = true) -public class TrackCoordinate extends Coordinate { +public class TrackPoint extends Coordinate { private final Instant time; private final PositionValid positionValid; @@ -16,7 +19,7 @@ public class TrackCoordinate extends Coordinate { private final String additionalDigits; private final double variometer; - public TrackCoordinate(Instant time, double latitude, double longitude, PositionValid positionValid, Altitude barometricAltitude, Altitude gpsAltitude, int gpsAccuracy, int satelliteCount, String additionalDigits, double variometer) { + public TrackPoint(Instant time, double latitude, double longitude, PositionValid positionValid, Altitude barometricAltitude, Altitude gpsAltitude, int gpsAccuracy, int satelliteCount, String additionalDigits, double variometer) { super(latitude, longitude, barometricAltitude, gpsAltitude); this.time = time; this.positionValid = positionValid; diff --git a/src/main/java/dev/coph/flightscore/backend/track/header/TrackHeader.java b/src/main/java/dev/coph/flightscore/backend/track/header/TrackHeader.java new file mode 100644 index 0000000..4584de8 --- /dev/null +++ b/src/main/java/dev/coph/flightscore/backend/track/header/TrackHeader.java @@ -0,0 +1,17 @@ +package dev.coph.flightscore.backend.track.header; + +import lombok.Getter; +import lombok.experimental.Accessors; + +import java.util.List; + +@Getter +@Accessors(fluent = true) +public class TrackHeader { + private final List records; + + + public TrackHeader(List records) { + this.records = records; + } +} \ No newline at end of file