eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-28 14:57:12 +00:00
Code Activity

fixing merge issues

Browse Source 
Change-Id: I4ce8b348313004ecc8a74e668eacad07a5f30d9b
This commit is contained in:
Axel Uhl committed 2015-12-11 16:40:04 +01:00
1 parent 0dbd65f20e
commit 445303f5c9
1 file changed
+3 -3
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMap.java
+3 -3
View File
@@ -918,10 +918,10 @@ public class RaceMap extends AbsolutePanel implements TimeListener, CompetitorSe
Map<CompetitorDTO, List<GPSFixDTO>> boatData = raceMapDataDTO.boatPositions; Map<CompetitorDTO, List<GPSFixDTO>> boatData = raceMapDataDTO.boatPositions;
fixesAndTails.updateFixes(boatData, hasTailOverlapForCompetitor, RaceMap.this, transitionTimeInMillis); fixesAndTails.updateFixes(boatData, hasTailOverlapForCompetitor, RaceMap.this, transitionTimeInMillis);
Iterable<CompetitorDTO> competitorsForWhichNewFixesWereReveiced = Iterable<CompetitorDTO> competitorsForWhichNewFixesWereReveiced =
fixesAndTails.updateFixes(boatData, hasTailOverlapForCompetitor, RaceMap.this, timeForPositionTransitionMillis); fixesAndTails.updateFixes(boatData, hasTailOverlapForCompetitor, RaceMap.this, transitionTimeInMillis);
if (!Util.isEmpty(competitorsForWhichNewFixesWereReveiced)) { if (!Util.isEmpty(competitorsForWhichNewFixesWereReveiced)) {
showBoatsOnMap(newTime, timeForPositionTransitionMillis, competitorsForWhichNewFixesWereReveiced); showBoatsOnMap(newTime, transitionTimeInMillis, competitorsForWhichNewFixesWereReveiced);
showCompetitorInfoOnMap(newTime, timeForPositionTransitionMillis, competitorSelection.getSelectedFilteredCompetitors()); showCompetitorInfoOnMap(newTime, transitionTimeInMillis, competitorSelection.getSelectedFilteredCompetitors());
// even though the wind data is retrieved by a separate call, re-draw the advantage line because it needs to // even though the wind data is retrieved by a separate call, re-draw the advantage line because it needs to
// adjust to new boat positions // adjust to new boat positions
showAdvantageLine(competitorsToShow, newTime, transitionTimeInMillis); showAdvantageLine(competitorsToShow, newTime, transitionTimeInMillis);