added column for correctedTimeAtEstimatedArrivalAtCompetitorFarthestAhead (see bug 2862)

java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/DetailType.java

@@ -43,7 +43,7 @@ public enum DetailType implements Serializable {
     RACE_TOTAL_POINTS(2, ASCENDING), REGATTA_TOTAL_POINTS(2, ASCENDING), REGATTA_TOTAL_POINTS_SUM(2, ASCENDING),
     RACE_RATIO_BETWEEN_TIME_SINCE_LAST_POSITION_FIX_AND_AVERAGE_SAMPLING_INTERVAL(1, ASCENDING), RACE_DISTANCE_TO_START_FIVE_SECONDS_BEFORE_RACE_START(1, ASCENDING),
     RACE_SPEED_OVER_GROUND_FIVE_SECONDS_BEFORE_START(2, DESCENDING),
-    RACE_CORRECTED_TIME_TRAVELED(0, ASCENDING),
+    RACE_CORRECTED_TIME_TRAVELED(0, ASCENDING), RACE_CORRECTED_TIME_AT_ESTIMATED_ARRIVAL_AT_COMPETITOR_FARTHEST_AHEAD(0, ASCENDING),
     RACE_TIME_TRAVELED(0, ASCENDING), RACE_TIME_TRAVELED_UPWIND(0, ASCENDING), RACE_TIME_TRAVELED_DOWNWIND(0, ASCENDING), RACE_TIME_TRAVELED_REACHING(0, ASCENDING),
     DISTANCE_TO_START_LINE(0, ASCENDING), BEAT_ANGLE(0, ASCENDING), COURSE_OVER_GROUND_TRUE_DEGREES(0, ASCENDING);
     

java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/LeaderboardEntryDTO.java

@@ -105,6 +105,13 @@ public class LeaderboardEntryDTO implements Serializable {
      * For one-design classes this equals the time spent in the race.
      */
     public Duration correctedTime;
+    
+    /**
+     * The corrections applied to the time and distance sailed when the competitor would have reached the
+     * competitor farthest ahead, based on average VMG on the current leg and equal performance to the boat
+     * farthest ahead for all subsequent legs.
+     */
+    public Duration correctedTimeAtEstimatedArrivalAtCompetitorFarthestAhead;
 
     /**
      * If <code>null</code>, no leg details are known yet, the race is not being tracked or the details
@@ -136,6 +143,8 @@ public class LeaderboardEntryDTO implements Serializable {
                 + ((gapToLeaderInOwnTime == null) ? 0 : gapToLeaderInOwnTime.hashCode());
         result = prime * result
                 + ((correctedTime == null) ? 0 : correctedTime.hashCode());
+        result = prime * result
+                + ((correctedTimeAtEstimatedArrivalAtCompetitorFarthestAhead == null) ? 0 : correctedTimeAtEstimatedArrivalAtCompetitorFarthestAhead.hashCode());
         result = prime * result
                 + ((averageSignedCrossTrackErrorInMeters == null) ? 0 : averageSignedCrossTrackErrorInMeters.hashCode());
         result = prime * result + (discarded ? 1231 : 1237);
@@ -194,6 +203,11 @@ public class LeaderboardEntryDTO implements Serializable {
                 return false;
         } else if (!correctedTime.equals(other.correctedTime))
             return false;
+        if (correctedTimeAtEstimatedArrivalAtCompetitorFarthestAhead == null) {
+            if (other.correctedTimeAtEstimatedArrivalAtCompetitorFarthestAhead != null)
+                return false;
+        } else if (!correctedTimeAtEstimatedArrivalAtCompetitorFarthestAhead.equals(other.correctedTimeAtEstimatedArrivalAtCompetitorFarthestAhead))
+            return false;
         if (averageAbsoluteCrossTrackErrorInMeters == null) {
             if (other.averageAbsoluteCrossTrackErrorInMeters != null)
                 return false;