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

Part of #970.

src/androidTest/java/de/dennisguse/opentracks/chart/ChartPointTest.java

@@ -78,7 +78,7 @@ public class ChartPointTest {
         // given
         TrackPoint trackPoint = TrackStubUtils.createDefaultTrackPoint();
         trackPoint.setHeartRate_bpm(100f);
-        trackPoint.setCyclingCadence_rpm(101f);
+        trackPoint.setCadence_rpm(101f);
         trackPoint.setPower(102f);
 
         TrackStatistics statistics = new TrackStatistics();

src/androidTest/java/de/dennisguse/opentracks/content/data/TestDataUtil.java

@@ -120,7 +120,7 @@ public class TestDataUtil {
         trackPoint.setSpeed(Speed.of(5f + (i / 10f)));
 
         trackPoint.setHeartRate_bpm(100f + i);
-        trackPoint.setCyclingCadence_rpm(300f + i);
+        trackPoint.setCadence_rpm(300f + i);
         trackPoint.setPower(400f + i);
         trackPoint.setAltitudeGain(ALTITUDE_GAIN);
         trackPoint.setAltitudeLoss(ALTITUDE_LOSS);

src/androidTest/java/de/dennisguse/opentracks/content/data/TestSensorDataUtil.java

@@ -17,7 +17,7 @@ public class TestSensorDataUtil {
         tp.setLatitude(TestDataUtil.INITIAL_LATITUDE + (double) i / 10000.0);
         tp.setLongitude(TestDataUtil.INITIAL_LONGITUDE - (double) i / 10000.0);
         tp.setHeartRate_bpm(hr);
-        tp.setCyclingCadence_rpm(cadence);
+        tp.setCadence_rpm(cadence);
         tp.setPower(power);
         tp.setHorizontalAccuracy(Distance.of(1f));
         tp.setAltitude(1f);

src/androidTest/java/de/dennisguse/opentracks/content/provider/CustomContentProviderUtilsTest.java

@@ -835,7 +835,7 @@ public class CustomContentProviderUtilsTest {
 
         TrackPoint trackPoint = TestDataUtil.createTrackPoint(5);
         trackPoint.setHeartRate_bpm(1F);
-        trackPoint.setCyclingCadence_rpm(2F);
+        trackPoint.setCadence_rpm(2F);
         trackPoint.setPower(3F);
 
         // when
@@ -845,7 +845,7 @@ public class CustomContentProviderUtilsTest {
         List<TrackPoint> trackPoints = TestDataUtil.getTrackPoints(contentProviderUtils, trackId);
         assertTrue(trackPoints.get(10).hasHeartRate());
         assertEquals(trackPoint.getHeartRate_bpm(), trackPoints.get(10).getHeartRate_bpm(), 0.01);
-        assertEquals(trackPoint.getCyclingCadence_rpm(), trackPoints.get(10).getCyclingCadence_rpm(), 0.01);
+        assertEquals(trackPoint.getCadence_rpm(), trackPoints.get(10).getCadence_rpm(), 0.01);
         assertEquals(trackPoint.getPower(), trackPoints.get(10).getPower(), 0.01);
     }
 
@@ -934,7 +934,7 @@ public class CustomContentProviderUtilsTest {
         TrackPoint trackPoint = TestDataUtil.createTrackPoint(1);
         trackPoint.setType(TrackPoint.Type.TRACKPOINT);
         trackPoint.setPower(null);
-        trackPoint.setCyclingCadence_rpm(null);
+        trackPoint.setCadence_rpm(null);
         trackPoint.setHeartRate_bpm(null);
         trackPointList.add(trackPoint);
         Track.Id trackId = new Track.Id(System.currentTimeMillis());

src/androidTest/java/de/dennisguse/opentracks/io/file/importer/TrackPointAssert.java

@@ -73,9 +73,9 @@ public class TrackPointAssert {
             Assert.assertEquals(expected.getPower(), actual.getPower(), delta);
         }
 
-        Assert.assertEquals(expected.hasCyclingCadence(), actual.hasCyclingCadence());
+        Assert.assertEquals(expected.hasCadence(), actual.hasCadence());
-        if (expected.hasCyclingCadence()) {
+        if (expected.hasCadence()) {
-            Assert.assertEquals(expected.getCyclingCadence_rpm(), actual.getCyclingCadence_rpm(), delta);
+            Assert.assertEquals(expected.getCadence_rpm(), actual.getCadence_rpm(), delta);
         }
     }
 

src/main/java/de/dennisguse/opentracks/chart/ChartPoint.java

@@ -41,8 +41,8 @@ public class ChartPoint {
         if (trackPoint.hasHeartRate()) {
             heartRate = (double) trackPoint.getHeartRate_bpm();
         }
-        if (trackPoint.hasCyclingCadence()) {
+        if (trackPoint.hasCadence()) {
-            cadence = (double) trackPoint.getCyclingCadence_rpm();
+            cadence = (double) trackPoint.getCadence_rpm();
         }
         if (trackPoint.hasPower()) {
             power = (double) trackPoint.getPower();

src/main/java/de/dennisguse/opentracks/content/data/TrackPoint.java

@@ -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() {
+    public boolean hasCadence() {
-        return cyclingCadence_rpm != null;
+        return cadence_rpm != null;
     }
 
-    public float getCyclingCadence_rpm() {
+    public float getCadence_rpm() {
-        return cyclingCadence_rpm;
+        return cadence_rpm;
     }
 
-    public TrackPoint setCyclingCadence_rpm(Float cyclingCadence_rpm) {
+    public TrackPoint setCadence_rpm(Float cadence_rpm) {
-        this.cyclingCadence_rpm = cyclingCadence_rpm;
+        this.cadence_rpm = cadence_rpm;
         return this;
     }
 

src/main/java/de/dennisguse/opentracks/content/provider/ContentProviderUtils.java

@@ -558,7 +558,7 @@ public class ContentProviderUtils {
             trackPoint.setHeartRate_bpm(cursor.getFloat(indexes.sensorHeartRateIndex));
         }
         if (!cursor.isNull(indexes.sensorCadenceIndex)) {
-            trackPoint.setCyclingCadence_rpm(cursor.getFloat(indexes.sensorCadenceIndex));
+            trackPoint.setCadence_rpm(cursor.getFloat(indexes.sensorCadenceIndex));
         }
         if (!cursor.isNull(indexes.sensorDistanceIndex)) {
             trackPoint.setSensorDistance(Distance.of(cursor.getFloat(indexes.sensorDistanceIndex)));
@@ -719,8 +719,8 @@ public class ContentProviderUtils {
         if (trackPoint.hasHeartRate()) {
             values.put(TrackPointsColumns.SENSOR_HEARTRATE, trackPoint.getHeartRate_bpm());
         }
-        if (trackPoint.hasCyclingCadence()) {
+        if (trackPoint.hasCadence()) {
-            values.put(TrackPointsColumns.SENSOR_CADENCE, trackPoint.getCyclingCadence_rpm());
+            values.put(TrackPointsColumns.SENSOR_CADENCE, trackPoint.getCadence_rpm());
         }
         if (trackPoint.hasSensorDistance()) {
             values.put(TrackPointsColumns.SENSOR_DISTANCE, trackPoint.getSensorDistance().toM());

src/main/java/de/dennisguse/opentracks/content/sensor/SensorDataSet.java

@@ -69,7 +69,7 @@ public final class SensorDataSet {
         }
 
         if (cyclingCadence != null && cyclingCadence.hasValue()) {
-            trackPoint.setCyclingCadence_rpm(cyclingCadence.getValue());
+            trackPoint.setCadence_rpm(cyclingCadence.getValue());
         }
 
         if (cyclingDistanceSpeed != null && cyclingDistanceSpeed.hasValue()) {
@@ -84,7 +84,7 @@ public final class SensorDataSet {
         if (runningDistanceSpeedCadence != null && runningDistanceSpeedCadence.hasValue()) {
             trackPoint.setSensorDistance(runningDistanceSpeedCadence.getValue().getDistance())
                     .setSpeed(runningDistanceSpeedCadence.getValue().getSpeed())
-                    .setCyclingCadence_rpm(runningDistanceSpeedCadence.getValue().getCadence());
+                    .setCadence_rpm(runningDistanceSpeedCadence.getValue().getCadence());
         }
     }
 

src/main/java/de/dennisguse/opentracks/io/file/exporter/GPXTrackExporter.java

@@ -285,7 +285,7 @@ public class GPXTrackExporter implements TrackExporter {
 
             printWriter.println("<time>" + StringUtils.formatDateTimeIso8601(trackPoint.getTime()) + "</time>");
 
-            if (trackPoint.hasSpeed() || trackPoint.hasHeartRate() || trackPoint.hasCyclingCadence() || trackPoint.hasAltitudeGain() || trackPoint.hasAltitudeLoss()) {
+            if (trackPoint.hasSpeed() || trackPoint.hasHeartRate() || trackPoint.hasCadence() || trackPoint.hasAltitudeGain() || trackPoint.hasAltitudeLoss()) {
                 printWriter.println("<extensions><gpxtpx:TrackPointExtension>");
 
                 if (trackPoint.hasSpeed()) {
@@ -296,8 +296,8 @@ public class GPXTrackExporter implements TrackExporter {
                     printWriter.println("<gpxtpx:hr>" + HEARTRATE_FORMAT.format(trackPoint.getHeartRate_bpm()) + "</gpxtpx:hr>");
                 }
 
-                if (trackPoint.hasCyclingCadence()) {
+                if (trackPoint.hasCadence()) {
-                    printWriter.println("<gpxtpx:cad>" + CADENCE_FORMAT.format(trackPoint.getCyclingCadence_rpm()) + "</gpxtpx:cad>");
+                    printWriter.println("<gpxtpx:cad>" + CADENCE_FORMAT.format(trackPoint.getCadence_rpm()) + "</gpxtpx:cad>");
                 }
 
                 if (trackPoint.hasPower()) {

src/main/java/de/dennisguse/opentracks/io/file/exporter/KMLTrackExporter.java

@@ -382,7 +382,7 @@ public class KMLTrackExporter implements TrackExporter {
 
             distanceList.add(trackPoint.hasSensorDistance() ? (float) trackPoint.getSensorDistance().toM() : null);
             heartRateList.add(trackPoint.hasHeartRate() ? trackPoint.getHeartRate_bpm() : null);
-            cadenceList.add(trackPoint.hasCyclingCadence() ? trackPoint.getCyclingCadence_rpm() : null);
+            cadenceList.add(trackPoint.hasCadence() ? trackPoint.getCadence_rpm() : null);
             powerList.add(trackPoint.hasPower() ? trackPoint.getPower() : null);
 
             altitudeGainList.add(trackPoint.hasAltitudeGain() ? trackPoint.getAltitudeGain() : null);

src/main/java/de/dennisguse/opentracks/io/file/importer/GpxTrackImporter.java

@@ -295,7 +295,7 @@ public class GpxTrackImporter extends DefaultHandler implements XMLImporter.Trac
 
         if (cadence != null) {
             try {
-                trackPoint.setCyclingCadence_rpm(Float.parseFloat(cadence));
+                trackPoint.setCadence_rpm(Float.parseFloat(cadence));
             } catch (Exception e) {
                 throw new ParsingException(createErrorMessage(String.format(Locale.US, "Unable to parse cadence: %s", cadence)), e);
             }

src/main/java/de/dennisguse/opentracks/io/file/importer/KmlTrackImporter.java

@@ -316,7 +316,7 @@ public class KmlTrackImporter extends DefaultHandler implements XMLImporter.Trac
                 trackPoint.setHeartRate_bpm(sensorHeartRateList.get(i));
             }
             if (i < sensorCadenceList.size()) {
-                trackPoint.setCyclingCadence_rpm(sensorCadenceList.get(i));
+                trackPoint.setCadence_rpm(sensorCadenceList.get(i));
             }
             if (i < sensorPowerList.size()) {
                 trackPoint.setPower(sensorPowerList.get(i));