karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Use Duration for Markers (instead of long).

Browse Source
This commit is contained in:
Dennis Guse
2021-04-09 18:33:53 +02:00
parent 978206dee4
commit 1c6012596e
5 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/de/dennisguse/opentracks/content/data/Marker.java
+5 -4
View File
@@ -24,6 +24,7 @@ import android.os.Parcelable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import java.time.Duration;
import java.time.Instant;
import java.util.Objects;
@@ -51,7 +52,7 @@ public final class Marker {
//TODO It is the distance from the track starting point; rename to something more meaningful
private double length = 0.0;
private long duration = 0; //TODO Duration
private Duration duration;
@Deprecated //TODO Make an URI instead of String
private String photoUrl = "";
@@ -76,7 +77,7 @@ public final class Marker {
if (trackPoint.hasBearing()) this.bearing = trackPoint.getBearing();
}
public Marker(String name, String description, String category, String icon, @NonNull Track.Id trackId, double length, long duration, @NonNull TrackPoint trackPoint, String photoUrl) {
public Marker(String name, String description, String category, String icon, @NonNull Track.Id trackId, double length, @NonNull Duration duration, @NonNull TrackPoint trackPoint, String photoUrl) {
this(trackId, trackPoint);
this.name = name;
this.description = description;
@@ -225,11 +226,11 @@ public final class Marker {
this.length = length;
}
public long getDuration() {
public Duration getDuration() {
return duration;
}
public void setDuration(long duration) {
public void setDuration(@NonNull Duration duration) {
this.duration = duration;
}
src/main/java/de/dennisguse/opentracks/content/provider/ContentProviderUtils.java
+2 -2
View File
@@ -346,7 +346,7 @@ public class ContentProviderUtils {
marker.setLength(cursor.getFloat(lengthIndex));
}
if (!cursor.isNull(durationIndex)) {
marker.setDuration(cursor.getLong(durationIndex));
marker.setDuration(Duration.ofMillis(cursor.getLong(durationIndex)));
}
if (!cursor.isNull(photoUrlIndex)) {
@@ -481,7 +481,7 @@ public class ContentProviderUtils {
values.put(MarkerColumns.ICON, marker.getIcon());
values.put(MarkerColumns.TRACKID, marker.getTrackId().getId());
values.put(MarkerColumns.LENGTH, marker.getLength());
values.put(MarkerColumns.DURATION, marker.getDuration());
values.put(MarkerColumns.DURATION, marker.getDuration().toMillis());
values.put(MarkerColumns.LONGITUDE, (int) (marker.getLongitude() * 1E6));
values.put(MarkerColumns.LATITUDE, (int) (marker.getLatitude() * 1E6));