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

Altitude gain/loss: start with null instead of 0f.

Browse Source
This commit is contained in:
Dennis Guse
2021-06-27 21:07:24 +02:00
parent 6bb85227ac
commit 4c8e87614f
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/de/dennisguse/opentracks/services/sensors/AltitudeSumManager.java
+9 -5
View File
@@ -25,8 +25,8 @@ public class AltitudeSumManager implements SensorEventListener {
private float lastSeenSensorValue_hPa; private float lastSeenSensorValue_hPa;
private float altitudeGain_m; private Float altitudeGain_m;
private float altitudeLoss_m; private Float altitudeLoss_m;
public void start(Context context) { public void start(Context context) {
SensorManager sensorManager = (SensorManager) context.getSystemService(Context.SENSOR_SERVICE); SensorManager sensorManager = (SensorManager) context.getSystemService(Context.SENSOR_SERVICE);
@@ -74,8 +74,8 @@ public class AltitudeSumManager implements SensorEventListener {
public void reset() { public void reset() {
Log.d(TAG, "Reset"); Log.d(TAG, "Reset");
altitudeGain_m = 0; altitudeGain_m = null;
altitudeLoss_m = 0; altitudeLoss_m = null;
} }
@Override @Override
@@ -102,8 +102,12 @@ public class AltitudeSumManager implements SensorEventListener {
PressureSensorUtils.AltitudeChange altitudeChange = PressureSensorUtils.computeChangesWithSmoothing_m(lastAcceptedPressureValue_hPa, lastSeenSensorValue_hPa, value_hPa); PressureSensorUtils.AltitudeChange altitudeChange = PressureSensorUtils.computeChangesWithSmoothing_m(lastAcceptedPressureValue_hPa, lastSeenSensorValue_hPa, value_hPa);
if (altitudeChange != null) { if (altitudeChange != null) {
altitudeGain_m += altitudeChange.getAltitudeGain_m(); altitudeGain_m = altitudeGain_m != null ? altitudeGain_m : 0;
altitudeGain_m = altitudeChange.getAltitudeGain_m();
altitudeLoss_m = altitudeLoss_m != null ? altitudeLoss_m : 0;
altitudeLoss_m += altitudeChange.getAltitudeLoss_m(); altitudeLoss_m += altitudeChange.getAltitudeLoss_m();
lastAcceptedPressureValue_hPa = altitudeChange.getCurrentSensorValue_hPa(); lastAcceptedPressureValue_hPa = altitudeChange.getCurrentSensorValue_hPa();
} }