From daa78176755762e50e97b2717a675c29932cb61e Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Fri, 20 Oct 2017 17:14:56 +0200 Subject: [PATCH] aftermath to Simon's attempt to implement TrackedRace.getAverageOverGround Change-Id: Iedc37690ead0afcd69706d7fcb08910679b5adc6 --- .../sailing/domain/tracking/impl/TrackedRaceImpl.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) 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 add8320d1f7..f87d4bdca4d 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 @@ -4198,14 +4198,13 @@ public abstract class TrackedRaceImpl extends TrackedRaceWithWindEssentials impl 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 (leg != null && leg.hasStartedLeg(timePoint)) { + totalDistanceSailedInRace = totalDistanceSailedInRace.add(leg.getDistanceTraveled(timePoint)); + totalTimeSailedInRace = 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); + result = totalDistanceSailedInRace.inTime(totalTimeSailedInRace); } return result; }