diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedRace.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedRace.java index d6d114e47ba..e113ab39083 100644 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedRace.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedRace.java @@ -1013,11 +1013,11 @@ public interface TrackedRace extends Serializable, IsManagedByCache getAttachedRaceLogs(); /** - * Computes the average speed over ground for a {@link Competitor} based on times and distances - * for all finished {@link TrackedLegOfCompetitor}s. - * - * @param timePoint time point up and until to compute the speed + * Computes the average speed over ground for a {@link Competitor} based on times and distances for all finished + * {@link TrackedLegOfCompetitor}s. + * + * @param timePoint + * time point up and until to compute the speed */ - Speed getAverageSpeedOverGround(Competitor competitor, TimePoint timePoint); - + Speed getAverageSpeedOverGround(Competitor competitor, TimePoint timePoint); } diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java index a93c22b0f4c..add8320d1f7 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java @@ -4193,20 +4193,20 @@ public abstract class TrackedRaceImpl extends TrackedRaceWithWindEssentials impl @Override public Speed getAverageSpeedOverGround(Competitor competitor, TimePoint timePoint) { - Speed result = null; - Duration totalTimeSailedInRace = Duration.NULL; - Distance totalDistanceSailedInRace = Distance.NULL; - for (TrackedLeg legGeneral : getTrackedLegs()) { - TrackedLegOfCompetitor leg = legGeneral.getTrackedLeg(competitor); - if (leg != null && leg.getTime(timePoint) != null) { - totalDistanceSailedInRace.add(leg.getDistanceTraveled(timePoint)); - totalTimeSailedInRace.plus(leg.getTime(timePoint)); - } - } - if (!totalTimeSailedInRace.equals(Duration.NULL) && !totalDistanceSailedInRace.equals(Distance.NULL)) { - result = new KnotSpeedImpl(totalDistanceSailedInRace.getMeters() / - totalTimeSailedInRace.asSeconds() / Mile.METERS_PER_NAUTICAL_MILE * 3600.0); - } - return result; + Speed result = null; + Duration totalTimeSailedInRace = Duration.NULL; + Distance totalDistanceSailedInRace = Distance.NULL; + for (TrackedLeg legGeneral : getTrackedLegs()) { + TrackedLegOfCompetitor leg = legGeneral.getTrackedLeg(competitor); + if (leg != null && leg.getTime(timePoint) != null) { + totalDistanceSailedInRace.add(leg.getDistanceTraveled(timePoint)); + totalTimeSailedInRace.plus(leg.getTime(timePoint)); + } + } + if (!totalTimeSailedInRace.equals(Duration.NULL) && !totalDistanceSailedInRace.equals(Distance.NULL)) { + result = new KnotSpeedImpl(totalDistanceSailedInRace.getMeters() / totalTimeSailedInRace.asSeconds() + / Mile.METERS_PER_NAUTICAL_MILE * 3600.0); + } + return result; } }