upstream-mirrors/OpenTracks
1
0
Fork 1
mirror of https://codeberg.org/OpenTracksApp/OpenTracks.git synced 2026-10-03 09:53:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup: SensorDataCyclingDistanceSpeed.Data is a record.

Browse Source
This commit is contained in:
Dennis Guse
2023-11-15 07:20:03 +01:00
parent 58d79380cf
commit d47fa27e02
4 changed files with 7 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/de/dennisguse/opentracks/sensors/sensorData/SensorDataCyclingDistanceSpeed.java
+1 -34
View File
@@ -73,38 +73,5 @@ public class SensorDataCyclingDistanceSpeed extends SensorData<BluetoothHandlerC
this.wheelCircumference = wheelCircumference;
}
// TODO Make record
public static class Data {
private final Distance distance;
private final Distance distanceOverall;
private final Speed speed;
private Data(Distance distance, Distance distanceOverall, Speed speed) {
this.distance = distance;
this.distanceOverall = distanceOverall;
this.speed = speed;
}
public Distance getDistance() {
return distance;
}
public Distance getDistanceOverall() {
return distanceOverall;
}
public Speed getSpeed() {
return speed;
}
@NonNull
@Override
public String toString() {
return "Data{" +
"distance=" + getDistance() +
", distance_overall=" + getDistanceOverall() +
", speed=" + getSpeed() +
'}';
}
}
public record Data(Distance distance, Distance distanceOverall, Speed speed) {}
}
src/main/java/de/dennisguse/opentracks/sensors/sensorData/SensorDataSet.java
+3 -3
View File
@@ -68,8 +68,8 @@ public final class SensorDataSet {
}
public Pair<Speed, String> getSpeed() {
if (cyclingDistanceSpeed != null && cyclingDistanceSpeed.hasValue() && cyclingDistanceSpeed.getValue().getSpeed() != null) {
return new Pair<>(cyclingDistanceSpeed.getValue().getSpeed(), cyclingDistanceSpeed.getSensorNameOrAddress());
if (cyclingDistanceSpeed != null && cyclingDistanceSpeed.hasValue() && cyclingDistanceSpeed.getValue().speed() != null) {
return new Pair<>(cyclingDistanceSpeed.getValue().speed(), cyclingDistanceSpeed.getSensorNameOrAddress());
}
if (runningDistanceSpeedCadence != null && runningDistanceSpeedCadence.hasValue() && runningDistanceSpeedCadence.getValue().speed() != null) {
@@ -143,7 +143,7 @@ public final class SensorDataSet {
}
if (cyclingDistanceSpeed != null && cyclingDistanceSpeed.hasValue()) {
trackPoint.setSensorDistance(cyclingDistanceSpeed.getValue().getDistanceOverall());
trackPoint.setSensorDistance(cyclingDistanceSpeed.getValue().distanceOverall());
}
if (cyclingPower != null && cyclingPower.hasValue()) {