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

Update stats waypoint calorie when changing activity type

Browse Source
This commit is contained in:
Jimmy Shih
2013-11-19 13:24:40 -08:00
parent ca290bf664
commit 2571247829
7 changed files with 149 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracksLib/src/com/google/android/apps/mytracks/content/MyTracksProviderUtilsImpl.java
+6 -1
View File
@@ -394,6 +394,7 @@ public class MyTracksProviderUtilsImpl implements MyTracksProviderUtils {
int elevationGainIndex = cursor.getColumnIndexOrThrow(WaypointsColumns.ELEVATIONGAIN);
int minGradeIndex = cursor.getColumnIndexOrThrow(WaypointsColumns.MINGRADE);
int maxGradeIndex = cursor.getColumnIndexOrThrow(WaypointsColumns.MAXGRADE);
int calorieIndex = cursor.getColumnIndexOrThrow(WaypointsColumns.CALORIE);
int photoUrlIndex = cursor.getColumnIndexOrThrow(WaypointsColumns.PHOTOURL);
Waypoint waypoint = new Waypoint();
@@ -496,7 +497,10 @@ public class MyTracksProviderUtilsImpl implements MyTracksProviderUtils {
tripStatistics.setMaxGrade(cursor.getFloat(maxGradeIndex));
hasTripStatistics = true;
}
if (!cursor.isNull(calorieIndex)) {
tripStatistics.setCalorie(cursor.getFloat(calorieIndex));
hasTripStatistics = true;
}
if (hasTripStatistics) {
waypoint.setTripStatistics(tripStatistics);
}
@@ -739,6 +743,7 @@ public class MyTracksProviderUtilsImpl implements MyTracksProviderUtils {
values.put(WaypointsColumns.ELEVATIONGAIN, tripStatistics.getTotalElevationGain());
values.put(WaypointsColumns.MINGRADE, tripStatistics.getMinGrade());
values.put(WaypointsColumns.MAXGRADE, tripStatistics.getMaxGrade());
values.put(WaypointsColumns.CALORIE, tripStatistics.getCalorie());
}
values.put(WaypointsColumns.PHOTOURL, waypoint.getPhotoUrl());
MyTracksLib/src/com/google/android/apps/mytracks/content/TracksColumns.java
+2 -2
View File
@@ -124,7 +124,7 @@ public interface TracksColumns extends BaseColumns {
+ MODIFIEDTIME + " INTEGER, " // modified time
+ SHAREDWITHME + " INTEGER, " // shared with me
+ SHAREDOWNER + " STRING, " // shared owner
+ CALORIE + " INTEGER);"; // calorie
+ CALORIE + " FLOAT);"; // calorie
public static final String[] COLUMNS = { _ID, // id
NAME, // name
@@ -190,6 +190,6 @@ public interface TracksColumns extends BaseColumns {
ContentTypeIds.LONG_TYPE_ID, // modified time
ContentTypeIds.BOOLEAN_TYPE_ID, // shared with me
ContentTypeIds.STRING_TYPE_ID, // shared owner
ContentTypeIds.INT_TYPE_ID // calorie
ContentTypeIds.FLOAT_TYPE_ID // calorie
};
}
MyTracksLib/src/com/google/android/apps/mytracks/content/WaypointsColumns.java
+5 -1
View File
@@ -70,7 +70,8 @@ public interface WaypointsColumns extends BaseColumns {
public static final String ELEVATIONGAIN = "elevationgain"; // elevation gain
public static final String MINGRADE = "mingrade"; // min grade
public static final String MAXGRADE = "maxgrade"; // max grade
public static final String CALORIE = "calorie"; // calorie
public static final String PHOTOURL = "photoUrl"; // url for the photo
public static final String CREATE_TABLE = "CREATE TABLE " + TABLE_NAME + " ("
@@ -104,6 +105,7 @@ public interface WaypointsColumns extends BaseColumns {
+ ELEVATIONGAIN + " FLOAT, "
+ MINGRADE + " FLOAT, "
+ MAXGRADE + " FLOAT, "
+ CALORIE + " FLOAT, "
+ PHOTOURL + " STRING"
+ ");";
@@ -138,6 +140,7 @@ public interface WaypointsColumns extends BaseColumns {
ELEVATIONGAIN,
MINGRADE,
MAXGRADE,
CALORIE,
PHOTOURL
};
@@ -172,6 +175,7 @@ public interface WaypointsColumns extends BaseColumns {
FLOAT_TYPE_ID, // elevation gain
FLOAT_TYPE_ID, // min grade
FLOAT_TYPE_ID, // max grade
FLOAT_TYPE_ID, // calorie
STRING_TYPE_ID // photo url
};
}