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

Rename TrackPoint's cycling cadence to cadence as it may contain running data.

Browse Source 
Part of #970.
This commit is contained in:
Dennis Guse
2021-10-14 07:22:39 +02:00
parent 083b620e41
commit 45571c68c9
13 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/de/dennisguse/opentracks/content/data/TrackPoint.java
+8 -8
View File
@@ -91,7 +91,7 @@ public class TrackPoint {
private Type type;
private Float heartRate_bpm = null;
private Float cyclingCadence_rpm = null;
private Float cadence_rpm = null;
private Float power = null;
private Float altitudeGain_m = null;
private Float altitudeLoss_m = null;
@@ -363,7 +363,7 @@ public class TrackPoint {
}
public boolean hasSensorData() {
return hasHeartRate() || hasCyclingCadence() || hasPower();
return hasHeartRate() || hasCadence() || hasPower();
}
public boolean hasHeartRate() {
@@ -379,16 +379,16 @@ public class TrackPoint {
return this;
}
public boolean hasCyclingCadence() {
return cyclingCadence_rpm != null;
public boolean hasCadence() {
return cadence_rpm != null;
}
public float getCyclingCadence_rpm() {
return cyclingCadence_rpm;
public float getCadence_rpm() {
return cadence_rpm;
}
public TrackPoint setCyclingCadence_rpm(Float cyclingCadence_rpm) {
this.cyclingCadence_rpm = cyclingCadence_rpm;
public TrackPoint setCadence_rpm(Float cadence_rpm) {
this.cadence_rpm = cadence_rpm;
return this;
}