diff --git a/CONTRIBUTE.md b/CONTRIBUTE.md
index 23e1580..8d6538e 100644
--- a/CONTRIBUTE.md
+++ b/CONTRIBUTE.md
@@ -11,6 +11,6 @@ The translations are managed on [Weblate](https://hosted.weblate.org/projects/tr
Help is very welcome. Be it in the form of code, or artwork, or enhancements to the website, or tutorial videos, or whatever.
**But please** suggest new features or enhancements in advance on the [Issue Tracker](https://github.com/y20k/trackbook/issues) before implementing them.
-### Credt for your contributions
-Contributors - like the main translators for a certain language - are listed as co-autors of this project in [AUTHORS.md](https://github.com/y20k/trackbook/blob/master/AUTHORS.md). Bonus: If you are on this list, you are automatically eligable for a free German beverage.
+### Credit for your contributions
+Contributors - like the main translators for a certain language - are listed as co-authors of this project in [AUTHORS.md](https://github.com/y20k/trackbook/blob/master/AUTHORS.md). Bonus: If you are on this list, you are automatically eligible for a free German beverage.
To be redeemed in Stuttgart.
\ No newline at end of file
diff --git a/app/src/main/java/org/y20k/trackbook/MainActivityTrackFragment.java b/app/src/main/java/org/y20k/trackbook/MainActivityTrackFragment.java
index 3f20473..8b22ff9 100644
--- a/app/src/main/java/org/y20k/trackbook/MainActivityTrackFragment.java
+++ b/app/src/main/java/org/y20k/trackbook/MainActivityTrackFragment.java
@@ -380,7 +380,7 @@ public class MainActivityTrackFragment extends Fragment implements AdapterView.O
mMinAltitudeView.setText(mTrack.getMinAltitudeString());
// show/hide elevation views depending on file format version
- if (mTrack.getTrackFormatVersion() > 1 || mTrack.getMinAltitude() > 0) {
+ if (mTrack.getTrackFormatVersion() > 1 && mTrack.getMinAltitude() > 0) {
// show elevation views
mElevationDataViews.setVisibility(View.VISIBLE);
} else {
diff --git a/app/src/main/java/org/y20k/trackbook/core/Track.java b/app/src/main/java/org/y20k/trackbook/core/Track.java
index 108307f..fd64700 100644
--- a/app/src/main/java/org/y20k/trackbook/core/Track.java
+++ b/app/src/main/java/org/y20k/trackbook/core/Track.java
@@ -189,12 +189,12 @@ public class Track implements TrackbookKeys, Parcelable {
/* Setter for negative elevation of recording (cumulative altitude difference) */
- public void setNegativeElevation(double megativeElevation) {
- mNegativeElevation = megativeElevation;
+ public void setNegativeElevation(double negativeElevation) {
+ mNegativeElevation = negativeElevation;
}
- /* Getter for file/track fornat version */
+ /* Getter for file/track format version */
public int getTrackFormatVersion() {
return mTrackFormatVersion;
}
diff --git a/app/src/main/java/org/y20k/trackbook/helpers/LogHelper.java b/app/src/main/java/org/y20k/trackbook/helpers/LogHelper.java
index 3c756ee..f16e999 100644
--- a/app/src/main/java/org/y20k/trackbook/helpers/LogHelper.java
+++ b/app/src/main/java/org/y20k/trackbook/helpers/LogHelper.java
@@ -26,7 +26,7 @@ import android.util.Log;
*/
public final class LogHelper {
- private final static boolean mTesting = false;
+ private final static boolean mTesting = true;
public static void d(final String tag, String message) {
// include logging only in debug versions
diff --git a/app/src/main/java/org/y20k/trackbook/helpers/StorageHelper.java b/app/src/main/java/org/y20k/trackbook/helpers/StorageHelper.java
index 87e22c5..f16f128 100644
--- a/app/src/main/java/org/y20k/trackbook/helpers/StorageHelper.java
+++ b/app/src/main/java/org/y20k/trackbook/helpers/StorageHelper.java
@@ -367,7 +367,7 @@ public class StorageHelper implements TrackbookKeys {
double positiveElevation = 0;
double negativeElevation = 0;
- if (track != null && track.getWayPoints().size() > 0 && track.getWayPointLocation(0).getAltitude() != 0) {
+ if (track != null && track.getWayPoints().size() > 0) {
double previousLocationHeight;
double currentLocationHeight;
long previousTimeStamp;
@@ -398,7 +398,8 @@ public class StorageHelper implements TrackbookKeys {
// check for new min and max heights
if (currentLocationHeight > maxAltitude) {
maxAltitude = currentLocationHeight;
- } else if (minAltitude == 0 || currentLocationHeight < minAltitude) {
+ }
+ if (minAltitude == 0 || currentLocationHeight < minAltitude) {
minAltitude = currentLocationHeight;
}
@@ -406,9 +407,11 @@ public class StorageHelper implements TrackbookKeys {
double altitudeDiff = currentLocationHeight - previousLocationHeight;
if (altitudeDiff > 0 && altitudeDiff < MEASUREMENT_ERROR_THRESHOLD * timeDiffFactor && currentLocationHeight != 0) {
positiveElevation = positiveElevation + altitudeDiff;
- } else if (altitudeDiff < 0 && altitudeDiff > -MEASUREMENT_ERROR_THRESHOLD * timeDiffFactor && currentLocationHeight != 0) {
+ }
+ if (altitudeDiff < 0 && altitudeDiff > -MEASUREMENT_ERROR_THRESHOLD * timeDiffFactor && currentLocationHeight != 0) {
negativeElevation = negativeElevation + altitudeDiff;
}
+
}
// store elevation data in track
@@ -422,18 +425,18 @@ public class StorageHelper implements TrackbookKeys {
/* Tries to smooth the elevation data using a low pass filter */
private Track lowPass(Track input, float dt, float rc) {
- /* The following code is adapted from https://en.wikipedia.org/wiki/Low-pass_filter
- *
- * // Return RC low-pass filter output samples, given input samples,
- * // time interval dt, and time constant RC
- * function lowpass(real[0..n] x, real dt, real RC)
- * var real[0..n] y
- * var real α := dt / (RC + dt)
- * y[0] := α * x[0]
- * for i from 1 to n
- * y[i] := α * x[i] + (1-α) * y[i-1]
- * return y
- */
+
+ // The following code is adapted from https://en.wikipedia.org/wiki/Low-pass_filter
+ //
+ // // Return RC low-pass filter output samples, given input samples,
+ // // time interval dt, and time constant RC
+ // function lowpass(real[0..n] x, real dt, real RC)
+ // var real[0..n] y
+ // var real α := dt / (RC + dt)
+ // y[0] := α * x[0]
+ // for i from 1 to n
+ // y[i] := α * x[i] + (1-α) * y[i-1]
+ // return y
// copy input track
Track output = new Track(input);
@@ -442,8 +445,8 @@ public class StorageHelper implements TrackbookKeys {
float alpha = dt / (rc + dt);
// set initial value for first waypoint
- double outputInitialAltituteValue = alpha * input.getWayPoints().get(0).getLocation().getAltitude();
- output.getWayPoints().get(0).getLocation().setAltitude(outputInitialAltituteValue);
+ double outputInitialAltitudeValue = alpha * input.getWayPoints().get(0).getLocation().getAltitude();
+ output.getWayPoints().get(0).getLocation().setAltitude(outputInitialAltitudeValue);
double inputCurrentAltitudeValue;
double outputPreviousAltitudeValue;
@@ -460,5 +463,4 @@ public class StorageHelper implements TrackbookKeys {
return output;
}
-
}
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 717466a..54ba268 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -55,7 +55,7 @@
android:layout_marginEnd="8dp"
android:clickable="true"
android:focusable="true"
- android:contentDescription="@string/descr_fab_sub_menu_button_1"
+ android:contentDescription="@string/descr_fab_sub_menu_label_1"
app:cardBackgroundColor="@color/trackbook_white"
app:cardCornerRadius="4dp"
app:cardElevation="4dp"
diff --git a/app/src/main/res/layout/fragment_main_map.xml b/app/src/main/res/layout/fragment_main_map.xml
index e1048dc..ef50963 100644
--- a/app/src/main/res/layout/fragment_main_map.xml
+++ b/app/src/main/res/layout/fragment_main_map.xml
@@ -8,7 +8,8 @@
android:layout_height="fill_parent"
tools:context=".MainActivityMapFragment">
-
diff --git a/app/src/main/res/layout/fragment_main_track_management.xml b/app/src/main/res/layout/fragment_main_track_management.xml
index 5df2fab..9e6085c 100644
--- a/app/src/main/res/layout/fragment_main_track_management.xml
+++ b/app/src/main/res/layout/fragment_main_track_management.xml
@@ -15,6 +15,7 @@
android:layout_marginEnd="8dp"
android:layout_marginStart="@dimen/activity_horizontal_margin"
android:layout_marginTop="4dp"
+ android:contentDescription="@string/descr_track_selector"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/export_button"
app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 8c8e7a8..5f994a3 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -2,11 +2,6 @@
Trackbook
- Infosheet
-
-
-
-
Karte
@@ -16,7 +11,6 @@
Trackbook ist inaktiv
Trackbook ist aktiv
Stopp
- (Ausblenden setzt Kartenansicht zurück)
Dauer
Entfernung
Status der Aufzeichnung
diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml
index e41731a..102ab12 100644
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@@ -2,11 +2,6 @@
Trackbook
- Infosheet
-
-
-
-
Peta
@@ -16,7 +11,6 @@
Trackbook aktif
Trackbook tidak aktif
Berhenti
- (geser untuk menghapus peta)
Durasi
Jarak
Movement Recording State
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index e710e04..dd7247a 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -2,11 +2,6 @@
Trackbook
- Scheda informativa
-
-
-
-
Mappa
@@ -16,7 +11,6 @@
Trackbook in esecuzione
Trackbook non in esecuzione
Stop
- (scorri per spostare la mappa)
Durata
Distanza
Stato registrazione
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 28a4d06..4e4b6b2 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -2,11 +2,6 @@
Trackbook
- 情報シート
-
-
-
-
地図
@@ -16,7 +11,6 @@
Trackbook 実行中
Trackbook は実行していません
停止
- (スワイプしてマップをクリア)
期間
距離
Movement Recording State
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index 7497b61..705d925 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -2,11 +2,6 @@
Trackbook
- Infoark
-
-
-
-
Kart
@@ -16,7 +11,6 @@
Trackbook kjører
Trackbook kjører ikke
Stopp
- (sveip for å tømme kart)
Varighet
Distanse
Bevegelsesopptakstilstand
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index a3c28f6..77a1460 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -2,11 +2,6 @@
Trackbook
- Informatieblad
-
-
-
-
Kaart
@@ -16,7 +11,6 @@
Trackbook is actief
Trackbook is niet actief
Stoppen
- (veeg om kaart te wissen)
Duur
Afstand
Movement Recording State
@@ -119,12 +113,12 @@
Waarde: duur
Waarde: beginnen met bijhouden
Waarde: stoppen met bijhouden
+ Waarde: hoogste wegpunt
+ Waarde: laagste wegpunt
+ Waarde: hoogte (heuvel-op)
+ Waarde: hoogte (heuvel-af)
Uitrolmenu voor verdere banen
Track export button
Baan - verwijderknop
-Waarde: hoogste wegpunt
- Waarde: laagste wegpunt
- Waarde: hoogte (heuvel-op)
- Waarde: hoogte (heuvel-af)
-
+
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2261bd8..06f33de 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2,11 +2,6 @@
Trackbook
- Info Sheet
-
-
-
-
Map
@@ -16,7 +11,6 @@
Trackbook running
Trackbook not running
Stop
- (swipe to clear map)
Duration
Distance
Movement Recording State