From e8cbec829ffa2c9675b58c70295250a51d572357 Mon Sep 17 00:00:00 2001
From: Palmarino DiMarco <palmardimarco@icloud.com>
Date: Sun, 28 Apr 2024 20:55:05 -0400
Subject: [PATCH 1/2] Changed the average for leaderboard so that the number is
 summed separately from the rest of the data.

---
 .../AverageMovingSpeedLeaderboardFragment.java      | 13 ++++++++-----
 .../leaderboardFragment/LeaderboardFragment.java    | 10 ++++++++++
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/main/java/de/dennisguse/opentracks/ui/leaderboard/leaderboardFragment/AverageMovingSpeedLeaderboardFragment.java b/src/main/java/de/dennisguse/opentracks/ui/leaderboard/leaderboardFragment/AverageMovingSpeedLeaderboardFragment.java
index 52250470e..fb3ee944c 100644
--- a/src/main/java/de/dennisguse/opentracks/ui/leaderboard/leaderboardFragment/AverageMovingSpeedLeaderboardFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/ui/leaderboard/leaderboardFragment/AverageMovingSpeedLeaderboardFragment.java
@@ -20,13 +20,15 @@ protected List<Ranking> calculateLatestAverageRankingsData(List<LeaderboardPager
                 continue;
 
             if (!statsMap.containsKey(trackUser.nickname)) {
-                statsMap.put(trackUser.nickname, new SummedStatTrackUser(trackUser));
+                SummedStatTrackUser nextSummedStatTrackUser = new SummedStatTrackUser(trackUser);
+                nextSummedStatTrackUser.setScoreSum(nextSummedStatTrackUser.getPlaceHolderTrackUser().trackStatistics.getAverageMovingSpeed());
+                statsMap.put(trackUser.nickname, nextSummedStatTrackUser);
             }
             else {
                 SummedStatTrackUser existingRecord = statsMap.get(trackUser.nickname);
-                existingRecord.getPlaceHolderTrackUser().trackStatistics.setMaxSpeed(
-                        new Speed(existingRecord.getPlaceHolderTrackUser().trackStatistics.getAverageMovingSpeed().speed_mps()
-                                + trackUser.trackStatistics.getAverageMovingSpeed().speed_mps())
+                Speed oldSpeed = (Speed)existingRecord.getScoreSum();
+                existingRecord.setScoreSum(
+                        new Speed(oldSpeed.speed_mps() + trackUser.trackStatistics.getAverageMovingSpeed().speed_mps())
                 );
                 existingRecord.incrementSumFactorCount();
             }
@@ -100,7 +102,8 @@ private String getAverageMovingSpeedDisplay(Speed averageMovingSpeed) {
     }
 
     private Speed getAverageSpeedFromSummedStatTrackUser(SummedStatTrackUser summedStatTrackUser) {
-        return new Speed(summedStatTrackUser.getPlaceHolderTrackUser().trackStatistics.getAverageMovingSpeed().speed_mps() / summedStatTrackUser.getSumFactorCount());
+        Speed averageSpeed = (Speed)summedStatTrackUser.getScoreSum();
+        return new Speed(averageSpeed.speed_mps() / summedStatTrackUser.getSumFactorCount());
     }
 
     private class SortByAverageAverageMovingSpeed implements Comparator<SummedStatTrackUser> {
diff --git a/src/main/java/de/dennisguse/opentracks/ui/leaderboard/leaderboardFragment/LeaderboardFragment.java b/src/main/java/de/dennisguse/opentracks/ui/leaderboard/leaderboardFragment/LeaderboardFragment.java
index 316b27d12..aab2b71f1 100644
--- a/src/main/java/de/dennisguse/opentracks/ui/leaderboard/leaderboardFragment/LeaderboardFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/ui/leaderboard/leaderboardFragment/LeaderboardFragment.java
@@ -102,6 +102,8 @@ protected class SummedStatTrackUser {
         private LeaderboardPagerAdapter.PlaceHolderTrackUser placeHolderTrackUser;
         private int sumFactorCount;
 
+        private Object scoreSum;
+
         public SummedStatTrackUser(LeaderboardPagerAdapter.PlaceHolderTrackUser placeHolderTrackUser) {
             this.placeHolderTrackUser = placeHolderTrackUser;
             sumFactorCount = 1;
@@ -118,5 +120,13 @@ public int getSumFactorCount() {
         public void incrementSumFactorCount() {
             sumFactorCount++;
         }
+
+        public Object getScoreSum() {
+            return scoreSum;
+        }
+
+        public void setScoreSum(Object scoreSum) {
+            this.scoreSum = scoreSum;
+        }
     }
 }
\ No newline at end of file

From a12db3676eb7a11436c18e6a91fdeb4dc1b494c5 Mon Sep 17 00:00:00 2001
From: Palmarino DiMarco <palmardimarco@icloud.com>
Date: Sun, 28 Apr 2024 21:24:09 -0400
Subject: [PATCH 2/2] Patched all the LeaderboardFragment child classes so that
 they do not change the sent records

---
 .../AverageMovingSpeedLeaderboardFragment.java  |  2 +-
 .../DistanceLeaderboardFragment.java            | 13 ++++++++-----
 .../LeaderboardFragment.java                    |  5 +++++
 .../MovingTimeLeaderboardFragment.java          | 17 +++++++++--------
 4 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/src/main/java/de/dennisguse/opentracks/ui/leaderboard/leaderboardFragment/AverageMovingSpeedLeaderboardFragment.java b/src/main/java/de/dennisguse/opentracks/ui/leaderboard/leaderboardFragment/AverageMovingSpeedLeaderboardFragment.java
index fb3ee944c..71bba0269 100644
--- a/src/main/java/de/dennisguse/opentracks/ui/leaderboard/leaderboardFragment/AverageMovingSpeedLeaderboardFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/ui/leaderboard/leaderboardFragment/AverageMovingSpeedLeaderboardFragment.java
@@ -21,7 +21,7 @@ protected List<Ranking> calculateLatestAverageRankingsData(List<LeaderboardPager
 
             if (!statsMap.containsKey(trackUser.nickname)) {
                 SummedStatTrackUser nextSummedStatTrackUser = new SummedStatTrackUser(trackUser);
-                nextSummedStatTrackUser.setScoreSum(nextSummedStatTrackUser.getPlaceHolderTrackUser().trackStatistics.getAverageMovingSpeed());
+                nextSummedStatTrackUser.setScoreSum(new Speed(nextSummedStatTrackUser.getPlaceHolderTrackUser().trackStatistics.getAverageMovingSpeed().speed_mps()));
                 statsMap.put(trackUser.nickname, nextSummedStatTrackUser);
             }
             else {
diff --git a/src/main/java/de/dennisguse/opentracks/ui/leaderboard/leaderboardFragment/DistanceLeaderboardFragment.java b/src/main/java/de/dennisguse/opentracks/ui/leaderboard/leaderboardFragment/DistanceLeaderboardFragment.java
index c1cae3374..595724df9 100644
--- a/src/main/java/de/dennisguse/opentracks/ui/leaderboard/leaderboardFragment/DistanceLeaderboardFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/ui/leaderboard/leaderboardFragment/DistanceLeaderboardFragment.java
@@ -20,13 +20,15 @@ protected List<Ranking> calculateLatestAverageRankingsData(List<LeaderboardPager
                 continue;
 
             if (!statsMap.containsKey(trackUser.nickname)) {
-                statsMap.put(trackUser.nickname, new SummedStatTrackUser(trackUser));
+                SummedStatTrackUser nextSummedStatTrackUser = new SummedStatTrackUser(trackUser);
+                nextSummedStatTrackUser.setScoreSum(new Distance(nextSummedStatTrackUser.getPlaceHolderTrackUser().trackStatistics.getTotalDistance().distance_m()));
+                statsMap.put(trackUser.nickname, nextSummedStatTrackUser);
             }
             else {
                 SummedStatTrackUser existingRecord = statsMap.get(trackUser.nickname);
-                existingRecord.getPlaceHolderTrackUser().trackStatistics.setTotalDistance(
-                        new Distance(existingRecord.getPlaceHolderTrackUser().trackStatistics.getTotalDistance().distance_m()
-                                + trackUser.trackStatistics.getTotalDistance().distance_m())
+                Distance oldDistance = (Distance)existingRecord.getScoreSum();
+                existingRecord.setScoreSum(
+                        new Distance(oldDistance.distance_m() + trackUser.trackStatistics.getTotalDistance().distance_m())
                 );
                 existingRecord.incrementSumFactorCount();
             }
@@ -76,7 +78,8 @@ private String getDistanceDisplay(Distance distance) {
     }
 
     private Distance getAverageDistanceFromSummedStatTrackUser(SummedStatTrackUser summedStatTrackUser) {
-        return new Distance(summedStatTrackUser.getPlaceHolderTrackUser().trackStatistics.getTotalDistance().distance_m() / summedStatTrackUser.getSumFactorCount());
+        Distance distance = (Distance)summedStatTrackUser.getScoreSum();
+        return new Distance(distance.distance_m() / summedStatTrackUser.getSumFactorCount());
     }
 
     @Override
diff --git a/src/main/java/de/dennisguse/opentracks/ui/leaderboard/leaderboardFragment/LeaderboardFragment.java b/src/main/java/de/dennisguse/opentracks/ui/leaderboard/leaderboardFragment/LeaderboardFragment.java
index aab2b71f1..1d47eb8de 100644
--- a/src/main/java/de/dennisguse/opentracks/ui/leaderboard/leaderboardFragment/LeaderboardFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/ui/leaderboard/leaderboardFragment/LeaderboardFragment.java
@@ -109,6 +109,11 @@ public SummedStatTrackUser(LeaderboardPagerAdapter.PlaceHolderTrackUser placeHol
             sumFactorCount = 1;
         }
 
+        public SummedStatTrackUser(LeaderboardPagerAdapter.PlaceHolderTrackUser placeHolderTrackUser, Object scoreSum) {
+            this(placeHolderTrackUser);
+            setScoreSum(scoreSum);
+        }
+
         public LeaderboardPagerAdapter.PlaceHolderTrackUser getPlaceHolderTrackUser() {
             return placeHolderTrackUser;
         }
diff --git a/src/main/java/de/dennisguse/opentracks/ui/leaderboard/leaderboardFragment/MovingTimeLeaderboardFragment.java b/src/main/java/de/dennisguse/opentracks/ui/leaderboard/leaderboardFragment/MovingTimeLeaderboardFragment.java
index 1b7fd38e4..1dd9dab21 100644
--- a/src/main/java/de/dennisguse/opentracks/ui/leaderboard/leaderboardFragment/MovingTimeLeaderboardFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/ui/leaderboard/leaderboardFragment/MovingTimeLeaderboardFragment.java
@@ -18,12 +18,11 @@ protected List<Ranking> calculateLatestAverageRankingsData(List<LeaderboardPager
             if (!trackUser.socialAllow)
                 continue;
 
-            statsMap.computeIfAbsent(trackUser.nickname, k -> new SummedStatTrackUser(trackUser));
+            statsMap.computeIfAbsent(trackUser.nickname, k -> new SummedStatTrackUser(trackUser, trackUser.trackStatistics.getMovingTime().abs()));
             SummedStatTrackUser existingRecord = statsMap.get(trackUser.nickname);
-            existingRecord.getPlaceHolderTrackUser().trackStatistics.setMovingTime(
-                    existingRecord.getPlaceHolderTrackUser().trackStatistics.getMovingTime().plus(
-                            trackUser.trackStatistics.getMovingTime()
-                    )
+            Duration oldDuration = (Duration)existingRecord.getScoreSum();
+            existingRecord.setScoreSum(
+                    oldDuration.plus(trackUser.trackStatistics.getMovingTime())
             );
             existingRecord.incrementSumFactorCount();
         }
@@ -36,7 +35,8 @@ protected List<Ranking> calculateLatestAverageRankingsData(List<LeaderboardPager
         int consecutiveTies = 0;
         String lastScore = "";
         for (SummedStatTrackUser summedStatTrackUser : latestSummedLeaderboardData) {
-            Duration averageMovingTime = summedStatTrackUser.getPlaceHolderTrackUser().trackStatistics.getMovingTime().dividedBy(summedStatTrackUser.getSumFactorCount());
+            Duration totalMovingTime = (Duration)summedStatTrackUser.getScoreSum();
+            Duration averageMovingTime = totalMovingTime.dividedBy(summedStatTrackUser.getSumFactorCount());
             Ranking nextRanking = new Ranking(
                     ++rank,
                     summedStatTrackUser.getPlaceHolderTrackUser().nickname,
@@ -58,8 +58,9 @@ protected List<Ranking> calculateLatestAverageRankingsData(List<LeaderboardPager
     private class SortByAverageMovingTime implements Comparator<SummedStatTrackUser> {
         @Override
         public int compare(SummedStatTrackUser user1, SummedStatTrackUser user2) {
-            return user2.getPlaceHolderTrackUser().trackStatistics.getMovingTime().compareTo(
-                    user1.getPlaceHolderTrackUser().trackStatistics.getMovingTime());
+            Duration user1MovingTime = (Duration) user1.getScoreSum();
+            Duration user2MovingTime = (Duration) user2.getScoreSum();
+            return user2MovingTime.compareTo(user1MovingTime);
         }
     }