upstream-mirrors/OpenTracks
1
0
Fork 1
mirror of https://codeberg.org/OpenTracksApp/OpenTracks.git synced 2026-09-30 16:52:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup: KMLTrackImporter doesn't need Position at first.

Browse Source
This commit is contained in:
Dennis Guse
2025-12-27 09:23:46 +01:00
committed by Dennis Guse
parent 707f4add71
commit 5baa8fa21e
2 changed files with 36 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/de/dennisguse/opentracks/data/models/Position.java
-8
View File
@@ -137,12 +137,4 @@ public record Position(
public Position withBearing(Float bearing) {
return new Position(time, latitude, longitude, horizontalAccuracy, altitude, verticalAccuracy, bearing, speed);
}
public Position withHorizontalAccuracy(Distance horizontalAccuracy) {
return new Position(time, latitude, longitude, horizontalAccuracy, altitude, verticalAccuracy, bearing, speed);
}
public Position withVerticalAccuracy(Distance verticalAccuracy) {
return new Position(time, latitude, longitude, horizontalAccuracy, altitude, verticalAccuracy, bearing, speed);
}
}
src/main/java/de/dennisguse/opentracks/io/file/importer/KMLTrackImporter.java
+36 -18
View File
@@ -33,6 +33,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import de.dennisguse.opentracks.data.models.Altitude;
import de.dennisguse.opentracks.data.models.AltitudeGainLoss;
import de.dennisguse.opentracks.data.models.Cadence;
import de.dennisguse.opentracks.data.models.Distance;
@@ -83,7 +84,6 @@ public class KMLTrackImporter extends DefaultHandler implements XMLImporter.Trac
private static final String TAG_PHOTO_OVERLAY = "PhotoOverlay";
private static final String TAG_PLACEMARK = "Placemark";
private static final String TAG_STYLE_URL = "styleUrl";
// private static final String TAG_VALUE = "value"; TODO
private static final String TAG_WHEN = "when";
private static final String TAG_UUID = "opentracks:trackid";
@@ -99,7 +99,7 @@ public class KMLTrackImporter extends DefaultHandler implements XMLImporter.Trac
private ZoneOffset zoneOffset;
private final ArrayList<Instant> whenList = new ArrayList<>();
private final ArrayList<Position> positionList = new ArrayList<>(); //TODO This is only latitude, longitude, and altitude
private final ArrayList<LatLngAltitude> positionList = new ArrayList<>();
private String dataType;
@@ -260,13 +260,21 @@ public class KMLTrackImporter extends DefaultHandler implements XMLImporter.Trac
return;
}
Position position = createPosition(latitude, longitude, altitude);
if (position == null) {
LatLngAltitude latLngAltitude = createPosition(latitude, longitude, altitude);
if (latLngAltitude == null) {
Log.w(TAG, "Marker with invalid coordinates ignored: " + latitude + " " + longitude);
return;
}
position = position.with(whenList.get(0));
Position position = new Position(
whenList.get(0),
latLngAltitude.latitude,
latLngAltitude.longitude,
null,
latLngAltitude.altitude,
null,
null,
null
);
markers.add(new Marker(
null,
null,
@@ -320,12 +328,7 @@ public class KMLTrackImporter extends DefaultHandler implements XMLImporter.Trac
// Close a track segment by inserting the segment locations
for (int i = 0; i < positionList.size(); i++) {
Instant time = whenList.get(i);
Position position = positionList.get(i);
if (position == null) {
position = Position.of(time);
} else {
position = position.with(time);
}
LatLngAltitude latLngAltitude = positionList.get(i);
TrackPoint.Type type = null;
Speed speed = null;
@@ -366,6 +369,17 @@ public class KMLTrackImporter extends DefaultHandler implements XMLImporter.Trac
verticalAccuracy = Distance.of(accuracyVertical.get(i));
}
Position position = new Position(
time,
latLngAltitude != null ? latLngAltitude.latitude : null,
latLngAltitude != null ? latLngAltitude.longitude : null,
horizontalAccuracy,
latLngAltitude != null ? latLngAltitude.altitude : null,
verticalAccuracy,
null,
speed
);
// Update TrackPoint type for START / STOP.
if (i == 0) {
//first
@@ -382,10 +396,7 @@ public class KMLTrackImporter extends DefaultHandler implements XMLImporter.Trac
trackImporter.addTrackPoint(new TrackPoint(
null,
type != null ? type : TrackPoint.Type.TRACKPOINT,
position
.with(speed)
.withHorizontalAccuracy(horizontalAccuracy)
.withVerticalAccuracy(verticalAccuracy),
position,
sensorDistance,
heartRate,
cadence,
@@ -410,7 +421,7 @@ public class KMLTrackImporter extends DefaultHandler implements XMLImporter.Trac
altitude = null;
}
private Position createPosition(String latitude, String longitude, String altitude) {
private LatLngAltitude createPosition(String latitude, String longitude, String altitude) {
//TODO Do not use Location.
if (longitude != null && latitude != null) {
Location location = new Location("import");
@@ -428,7 +439,7 @@ public class KMLTrackImporter extends DefaultHandler implements XMLImporter.Trac
throw new ParsingException(createErrorMessage(String.format(Locale.US, "Unable to parse altitude: %s", altitude)), e);
}
}
return Position.of(location, null);
return new LatLngAltitude(location.getLatitude(), location.getLongitude(), Altitude.WGS84.of(location.getAltitude()));
}
return null;
@@ -492,4 +503,11 @@ public class KMLTrackImporter extends DefaultHandler implements XMLImporter.Trac
public void cleanImport() {
trackImporter.cleanImport();
}
private record LatLngAltitude(
double latitude,
double longitude,
Altitude altitude
) {
}
}