Refactor track model: replace TrackCoordinate with TrackPoint, add TrackHeader for header data
This commit is contained in:
@@ -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<Coordinate> trackPoints;
|
||||
|
||||
private TrackHeader header;
|
||||
private List<TrackPoint> trackPoints;
|
||||
private List<Declaration> declarations;
|
||||
private List<MarkerDrop> markerDrops;
|
||||
private File trackFile;
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
+6
-3
@@ -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;
|
||||
@@ -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<String> records;
|
||||
|
||||
|
||||
public TrackHeader(List<String> records) {
|
||||
this.records = records;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user