From 354d313fdf2592b3054d9822b639c2cc7538c70f Mon Sep 17 00:00:00 2001 From: Steffen Schaefer Date: Wed, 1 Feb 2017 08:57:00 +0100 Subject: [PATCH] Ensuring that better fallback fixes are always loaded for mark tracks (not only if there is no fix present at all) --- .../racelogtracking/impl/fixtracker/FixLoaderAndTracker.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/fixtracker/FixLoaderAndTracker.java b/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/fixtracker/FixLoaderAndTracker.java index ee119d28203..cc9b44a73e5 100644 --- a/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/fixtracker/FixLoaderAndTracker.java +++ b/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/fixtracker/FixLoaderAndTracker.java @@ -217,8 +217,8 @@ public class FixLoaderAndTracker implements TrackingDataLoader { Mark mark = (Mark) item; DynamicGPSFixTrack track = trackedRace.getOrCreateTrack(mark); // load all mapped fixes if there was no fix in the tracking TimeRange - final boolean loadAllMappedFixes = (track.getFirstRawFix() == null); - if (loadAllMappedFixes) { + GPSFix firstFixAfterStartOfTracking = track.getFirstFixAfter(trackingTimeRange.from()); + if(firstFixAfterStartOfTracking == null || firstFixAfterStartOfTracking.getTimePoint().after(trackingTimeRange.to())) { // either got an empty track of there is no mapping for the TimeRange of the race at all. // try again without constraining the mapping interval by start/end of tracking to at // least attempt to get fixes at all in case there were any within the device mapping interval specified