From 751834a13699a8d4cac90b94bf2530fa01a6f731 Mon Sep 17 00:00:00 2001 From: Simon Pamies Date: Mon, 13 Jun 2011 15:01:53 +0200 Subject: [PATCH 01/28] Fixed positioning of finished and started for top --- python/src/sailing.web/sailing/web/browser/functions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/src/sailing.web/sailing/web/browser/functions.py b/python/src/sailing.web/sailing/web/browser/functions.py index 580c922a719..33131e84b38 100644 --- a/python/src/sailing.web/sailing/web/browser/functions.py +++ b/python/src/sailing.web/sailing/web/browser/functions.py @@ -501,7 +501,7 @@ def adminLiveData(context, request): results += '\nLAST SHOWRACE CALL: %s (UPCOUNT PARAM: %s)\nLEG: %s (FROM: %s TO: %s)\nRACE-START: %s NEWEST EVENT: %s WIND: (%s %s %s)\n' % (t_up, t_upcount, legpos+1, competitors[0].marknames[racepos][legpos][0], competitors[0].marknames[racepos][legpos][1], view.millisToDatetime(race.start), view.millisToDatetime(race.timeofnewestevent), race.wind_source, race.wind_bearing, race.wind_speed) results += 'NAME'.ljust(16) + 'TOTAL'.ljust(7) + 'CRANK'.ljust(7) + 'RRANK'.ljust(7) - results += 'MRANK'.ljust(7) + 'LRANK'.ljust(9) + 'SPD'.ljust(9) + 'DSTTRV'.ljust(9) + 'VMG'.ljust(9) + 'AVMG'.ljust(9) + 'SGAP'.ljust(9) + 'ETA'.ljust(9) + 'DSTGO'.ljust(9) + 'FINISHD'.ljust(9) + 'STARTD'.ljust(9) + 'UPDOWNWIND'.ljust(12) + results += 'MRANK'.ljust(7) + 'LRANK'.ljust(9) + 'SPD'.ljust(9) + 'DSTTRV'.ljust(9) + 'VMG'.ljust(9) + 'AVMG'.ljust(9) + 'SGAP'.ljust(9) + 'ETA'.ljust(9) + 'DSTGO'.ljust(9) + 'STARTD'.ljust(9) + 'FINISHD'.ljust(9) + 'UPDOWNWIND'.ljust(12) results += '\n' # sort competitors by rank in current leg From e2d726b543d6e0e0143d7527f30ba04829545518 Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Mon, 13 Jun 2011 15:20:22 +0200 Subject: [PATCH 02/28] added more items, cleaned completed ones --- TODO | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/TODO b/TODO index 42939d75cf2..d1bbdefed7c 100644 --- a/TODO +++ b/TODO @@ -2,7 +2,15 @@ Axel ==== - - Implement and test course update with corresponding TrackedLeg[OfCompetitor] updates + - track time of last event and return in showrace output + + - What about distance traveled in first leg? It seems to jump too high at the beginning. + + - Test duplicate addrace for the same race; consider cleaning cache when stopRace/stopEvent is invoked + + - Test duplicate addevent for the same event + + - smoothen / dampen VMG and hence the ETA / sGAP - Open test server firewall ports for UDP / Expedition wind integration @@ -10,10 +18,6 @@ Axel - Set up two Expedition machines with RF and UMTS transmission, test killing one - - Test duplicate addrace for the same race; consider cleaning cache when stopRace/stopEvent is invoked - - - Test duplicate addevent for the same event - - Test fail-over in case one of the two Java VM fails - enable switching between our and TracTrac-provided leaderboard information From 5354ba7e3f939c8ea03737c74e2c676295d4df2c Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Mon, 13 Jun 2011 15:28:30 +0200 Subject: [PATCH 03/28] added getTimePointOfLastEvent --- .../src/com/sap/sailing/domain/tracking/TrackedRace.java | 9 +++++++-- .../sailing/domain/tracking/impl/TrackedRaceImpl.java | 7 +++++++ .../expeditionconnector/test/MockedTrackedRace.java | 6 ++++++ .../src/com/sap/sailing/server/ModeratorApp.java | 2 ++ 4 files changed, 22 insertions(+), 2 deletions(-) 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 938d5893da4..a1011444d14 100755 --- 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 @@ -137,8 +137,7 @@ public interface TrackedRace { WindTrack getWindTrack(WindSource windSource); /** - * Waits until {@link #getUpdateCount()} is after since. - * @param sinceUpdate TODO + * Waits until {@link #getUpdateCount()} is after sinceUpdate. */ void waitForNextUpdate(int sinceUpdate) throws InterruptedException; @@ -149,4 +148,10 @@ public interface TrackedRace { NavigableSet getMarkPassings(Competitor competitor); void removeWind(Wind wind, WindSource windSource); + + /** + * Time stamp that the last event received from the underlying push service carried on it. + * Note that these times may not increase monotonically. + */ + TimePoint getTimePointOfLastEvent(); } 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 82bfdc9a240..805451641d6 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 @@ -46,6 +46,7 @@ public abstract class TrackedRaceImpl implements TrackedRace, CourseListener { private TimePoint start; private TimePoint finish; private TimePoint timePointOfNewestEvent; + private TimePoint timePointOfLastEvent; private int updateCount; private final Map> competitorRankings; @@ -352,6 +353,11 @@ public abstract class TrackedRaceImpl implements TrackedRace, CourseListener { public TimePoint getTimePointOfNewestEvent() { return timePointOfNewestEvent; } + + @Override + public TimePoint getTimePointOfLastEvent() { + return timePointOfLastEvent; + } /** * @param timeOfEvent may be null meaning to only unblock waiters but not update any time points @@ -366,6 +372,7 @@ public abstract class TrackedRaceImpl implements TrackedRace, CourseListener { if (startOfTracking == null || startOfTracking.compareTo(timeOfEvent) > 0) { startOfTracking = timeOfEvent; } + timePointOfLastEvent = timeOfEvent; } notifyAll(); } diff --git a/java/com.sap.sailing.expeditionconnector.test/src/com/sap/sailing/expeditionconnector/test/MockedTrackedRace.java b/java/com.sap.sailing.expeditionconnector.test/src/com/sap/sailing/expeditionconnector/test/MockedTrackedRace.java index 59df8765486..70290f97256 100755 --- a/java/com.sap.sailing.expeditionconnector.test/src/com/sap/sailing/expeditionconnector/test/MockedTrackedRace.java +++ b/java/com.sap.sailing.expeditionconnector.test/src/com/sap/sailing/expeditionconnector/test/MockedTrackedRace.java @@ -243,4 +243,10 @@ public class MockedTrackedRace implements DynamicTrackedRace { } + @Override + public TimePoint getTimePointOfLastEvent() { + // TODO Auto-generated method stub + return null; + } + } diff --git a/java/com.sap.sailing.server/src/com/sap/sailing/server/ModeratorApp.java b/java/com.sap.sailing.server/src/com/sap/sailing/server/ModeratorApp.java index ed57a4539a7..f9e395e6ebd 100755 --- a/java/com.sap.sailing.server/src/com/sap/sailing/server/ModeratorApp.java +++ b/java/com.sap.sailing.server/src/com/sap/sailing/server/ModeratorApp.java @@ -200,6 +200,8 @@ public class ModeratorApp extends Servlet { .asMillis()); jsonRace.put("timeofnewestevent", trackedRace.getTimePointOfNewestEvent() == null ? 0l : trackedRace .getTimePointOfNewestEvent().asMillis()); + jsonRace.put("timeoflastevent", trackedRace.getTimePointOfLastEvent() == null ? 0l : trackedRace + .getTimePointOfLastEvent().asMillis()); jsonRace.put("updatecount", trackedRace.getUpdateCount()); Position positionForWind = null; TrackedLeg currentLeg = trackedRace.getCurrentLeg(timePoint); From a9cf3b0f8dc6386b9efd632d9cc1f237a6465d2e Mon Sep 17 00:00:00 2001 From: Simon Pamies Date: Mon, 13 Jun 2011 16:40:02 +0200 Subject: [PATCH 04/28] Leaderboard with emptied values; toggle of race and mark working --- .../web/browser/templates/leaderboard-live.pt | 1450 +++++------------ 1 file changed, 374 insertions(+), 1076 deletions(-) diff --git a/python/src/sailing.web/sailing/web/browser/templates/leaderboard-live.pt b/python/src/sailing.web/sailing/web/browser/templates/leaderboard-live.pt index a7b196c15e3..fc1207d6f98 100644 --- a/python/src/sailing.web/sailing/web/browser/templates/leaderboard-live.pt +++ b/python/src/sailing.web/sailing/web/browser/templates/leaderboard-live.pt @@ -41,222 +41,222 @@ - 1 + - GER10 + - EVANS + - 2 + - GBR12 + - ALONSO + - 3 + - AUS15 + - ALONSO + - 4 + - AUS1 + - BROTHERTHOl + - 5 + - IND66 + - ASQUITH + - 6 + - SUI 89 + - CZAJKOWSKI + - 7 + - NZL878 + - NIELSEN + - 8 + - USA23 + - NIELSEN + - 9 + - GBR25 + - PIASECKI + - 10 + - AUS34 + - FONSECA + - 11 + - GER34 + - GRAEL + - 12 + - GER2 + - NORREGAARD + - 13 + - GBR45 + - LANG + - 14 + - AUS26 + - KOSTOV + - 15 + - SWE87 + - CUPAC + - 16 + - NOR3 + - STORCK + - 17 + - GBR9 + - MOORE + - 18 + - SUI28 + - DELLE + - 19 + - DEN234 + - RESCH + - 20 + - GER666 + - DRAPER + @@ -270,72 +270,34 @@ + -
+ +
- +
    -
  • - 1 -
    • -
  • - 2 -
    • -
  • - 3 -
    • -
  • - 4 -
    • -
  • - 5 -
    • -
  • - 6 -
    • -
  • - 7 -
    • -
  • - 8 -
    • -
  • - 9 -
    • -
  • - 10 -
    • -
  • - 11 -
    • -
  • - 12 -
    • -
  • - 13 -
    • -
  • - 14 -
    • -
  • - 15 -
    • -
  • - 16 -
    • -
  • - 17 -
    • -
  • - 18 -
    • -
  • - 19 -
    • -
  • - 20 -
    • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
1 @@ -346,133 +308,53 @@
M1 - +
    -
  • - 1 -
    • -
  • - 2 -
    • -
  • - 3 -
    • -
  • - 4 -
    • -
  • - 5 -
    • -
  • - 6 -
    • -
  • - 7 -
    • -
  • - 8 -
    • -
  • - 9 -
    • -
  • - 10 -
    • -
  • - 11 -
    • -
  • - 12 -
    • -
  • - 13 -
    • -
  • - 14 -
    • -
  • - 15 -
    • -
  • - 16 -
    • -
  • - 17 -
    • -
  • - 18 -
    • -
  • - 19 -
    • -
  • - 20 -
    • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
    -
  • - 1 -
    • -
  • - 2 -
    • -
  • - 3 -
    • -
  • - 4 -
    • -
  • - 5 -
    • -
  • - 6 -
    • -
  • - 7 -
    • -
  • - 8 -
    • -
  • - 9 -
    • -
  • - 10 -
    • -
  • - 11 -
    • -
  • - 12 -
    • -
  • - 13 -
    • -
  • - 14 -
    • -
  • - 15 -
    • -
  • - 16 -
    • -
  • - 17 -
    • -
  • - 18 -
    • -
  • - 19 -
    • -
  • - 20 -
    • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
@@ -516,342 +398,342 @@ - 1 +   - 30 +   - 20 +   - 50 +   - 10 +   - 2 +   - 31 +   - 21 +   - 51 +   - 11 +   - 3 +   - 32 +   - 22 +   - 52 +   - 12 +   - 4 +   - 33 +   - 23 +   - 53 +   - 13 +   - 5 +   - 34 +   - 24 +   - 54 +   - 14 +   - 6 +   - 35 +   - 25 +   - 55 +   - 15 +   - 7 +   - 36 +   - 26 +   - 56 +   - 16 +   - 8 +   - 37 +   - 27 +   - 57 +   - 17 +   - 9 +   - 38 +   - 28 +   - 58 +   - 18 +   - 10 +   - 39 +   - 29 +   - 59 +   - 19 +   - 11 +   - 40 +   - 30 +   - 60 +   - 20 +   - 12 +   - 41 +   - 31 +   - 61 +   - 21 +   - 13 +   - 42 +   - 32 +   - 62 +   - 22 +   - 14 +   - 43 +   - 33 +   - 63 +   - 23 +   - 15 +   - 44 +   - 34 +   - 64 +   - 24 +   - 16 +   - 45 +   - 35 +   - 65 +   - 25 +   - 17 +   - 46 +   - 36 +   - 66 +   - 26 +   - 18 +   - 47 +   - 37 +   - 67 +   - 27 +   - 19 +   - 48 +   - 38 +   - 68 +   - 28 +   - 20 +   - 49 +   - 39 +   - 69 +   - 29 +   @@ -864,66 +746,26 @@
    -
  • - 1 -
    • -
  • - 2 -
    • -
  • - 3 -
    • -
  • - 4 -
    • -
  • - 5 -
    • -
  • - 6 -
    • -
  • - 7 -
    • -
  • - 8 -
    • -
  • - 9 -
    • -
  • - 10 -
    • -
  • - 11 -
    • -
  • - 12 -
    • -
  • - 13 -
    • -
  • - 14 -
    • -
  • - 15 -
    • -
  • - 16 -
    • -
  • - 17 -
    • -
  • - 18 -
    • -
  • - 19 -
    • -
  • - 20 -
    • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
@@ -934,66 +776,26 @@
    -
  • - 1 -
    • -
  • - 2 -
    • -
  • - 3 -
    • -
  • - 4 -
    • -
  • - 5 -
    • -
  • - 6 -
    • -
  • - 7 -
    • -
  • - 8 -
    • -
  • - 9 -
    • -
  • - 10 -
    • -
  • - 11 -
    • -
  • - 12 -
    • -
  • - 13 -
    • -
  • - 14 -
    • -
  • - 15 -
    • -
  • - 16 -
    • -
  • - 17 -
    • -
  • - 18 -
    • -
  • - 19 -
    • -
  • - 20 -
    • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
@@ -1004,66 +806,26 @@
    -
  • - 1 -
    • -
  • - 2 -
    • -
  • - 3 -
    • -
  • - 4 -
    • -
  • - 5 -
    • -
  • - 6 -
    • -
  • - 7 -
    • -
  • - 8 -
    • -
  • - 9 -
    • -
  • - 10 -
    • -
  • - 11 -
    • -
  • - 12 -
    • -
  • - 13 -
    • -
  • - 14 -
    • -
  • - 15 -
    • -
  • - 16 -
    • -
  • - 17 -
    • -
  • - 18 -
    • -
  • - 19 -
    • -
  • - 20 -
    • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
@@ -1074,66 +836,26 @@
    -
  • - 1 -
    • -
  • - 2 -
    • -
  • - 3 -
    • -
  • - 4 -
    • -
  • - 5 -
    • -
  • - 6 -
    • -
  • - 7 -
    • -
  • - 8 -
    • -
  • - 9 -
    • -
  • - 10 -
    • -
  • - 11 -
    • -
  • - 12 -
    • -
  • - 13 -
    • -
  • - 14 -
    • -
  • - 15 -
    • -
  • - 16 -
    • -
  • - 17 -
    • -
  • - 18 -
    • -
  • - 19 -
    • -
  • - 20 -
    • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
@@ -1144,66 +866,26 @@
    -
  • - 1 -
    • -
  • - 2 -
    • -
  • - 3 -
    • -
  • - 4 -
    • -
  • - 5 -
    • -
  • - 6 -
    • -
  • - 7 -
    • -
  • - 8 -
    • -
  • - 9 -
    • -
  • - 10 -
    • -
  • - 11 -
    • -
  • - 12 -
    • -
  • - 13 -
    • -
  • - 14 -
    • -
  • - 15 -
    • -
  • - 16 -
    • -
  • - 17 -
    • -
  • - 18 -
    • -
  • - 19 -
    • -
  • - 20 -
    • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
@@ -1214,66 +896,26 @@
    -
  • - 1 -
    • -
  • - 2 -
    • -
  • - 3 -
    • -
  • - 4 -
    • -
  • - 5 -
    • -
  • - 6 -
    • -
  • - 7 -
    • -
  • - 8 -
    • -
  • - 9 -
    • -
  • - 10 -
    • -
  • - 11 -
    • -
  • - 12 -
    • -
  • - 13 -
    • -
  • - 14 -
    • -
  • - 15 -
    • -
  • - 16 -
    • -
  • - 17 -
    • -
  • - 18 -
    • -
  • - 19 -
    • -
  • - 20 -
    • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
@@ -1284,390 +926,46 @@
    -
  • - 1 -
    • -
  • - 2 -
    • -
  • - 3 -
    • -
  • - 4 -
    • -
  • - 5 -
    • -
  • - 6 -
    • -
  • - 7 -
    • -
  • - 8 -
    • -
  • - 9 -
    • -
  • - 10 -
    • -
  • - 11 -
    • -
  • - 12 -
    • -
  • - 13 -
    • -
  • - 14 -
    • -
  • - 15 -
    • -
  • - 16 -
    • -
  • - 17 -
    • -
  • - 18 -
    • -
  • - 19 -
    • -
  • - 20 -
    • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
- - - - - + - + From 1e47a20edc8ec41c0fa79dbde637b1bf4d941d34 Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Mon, 13 Jun 2011 17:48:21 +0200 Subject: [PATCH 05/28] added RaceHandle return to addRace so clients can identify what they are tracking Started working on a server test that works towards starting and stopping trackers for the same race / event, asserting that tracking structures are cleared in between --- TODO | 10 ++-- .../org.eclipse.core.resources.prefs | 3 + .../sailing/domain/test/CourseUpdateTest.java | 10 +++- .../domain/tractracadapter/DomainFactory.java | 5 ++ .../domain/tractracadapter/RaceTracker.java | 7 +++ .../tractracadapter/impl/RaceTrackerImpl.java | 25 +++++--- java/com.sap.sailing.server.test/.classpath | 7 +++ java/com.sap.sailing.server.test/.gitignore | 1 + java/com.sap.sailing.server.test/.project | 28 +++++++++ .../.settings/org.eclipse.jdt.core.prefs | 8 +++ .../.settings/org.eclipse.pde.core.prefs | 4 ++ .../META-INF/MANIFEST.MF | 11 ++++ .../build.properties | 4 ++ java/com.sap.sailing.server.test/pom.xml | 14 +++++ .../sailing/server/test/RaceTrackerTest.java | 57 +++++++++++++++++++ .../sailing/server/RacingEventService.java | 45 ++++++++++----- .../server/RacingEventServiceImpl.java | 11 +++- java/pom.xml | 1 + 18 files changed, 222 insertions(+), 29 deletions(-) create mode 100755 java/com.sap.sailing.domain.test/.settings/org.eclipse.core.resources.prefs create mode 100755 java/com.sap.sailing.server.test/.classpath create mode 100755 java/com.sap.sailing.server.test/.gitignore create mode 100755 java/com.sap.sailing.server.test/.project create mode 100755 java/com.sap.sailing.server.test/.settings/org.eclipse.jdt.core.prefs create mode 100755 java/com.sap.sailing.server.test/.settings/org.eclipse.pde.core.prefs create mode 100755 java/com.sap.sailing.server.test/META-INF/MANIFEST.MF create mode 100755 java/com.sap.sailing.server.test/build.properties create mode 100644 java/com.sap.sailing.server.test/pom.xml create mode 100755 java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceTrackerTest.java diff --git a/TODO b/TODO index d1bbdefed7c..daf4af420b8 100644 --- a/TODO +++ b/TODO @@ -2,16 +2,14 @@ Axel ==== - - track time of last event and return in showrace output - - What about distance traveled in first leg? It seems to jump too high at the beginning. + - smoothen / dampen VMG and hence the ETA / sGAP + - Test duplicate addrace for the same race; consider cleaning cache when stopRace/stopEvent is invoked - Test duplicate addevent for the same event - - smoothen / dampen VMG and hence the ETA / sGAP - - Open test server firewall ports for UDP / Expedition wind integration - test UDP ports @@ -26,6 +24,10 @@ Axel - Display gain/loss for next-best competitor (green/red arrow up/down) based on VMG comparison + - Now that we can update Course's waypoints, consider creating a RaceDefinition right upon + receiving the Event/Race from TracTrac, using an empty list of waypoints. This may simplify + the entire life cycle of RaceDefinition objects. + - Improve Mongo-based tests by using Mongo transactions instead of waiting for prior transactions to complete diff --git a/java/com.sap.sailing.domain.test/.settings/org.eclipse.core.resources.prefs b/java/com.sap.sailing.domain.test/.settings/org.eclipse.core.resources.prefs new file mode 100755 index 00000000000..9b98b4ed4aa --- /dev/null +++ b/java/com.sap.sailing.domain.test/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,3 @@ +#Fri Jun 10 21:39:55 CEST 2011 +eclipse.preferences.version=1 +encoding//src/com/sap/sailing/domain/test/WindTest.java=UTF-8 diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseUpdateTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseUpdateTest.java index 96238653c83..6880022267e 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseUpdateTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseUpdateTest.java @@ -81,7 +81,10 @@ public class CourseUpdateTest extends AbstractTracTracLiveTest { } }); addListenersForStoredDataAndStartController(receivers); - race = domainFactory.getRaceDefinition(getEvent().getRaceList().iterator().next()); + Race tractracRace = getEvent().getRaceList().iterator().next(); + // now we expect that there is no + assertNull(domainFactory.getExistingRaceDefinitionForRace(tractracRace)); + race = domainFactory.getRaceDefinition(tractracRace); course = race.getCourse(); assertNotNull(course); assertEquals(3, Util.size(course.getWaypoints())); @@ -91,6 +94,11 @@ public class CourseUpdateTest extends AbstractTracTracLiveTest { assertEquals("top", course.getLegs().get(1).getFrom().getName()); } + private void assertNull(RaceDefinition existingRaceDefinitionForRace) { + // TODO Auto-generated method stub + + } + /** * Asserts that the race course's legs have corresponding {@link TrackedLeg}s and the {@link TrackedLeg}s have * {@link TrackedLegOfCompetitor} for each of the race's competitors. diff --git a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/DomainFactory.java b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/DomainFactory.java index 3e11afedfa6..b99ea162bf4 100755 --- a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/DomainFactory.java +++ b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/DomainFactory.java @@ -117,6 +117,11 @@ public interface DomainFactory { DynamicTrackedRace trackRace(TrackedEvent trackedEvent, RaceDefinition raceDefinition, WindStore windStore, long millisecondsOverWhichToAverageWind, long millisecondsOverWhichToAverageSpeed, Event tractracEvent); + /** + * Non-blocking call that returns null if the {@link RaceDefinition} for the TracTrac Event + * hasn't been created yet, e.g., because the course definition hasn't been received yet or the listener + * for receiving course information hasn't been registered (yet). + */ RaceDefinition getRace(Event tractracEvent); JSONService parseJSONURL(URL jsonURL) throws IOException, ParseException, org.json.simple.parser.ParseException; diff --git a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/RaceTracker.java b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/RaceTracker.java index 4cbf2210bca..9689bb28c82 100755 --- a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/RaceTracker.java +++ b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/RaceTracker.java @@ -11,6 +11,13 @@ public interface RaceTracker { com.sap.sailing.domain.base.Event getEvent(); + /** + * Non-blocking call that returns null if the {@link RaceDefinition} for the TracTrac Event + * hasn't been created yet, e.g., because the course definition hasn't been received yet or the listener + * for receiving course information hasn't been registered (yet). + */ RaceDefinition getRace(); + + RaceHandle getRaceHandle(); } diff --git a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceTrackerImpl.java b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceTrackerImpl.java index be6a7ddb11b..e12be73f5d3 100755 --- a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceTrackerImpl.java +++ b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceTrackerImpl.java @@ -18,6 +18,7 @@ import com.sap.sailing.domain.tracking.TrackedRace; import com.sap.sailing.domain.tracking.WindStore; import com.sap.sailing.domain.tracking.impl.EmptyWindStore; import com.sap.sailing.domain.tractracadapter.DomainFactory; +import com.sap.sailing.domain.tractracadapter.RaceHandle; import com.sap.sailing.domain.tractracadapter.RaceTracker; import com.sap.sailing.domain.tractracadapter.Receiver; import com.tractrac.clientmodule.Event; @@ -31,10 +32,15 @@ public class RaceTrackerImpl implements Listener, RaceTracker { private final Thread ioThread; private final DataController controller; private final Set receivers; + private final DomainFactory domainFactory; /** + * Creates a race tracked for the specified URL/URIs and starts receiving all available existing and future push + * data from there. Receiving continues until {@link #stop()} is called. + *

+ * * A race tracker uses the paramURL for the TracTrac Java client to register for push data about one - * race. The {@link RaceDefinition} for that race, however, cannot be created until the {@link Course} has been + * race. The {@link RaceDefinition} for that race, however, isn't created until the {@link Course} has been * received. Therefore, the {@link RaceCourseReceiver} will create the {@link RaceDefinition} and will add it to the * {@link com.sap.sailing.domain.base.Event}. *

@@ -45,16 +51,14 @@ public class RaceTrackerImpl implements Listener, RaceTracker { * {@link Event} as argument that is used for its tracking. *

* - * When {@link #getRace} is called on this object before the {@link RaceCourseReceiver} has created the - * {@link RaceDefinition}, the call will block until this has happened. - * * @param windStore - * Provides the capability to obtain the {@link WindTrack}s for the different wind sources. - * A trivial implementation is {@link EmptyWindStore} which simply provides new, empty tracks. - * This is always available but loses track of the wind, e.g., during server restarts. + * Provides the capability to obtain the {@link WindTrack}s for the different wind sources. A trivial + * implementation is {@link EmptyWindStore} which simply provides new, empty tracks. This is always + * available but loses track of the wind, e.g., during server restarts. */ protected RaceTrackerImpl(DomainFactory domainFactory, URL paramURL, URI liveURI, URI storedURI, WindStore windStore) throws URISyntaxException, MalformedURLException, FileNotFoundException { + this.domainFactory = domainFactory; // Read event data from configuration file tractracEvent = KeyValue.setup(paramURL); @@ -81,9 +85,14 @@ public class RaceTrackerImpl implements Listener, RaceTracker { addListenersForStoredDataAndStartController(typeControllers); } + @Override + public RaceHandle getRaceHandle() { + return new RaceHandleImpl(domainFactory, tractracEvent); + } + @Override public RaceDefinition getRace() { - return DomainFactory.INSTANCE.getRace(tractracEvent); + return domainFactory.getRace(tractracEvent); } protected void addListenersForStoredDataAndStartController(Iterable listenersForStoredData) { diff --git a/java/com.sap.sailing.server.test/.classpath b/java/com.sap.sailing.server.test/.classpath new file mode 100755 index 00000000000..8a8f1668cdc --- /dev/null +++ b/java/com.sap.sailing.server.test/.classpath @@ -0,0 +1,7 @@ + + + + + + + diff --git a/java/com.sap.sailing.server.test/.gitignore b/java/com.sap.sailing.server.test/.gitignore new file mode 100755 index 00000000000..5e56e040ec0 --- /dev/null +++ b/java/com.sap.sailing.server.test/.gitignore @@ -0,0 +1 @@ +/bin diff --git a/java/com.sap.sailing.server.test/.project b/java/com.sap.sailing.server.test/.project new file mode 100755 index 00000000000..c4447359b3a --- /dev/null +++ b/java/com.sap.sailing.server.test/.project @@ -0,0 +1,28 @@ + + + com.sap.sailing.server.test + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + diff --git a/java/com.sap.sailing.server.test/.settings/org.eclipse.jdt.core.prefs b/java/com.sap.sailing.server.test/.settings/org.eclipse.jdt.core.prefs new file mode 100755 index 00000000000..5072260961d --- /dev/null +++ b/java/com.sap.sailing.server.test/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,8 @@ +#Mon Jun 13 17:15:33 CEST 2011 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 diff --git a/java/com.sap.sailing.server.test/.settings/org.eclipse.pde.core.prefs b/java/com.sap.sailing.server.test/.settings/org.eclipse.pde.core.prefs new file mode 100755 index 00000000000..392d08bb7fd --- /dev/null +++ b/java/com.sap.sailing.server.test/.settings/org.eclipse.pde.core.prefs @@ -0,0 +1,4 @@ +#Mon Jun 13 17:15:33 CEST 2011 +eclipse.preferences.version=1 +pluginProject.extensions=false +resolve.requirebundle=false diff --git a/java/com.sap.sailing.server.test/META-INF/MANIFEST.MF b/java/com.sap.sailing.server.test/META-INF/MANIFEST.MF new file mode 100755 index 00000000000..e0088719c55 --- /dev/null +++ b/java/com.sap.sailing.server.test/META-INF/MANIFEST.MF @@ -0,0 +1,11 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Test +Bundle-SymbolicName: com.sap.sailing.server.test +Bundle-Version: 1.0.0.qualifier +Bundle-Vendor: SAP +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Require-Bundle: com.sap.sailing.server, + com.sap.sailing.domain, + com.sap.sailing.domain.tractracadapter, + org.junit4 diff --git a/java/com.sap.sailing.server.test/build.properties b/java/com.sap.sailing.server.test/build.properties new file mode 100755 index 00000000000..41eb6ade2b4 --- /dev/null +++ b/java/com.sap.sailing.server.test/build.properties @@ -0,0 +1,4 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + . diff --git a/java/com.sap.sailing.server.test/pom.xml b/java/com.sap.sailing.server.test/pom.xml new file mode 100644 index 00000000000..fc60e5e7695 --- /dev/null +++ b/java/com.sap.sailing.server.test/pom.xml @@ -0,0 +1,14 @@ + + + 4.0.0 + + root + com.sap.sailing + 0.0.1-SNAPSHOT + + com.sap.sailing + com.sap.sailing.server.test + 1.0.0-SNAPSHOT + eclipse-test-plugin + diff --git a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceTrackerTest.java b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceTrackerTest.java new file mode 100755 index 00000000000..f334fb13c6b --- /dev/null +++ b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceTrackerTest.java @@ -0,0 +1,57 @@ +package com.sap.sailing.server.test; + +import static org.junit.Assert.assertNotNull; + +import java.io.FileNotFoundException; +import java.net.MalformedURLException; +import java.net.URI; +import java.net.URISyntaxException; +import java.net.URL; + +import org.junit.Before; +import org.junit.Test; + +import com.sap.sailing.domain.base.RaceDefinition; +import com.sap.sailing.domain.tracking.impl.EmptyWindStore; +import com.sap.sailing.domain.tractracadapter.DomainFactory; +import com.sap.sailing.domain.tractracadapter.RaceHandle; +import com.sap.sailing.server.RacingEventServiceImpl; + +public class RaceTrackerTest { + private final URL paramUrl; + private final URI liveUri; + private final URI storedUri; + private RacingEventServiceImpl service; + private DomainFactory domainFactory; + private RaceHandle raceHandle; + + public RaceTrackerTest() throws MalformedURLException, URISyntaxException { + // for live simulation: + // paramUrl = new URL("http://sapsimulation.tracdev.dk/simulateconf/j80race12.txt"); + // liveUri = new URI("tcp://sapsimulation.tracdev.dk:4420"); // or with tunneling: tcp://localhost:4420 + // storedUri = new URI("tcp://sapsimulation.tracdev.dk:4421"); // or with tunneling: tcp://localhost:4421 + // for stored race, non-real-time simulation: + paramUrl = new URL("http://germanmaster.traclive.dk/events/event_20110505_SailingTea/clientparams.php?event=event_20110505_SailingTea&race=bd8c778e-7c65-11e0-8236-406186cbf87c"); + + // tunneled: + //liveUri = new URI("tcp://localhost:4412"); + //storedUri = new URI("tcp://localhost:4413"); + + //no tunnel: + liveUri = new URI("tcp://germanmaster.traclive.dk:4400"); + storedUri = new URI("tcp://germanmaster.traclive.dk:4401"); + } + + @Before + public void setUp() throws MalformedURLException, FileNotFoundException, URISyntaxException { + service = new RacingEventServiceImpl(); + raceHandle = service.addRace(paramUrl, liveUri, storedUri, EmptyWindStore.INSTANCE); + domainFactory = service.getDomainFactory(); + } + + @Test + public void testInitialization() { + RaceDefinition race = raceHandle.getRace(); + assertNotNull(race); + } +} diff --git a/java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java b/java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java index 97f6184d8fb..8846d3cd47c 100755 --- a/java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java +++ b/java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java @@ -12,11 +12,32 @@ import java.text.ParseException; import com.sap.sailing.declination.DeclinationService; import com.sap.sailing.domain.base.Event; import com.sap.sailing.domain.base.RaceDefinition; +import com.sap.sailing.domain.tracking.TrackedEvent; +import com.sap.sailing.domain.tracking.TrackedRace; import com.sap.sailing.domain.tracking.WindStore; import com.sap.sailing.domain.tractracadapter.DomainFactory; +import com.sap.sailing.domain.tractracadapter.RaceHandle; import com.sap.sailing.domain.tractracadapter.RaceTracker; import com.sap.sailing.util.Util.Triple; +/** + * An OSGi service that can be used to track boat races using a TracTrac connector that pushes + * live GPS boat location, waypoint, coarse and mark passing data.

+ * + * If a race/event is already being tracked, another {@link #addRace(URL, URI, URI, WindStore)} or + * {@link #addEvent(URL, URI, URI, WindStore)} call will have no effect, even if a different + * {@link WindStore} is requested.

+ * + * TODO When the tracking of a race/event is {@link #stopTracking(Event, RaceDefinition) stopped}, the next + * time it's started to be tracked, a new {@link TrackedRace} at least will be constructed. This also + * means that when a {@link TrackedEvent} exists that still holds other {@link TrackedRace}s, the + * no longer tracked {@link TrackedRace} will be removed from the {@link TrackedEvent}. + * corresponding information is removed also from the {@link DomainFactory}'s caches to ensure that + * clean, fresh data is received should another tracking request be issued later. + * + * @author Axel Uhl (d043530) + * + */ public interface RacingEventService { Iterable getAllEvents(); @@ -25,33 +46,31 @@ public interface RacingEventService { DomainFactory getDomainFactory(); /** - * Defines the event and for each race listed in the JSON document creates a {@link RaceTracker} that - * tracks the respective race. The {@link RaceDefinition}s obtained this way are all grouped into - * the single {@link Event} produced for the event listed in the JSON response. Note that the - * many race trackers will have their TracTrac Event each, all with the same name, - * meaning the same event but being distinct. + * Defines the event and for each race listed in the JSON document creates a {@link RaceTracker} that starts + * tracking the respective race. The {@link RaceDefinition}s obtained this way are all grouped into the single + * {@link Event} produced for the event listed in the JSON response. Note that the many race trackers will have + * their TracTrac Event each, all with the same name, meaning the same event but being distinct. * * @param jsonURL * URL of a JSON response that contains an "event" object telling the event's name and ID, as well as a * JSON array named "races" which tells ID and replay URL for the race. From those replay URLs the * paramURL for the Java client can be derived. - * @param windStore TODO */ - void addEvent(URL jsonURL, URI liveURI, URI storedURI, WindStore windStore) throws MalformedURLException, FileNotFoundException, + Event addEvent(URL jsonURL, URI liveURI, URI storedURI, WindStore windStore) throws MalformedURLException, FileNotFoundException, URISyntaxException, IOException, ParseException, org.json.simple.parser.ParseException; /** - * Adds a single race tracker, using the race's parameter URL which delivers the single configuration - * text file for that race. While the result of passing this URL to the TracTrac KeyValue.setup - * is a TracTrac Event, those events only manage a single race. In our domain model, we group - * those races into a single instance of our {@link Event} class.

+ * Adds a single race tracker and starts tracking the race, using the race's parameter URL which delivers the single + * configuration text file for that race. While the result of passing this URL to the TracTrac + * KeyValue.setup is a TracTrac Event, those events only manage a single race. In our + * domain model, we group those races into a single instance of our {@link Event} class. + *

* * If this is the first race of an event, the {@link Event} is created as well. If the {@link RaceDefinition} for * the race already exists, it isn't created again. Also, if a {@link RaceTracker} for the given race already * exists, it is not added again. - * @param windStore TODO */ - void addRace(URL paramURL, URI liveURI, URI storedURI, WindStore windStore) throws MalformedURLException, FileNotFoundException, + RaceHandle addRace(URL paramURL, URI liveURI, URI storedURI, WindStore windStore) throws MalformedURLException, FileNotFoundException, URISyntaxException; /** diff --git a/java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventServiceImpl.java b/java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventServiceImpl.java index b6b9a9aedad..5e8044167c5 100755 --- a/java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventServiceImpl.java +++ b/java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventServiceImpl.java @@ -25,6 +25,7 @@ import com.sap.sailing.domain.tracking.DynamicTrackedRace; import com.sap.sailing.domain.tracking.WindStore; import com.sap.sailing.domain.tractracadapter.DomainFactory; import com.sap.sailing.domain.tractracadapter.JSONService; +import com.sap.sailing.domain.tractracadapter.RaceHandle; import com.sap.sailing.domain.tractracadapter.RaceRecord; import com.sap.sailing.domain.tractracadapter.RaceTracker; import com.sap.sailing.expeditionconnector.UDPExpeditionReceiver; @@ -71,16 +72,18 @@ public class RacingEventServiceImpl implements RacingEventService { } @Override - public void addEvent(URL jsonURL, URI liveURI, URI storedURI, WindStore windStore) throws URISyntaxException, IOException, ParseException, org.json.simple.parser.ParseException { + public Event addEvent(URL jsonURL, URI liveURI, URI storedURI, WindStore windStore) throws URISyntaxException, IOException, ParseException, org.json.simple.parser.ParseException { JSONService jsonService = getDomainFactory().parseJSONURL(jsonURL); + Event event = null; for (RaceRecord rr : jsonService.getRaceRecords()) { URL paramURL = rr.getParamURL(); - addRace(paramURL, liveURI, storedURI, windStore); + event = addRace(paramURL, liveURI, storedURI, windStore).getEvent(); } + return event; } @Override - public void addRace(URL paramURL, URI liveURI, URI storedURI, WindStore windStore) throws MalformedURLException, FileNotFoundException, + public RaceHandle addRace(URL paramURL, URI liveURI, URI storedURI, WindStore windStore) throws MalformedURLException, FileNotFoundException, URISyntaxException { RaceTracker tracker = getDomainFactory().createRaceTracker(paramURL, liveURI, storedURI, windStore); Set trackers = raceTrackers.get(tracker.getEvent()); @@ -98,6 +101,7 @@ public class RacingEventServiceImpl implements RacingEventService { } else { eventsByName.put(eventName, tracker.getEvent()); } + return tracker.getRaceHandle(); } @Override @@ -128,6 +132,7 @@ public class RacingEventServiceImpl implements RacingEventService { } } } + // FIXME remove TrackedRace from TrackedEvent // if the last tracked race was removed, remove the entire event if (raceTrackers.get(event).isEmpty()) { stopTracking(event); diff --git a/java/pom.xml b/java/pom.xml index d63923f8e2b..14799362f20 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -18,6 +18,7 @@ com.sap.sailing.expeditionconnector com.sap.sailing.expeditionconnector.test com.sap.sailing.server + com.sap.sailing.server.test com.sap.sailing.mongodb com.sap.sailing.mongodb.test com.tractrac.clientmodule From 0d023e78dd807f40b5eda3813a13b02f3464012f Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Mon, 13 Jun 2011 18:00:48 +0200 Subject: [PATCH 06/28] added test code waiting for TrackedRace to show up --- .../impl/RaceCourseReceiver.java | 2 +- .../sailing/server/test/RaceTrackerTest.java | 29 ++++++++++++++++++- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceCourseReceiver.java b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceCourseReceiver.java index 08c6c3e4571..fad07ba397a 100755 --- a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceCourseReceiver.java +++ b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceCourseReceiver.java @@ -90,7 +90,7 @@ public class RaceCourseReceiver extends AbstractReceiverWithQueue Date: Mon, 13 Jun 2011 18:11:25 +0200 Subject: [PATCH 07/28] factored out the obtaining of the tracked race --- .../sailing/server/test/RaceTrackerTest.java | 46 +++++++++++-------- 1 file changed, 26 insertions(+), 20 deletions(-) diff --git a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceTrackerTest.java b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceTrackerTest.java index 1f3055f2d50..bab9038ff0c 100755 --- a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceTrackerTest.java +++ b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceTrackerTest.java @@ -1,6 +1,5 @@ package com.sap.sailing.server.test; -import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import java.io.FileNotFoundException; @@ -20,7 +19,6 @@ import com.sap.sailing.domain.tracking.impl.EmptyWindStore; import com.sap.sailing.domain.tractracadapter.DomainFactory; import com.sap.sailing.domain.tractracadapter.RaceHandle; import com.sap.sailing.server.RacingEventServiceImpl; -import com.sap.sailing.util.Util; public class RaceTrackerTest { private final URL paramUrl; @@ -48,33 +46,41 @@ public class RaceTrackerTest { } @Before - public void setUp() throws MalformedURLException, FileNotFoundException, URISyntaxException { + public void setUp() throws MalformedURLException, FileNotFoundException, URISyntaxException, InterruptedException { service = new RacingEventServiceImpl(); raceHandle = service.addRace(paramUrl, liveUri, storedUri, EmptyWindStore.INSTANCE); domainFactory = service.getDomainFactory(); } + + private TrackedRace getTrackedRace(TrackedEvent trackedEvent) throws InterruptedException { + final TrackedRace[] trackedRaces = new TrackedRace[1]; + trackedEvent.addRaceListener(new RaceListener() { + @Override + public void raceAdded(TrackedRace trackedRace) { + synchronized (trackedRaces) { + trackedRaces[0] = trackedRace; + trackedRaces.notifyAll(); + } + } + }); + synchronized (trackedRaces) { + if (trackedRaces[0] == null) { + trackedRaces.wait(); + } + } + return trackedRaces[0]; + } + + private TrackedEvent getTrackedEvent() { + TrackedEvent trackedEvent = domainFactory.trackEvent(raceHandle.getEvent()); + return trackedEvent; + } @Test public void testInitialization() throws InterruptedException { RaceDefinition race = raceHandle.getRace(); assertNotNull(race); - TrackedEvent trackedEvent = domainFactory.trackEvent(raceHandle.getEvent()); - final boolean[] gotTrackedRace = new boolean[1]; - trackedEvent.addRaceListener(new RaceListener() { - @Override - public void raceAdded(TrackedRace trackedRace) { - synchronized (gotTrackedRace) { - gotTrackedRace[0] = true; - gotTrackedRace.notifyAll(); - } - } - }); - synchronized (gotTrackedRace) { - if (!gotTrackedRace[0]) { - gotTrackedRace.wait(); - } - } - assertEquals(1, Util.size(trackedEvent.getTrackedRaces())); + assertNotNull(getTrackedRace(getTrackedEvent())); } @Test From ad63bef2fdb6b90f5ed58e6aba5479c0dd0f7aad Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Mon, 13 Jun 2011 18:58:03 +0200 Subject: [PATCH 08/28] added a failing test case showing the problem regarding stopping/restarting for the same race --- .../sailing/domain/test/CourseUpdateTest.java | 2 +- .../test/ReceiveMarkPassingDataTest.java | 2 +- .../domain/test/ReceiveTrackingDataTest.java | 2 +- .../domain/tractracadapter/DomainFactory.java | 14 ++++++++++-- .../domain/tractracadapter/RaceTracker.java | 3 +++ .../impl/DomainFactoryImpl.java | 7 +++++- .../tractracadapter/impl/RaceTrackerImpl.java | 11 ++++++++-- .../TestStoringAndRetrievingWindTracks.java | 2 +- .../sailing/server/test/RaceTrackerTest.java | 22 ++++++++++--------- .../src/com/sap/sailing/server/AdminApp.java | 10 ++++----- .../com/sap/sailing/server/ModeratorApp.java | 6 ++--- .../server/RacingEventServiceImpl.java | 2 +- 12 files changed, 55 insertions(+), 28 deletions(-) diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseUpdateTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseUpdateTest.java index 6880022267e..a0defac30e2 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseUpdateTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseUpdateTest.java @@ -67,7 +67,7 @@ public class CourseUpdateTest extends AbstractTracTracLiveTest { super.setUp(); domainFactory = new DomainFactoryImpl(); domainEvent = domainFactory.createEvent(getEvent()); - trackedEvent = domainFactory.trackEvent(domainEvent); + trackedEvent = domainFactory.getOrCreateTrackedEvent(domainEvent); receivers.add(new RaceCourseReceiver(domainFactory, trackedEvent, getEvent(), /* millisecondsOverWhichToAverageWind */ EmptyWindStore.INSTANCE, 30000, /* millisecondsOverWhichToAverageSpeed */30000) { diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ReceiveMarkPassingDataTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ReceiveMarkPassingDataTest.java index 109c7101a34..ca9f5d75191 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ReceiveMarkPassingDataTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ReceiveMarkPassingDataTest.java @@ -73,7 +73,7 @@ public class ReceiveMarkPassingDataTest extends AbstractTracTracLiveTest { List receivers = new ArrayList(); receivers.add(receiver); for (Receiver r : DomainFactory.INSTANCE.getUpdateReceivers( - DomainFactory.INSTANCE.trackEvent(DomainFactory.INSTANCE.createEvent(getEvent())), + DomainFactory.INSTANCE.getOrCreateTrackedEvent(DomainFactory.INSTANCE.createEvent(getEvent())), getEvent(), EmptyWindStore.INSTANCE, ReceiverType.RACECOURSE, ReceiverType.MARKPOSITIONS, ReceiverType.RACESTARTFINISH, ReceiverType.RAWPOSITIONS)) { receivers.add(r); diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ReceiveTrackingDataTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ReceiveTrackingDataTest.java index 957fddb5af3..05d576acae5 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ReceiveTrackingDataTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ReceiveTrackingDataTest.java @@ -72,7 +72,7 @@ public class ReceiveTrackingDataTest extends AbstractTracTracLiveTest { }; List listeners = new ArrayList(); Event event = domainFactory.createEvent(getEvent()); - DynamicTrackedEvent trackedEvent = domainFactory.trackEvent(event); + DynamicTrackedEvent trackedEvent = domainFactory.getOrCreateTrackedEvent(event); trackedEvent.addRaceListener(new RaceListener() { @Override public void raceAdded(TrackedRace trackedRace) { diff --git a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/DomainFactory.java b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/DomainFactory.java index b99ea162bf4..8bb08afc795 100755 --- a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/DomainFactory.java +++ b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/DomainFactory.java @@ -76,7 +76,11 @@ public interface DomainFactory { RaceTracker createRaceTracker(URL paramURL, URI liveURI, URI storedURI, WindStore windStore) throws MalformedURLException, FileNotFoundException, URISyntaxException; - DynamicTrackedEvent trackEvent(com.sap.sailing.domain.base.Event event); + /** + * Looks for tracking information about event. If no such object exists yet, a new one + * is created. + */ + DynamicTrackedEvent getOrCreateTrackedEvent(com.sap.sailing.domain.base.Event event); BoatClass getBoatClass(CompetitorClass competitorClass); @@ -93,7 +97,7 @@ public interface DomainFactory { * * @param trackedEvent * must have been created before through - * {@link #trackEvent(com.sap.sailing.domain.base.Event)} because + * {@link #getOrCreateTrackedEvent(com.sap.sailing.domain.base.Event)} because * otherwise the link to the {@link Event} can't be established * @param windStore TODO */ @@ -138,4 +142,10 @@ public interface DomainFactory { * in a course. A single control point may be used more than once in a course's list of waypoints. */ void updateCourseWaypoints(Course courseToUpdate, List controlPoints) throws PatchFailedException; + + /** + * Looks for the tracking information for event. If not found, null is returned + * immediately. See also {@link #getOrCreateTrackedEvent(com.sap.sailing.domain.base.Event)}. + */ + DynamicTrackedEvent getTrackedEvent(com.sap.sailing.domain.base.Event event); } diff --git a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/RaceTracker.java b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/RaceTracker.java index 9689bb28c82..d79e9ff14dd 100755 --- a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/RaceTracker.java +++ b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/RaceTracker.java @@ -4,6 +4,7 @@ import java.io.IOException; import java.net.MalformedURLException; import com.sap.sailing.domain.base.RaceDefinition; +import com.sap.sailing.domain.tracking.DynamicTrackedEvent; public interface RaceTracker { @@ -19,5 +20,7 @@ public interface RaceTracker { RaceDefinition getRace(); RaceHandle getRaceHandle(); + + DynamicTrackedEvent getTrackedEvent(); } diff --git a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/DomainFactoryImpl.java b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/DomainFactoryImpl.java index 596d19418ee..5871119c315 100755 --- a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/DomainFactoryImpl.java +++ b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/DomainFactoryImpl.java @@ -338,9 +338,14 @@ public class DomainFactoryImpl implements DomainFactory { ReceiverType.MARKPASSINGS, ReceiverType.MARKPOSITIONS, ReceiverType.RACESTARTFINISH, ReceiverType.RAWPOSITIONS); } + + @Override + public DynamicTrackedEvent getTrackedEvent(com.sap.sailing.domain.base.Event event) { + return eventTrackingCache.get(event); + } @Override - public DynamicTrackedEvent trackEvent(com.sap.sailing.domain.base.Event event) { + public DynamicTrackedEvent getOrCreateTrackedEvent(com.sap.sailing.domain.base.Event event) { synchronized (eventTrackingCache) { DynamicTrackedEvent result = eventTrackingCache.get(event); if (result == null) { diff --git a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceTrackerImpl.java b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceTrackerImpl.java index e12be73f5d3..35ce2295b12 100755 --- a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceTrackerImpl.java +++ b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceTrackerImpl.java @@ -16,6 +16,7 @@ import com.sap.sailing.domain.base.RaceDefinition; import com.sap.sailing.domain.tracking.DynamicTrackedEvent; import com.sap.sailing.domain.tracking.TrackedRace; import com.sap.sailing.domain.tracking.WindStore; +import com.sap.sailing.domain.tracking.WindTrack; import com.sap.sailing.domain.tracking.impl.EmptyWindStore; import com.sap.sailing.domain.tractracadapter.DomainFactory; import com.sap.sailing.domain.tractracadapter.RaceHandle; @@ -33,6 +34,7 @@ public class RaceTrackerImpl implements Listener, RaceTracker { private final DataController controller; private final Set receivers; private final DomainFactory domainFactory; + private final DynamicTrackedEvent trackedEvent; /** * Creates a race tracked for the specified URL/URIs and starts receiving all available existing and future push @@ -73,7 +75,7 @@ public class RaceTrackerImpl implements Listener, RaceTracker { // Start live and stored data streams ioThread = new Thread(controller, "io"); domainEvent = domainFactory.createEvent(tractracEvent); - DynamicTrackedEvent trackedEvent = domainFactory.trackEvent(domainEvent); + trackedEvent = domainFactory.getOrCreateTrackedEvent(domainEvent); receivers = new HashSet(); Set typeControllers = new HashSet(); for (Receiver receiver : domainFactory.getUpdateReceivers(trackedEvent, tractracEvent, windStore)) { @@ -85,9 +87,14 @@ public class RaceTrackerImpl implements Listener, RaceTracker { addListenersForStoredDataAndStartController(typeControllers); } + @Override + public DynamicTrackedEvent getTrackedEvent() { + return trackedEvent; + } + @Override public RaceHandle getRaceHandle() { - return new RaceHandleImpl(domainFactory, tractracEvent); + return new RaceHandleImpl(domainFactory, tractracEvent, getTrackedEvent()); } @Override diff --git a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingWindTracks.java b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingWindTracks.java index 628001fffad..3dc22159d0e 100755 --- a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingWindTracks.java +++ b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingWindTracks.java @@ -62,7 +62,7 @@ public class TestStoringAndRetrievingWindTracks extends AbstractTracTracLiveTest public void testStoreAFewWindEntries() throws UnknownHostException, MongoException, InterruptedException { DomainFactory domainFactory = DomainFactory.INSTANCE; Event domainEvent = domainFactory.createEvent(getEvent()); - DynamicTrackedEvent trackedEvent = domainFactory.trackEvent(domainEvent); + DynamicTrackedEvent trackedEvent = domainFactory.getOrCreateTrackedEvent(domainEvent); Iterable typeControllers = domainFactory.getUpdateReceivers(trackedEvent, getEvent(), EmptyWindStore.INSTANCE, ReceiverType.RACECOURSE); addListenersForStoredDataAndStartController(typeControllers); diff --git a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceTrackerTest.java b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceTrackerTest.java index bab9038ff0c..f7f94231191 100755 --- a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceTrackerTest.java +++ b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceTrackerTest.java @@ -1,8 +1,10 @@ package com.sap.sailing.server.test; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNotSame; import java.io.FileNotFoundException; +import java.io.IOException; import java.net.MalformedURLException; import java.net.URI; import java.net.URISyntaxException; @@ -25,7 +27,6 @@ public class RaceTrackerTest { private final URI liveUri; private final URI storedUri; private RacingEventServiceImpl service; - private DomainFactory domainFactory; private RaceHandle raceHandle; public RaceTrackerTest() throws MalformedURLException, URISyntaxException { @@ -49,7 +50,6 @@ public class RaceTrackerTest { public void setUp() throws MalformedURLException, FileNotFoundException, URISyntaxException, InterruptedException { service = new RacingEventServiceImpl(); raceHandle = service.addRace(paramUrl, liveUri, storedUri, EmptyWindStore.INSTANCE); - domainFactory = service.getDomainFactory(); } private TrackedRace getTrackedRace(TrackedEvent trackedEvent) throws InterruptedException { @@ -71,20 +71,22 @@ public class RaceTrackerTest { return trackedRaces[0]; } - private TrackedEvent getTrackedEvent() { - TrackedEvent trackedEvent = domainFactory.trackEvent(raceHandle.getEvent()); - return trackedEvent; - } - @Test public void testInitialization() throws InterruptedException { RaceDefinition race = raceHandle.getRace(); assertNotNull(race); - assertNotNull(getTrackedRace(getTrackedEvent())); + assertNotNull(getTrackedRace(raceHandle.getTrackedEvent())); } @Test - public void testStopTracking() { - + public void testStopTracking() throws MalformedURLException, IOException, InterruptedException, URISyntaxException { + TrackedEvent oldTrackedEvent = raceHandle.getTrackedEvent(); + TrackedRace oldTrackedRace = oldTrackedEvent.getTrackedRaces().iterator().next(); + service.stopTracking(raceHandle.getEvent()); + RaceHandle myRaceHandle = service.addRace(paramUrl, liveUri, storedUri, EmptyWindStore.INSTANCE); + TrackedEvent newTrackedEvent = myRaceHandle.getTrackedEvent(); + TrackedRace newTrackedRace = newTrackedEvent.getTrackedRaces().iterator().next(); + // expecting a new tracked race to be created when starting over with tracking + assertNotSame(oldTrackedRace, newTrackedRace); } } diff --git a/java/com.sap.sailing.server/src/com/sap/sailing/server/AdminApp.java b/java/com.sap.sailing.server/src/com/sap/sailing/server/AdminApp.java index e14819df1b9..23ca921d5c3 100755 --- a/java/com.sap.sailing.server/src/com/sap/sailing/server/AdminApp.java +++ b/java/com.sap.sailing.server/src/com/sap/sailing/server/AdminApp.java @@ -160,7 +160,7 @@ public class AdminApp extends Servlet { if (race == null) { resp.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "Race not found"); } else { - TrackedRace trackedRace = getService().getDomainFactory().trackEvent(event).getTrackedRace(race); + TrackedRace trackedRace = getService().getDomainFactory().getTrackedEvent(event).getTrackedRace(race); TimePoint time = getTimePoint(req, PARAM_NAME_TIME, PARAM_NAME_TIME_MILLIS, MillisecondsTimePoint.now()); TimePoint oneHourLater = new MillisecondsTimePoint(time.asMillis()+3600*1000); String[] latitudes = req.getParameterValues(PARAM_NAME_LATDEG); @@ -202,7 +202,7 @@ public class AdminApp extends Servlet { if (race == null) { resp.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "Race not found"); } else { - TrackedRace trackedRace = getService().getDomainFactory().trackEvent(event).getTrackedRace(race); + TrackedRace trackedRace = getService().getDomainFactory().getTrackedEvent(event).getTrackedRace(race); TimePoint from = getTimePoint(req, PARAM_NAME_FROM_TIME, PARAM_NAME_FROM_TIME_MILLIS, trackedRace.getStart()==null?new MillisecondsTimePoint(0): /* 24h before race start */ new MillisecondsTimePoint(trackedRace.getStart().asMillis()-24*3600*1000)); @@ -257,7 +257,7 @@ public class AdminApp extends Servlet { if (race == null) { resp.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "Race not found"); } else { - TrackedRace trackedRace = getService().getDomainFactory().trackEvent(event) + TrackedRace trackedRace = getService().getDomainFactory().getTrackedEvent(event) .getTrackedRace(race); trackedRace.setWindSource(windSource); resp.getWriter().println( @@ -313,7 +313,7 @@ public class AdminApp extends Servlet { try { TimePoint timePoint = getTimePoint(req, PARAM_NAME_TIME, PARAM_NAME_TIME_MILLIS, MillisecondsTimePoint.now()); Wind wind = new WindImpl(p, timePoint, speed); - getService().getDomainFactory().trackEvent(event).getTrackedRace(race).recordWind(wind, WindSource.WEB); + getService().getDomainFactory().getTrackedEvent(event).getTrackedRace(race).recordWind(wind, WindSource.WEB); } catch (InvalidDateException e) { resp.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "Couldn't parse time specification " + e.getMessage()); } @@ -342,7 +342,7 @@ public class AdminApp extends Servlet { resp.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "Wind source name " + sourceName + " unknown"); } else { try { - WindTrack windTrack = getService().getDomainFactory().trackEvent(event) + WindTrack windTrack = getService().getDomainFactory().getTrackedEvent(event) .getTrackedRace(race).getWindTrack(windSource); TimePoint timePoint = getTimePoint(req, PARAM_NAME_TIME, PARAM_NAME_TIME_MILLIS, MillisecondsTimePoint.now()); diff --git a/java/com.sap.sailing.server/src/com/sap/sailing/server/ModeratorApp.java b/java/com.sap.sailing.server/src/com/sap/sailing/server/ModeratorApp.java index f9e395e6ebd..95d975f9730 100755 --- a/java/com.sap.sailing.server/src/com/sap/sailing/server/ModeratorApp.java +++ b/java/com.sap.sailing.server/src/com/sap/sailing/server/ModeratorApp.java @@ -169,7 +169,7 @@ public class ModeratorApp extends Servlet { RaceDefinition race = getRaceDefinition(req); TrackedRace trackedRace = null; if (event != null && race != null) { - trackedRace = getService().getDomainFactory().trackEvent(event).getTrackedRace(race); + trackedRace = getService().getDomainFactory().getTrackedEvent(event).getTrackedRace(race); } return trackedRace; } @@ -349,7 +349,7 @@ public class ModeratorApp extends Servlet { JSONObject jsonRace = new JSONObject(); jsonRace.put("name", race.getName()); jsonRace.put("boatclass", race.getBoatClass()==null?"":race.getBoatClass().getName()); - TimePoint start = getService().getDomainFactory().trackEvent(event).getTrackedRace(race).getStart(); + TimePoint start = getService().getDomainFactory().getTrackedEvent(event).getTrackedRace(race).getStart(); jsonRace.put("start", start==null?Long.MAX_VALUE:start.asMillis()); JSONArray jsonLegs = new JSONArray(); for (Leg leg : race.getCourse().getLegs()) { @@ -358,7 +358,7 @@ public class ModeratorApp extends Servlet { jsonLeg.put("end", leg.getTo().getName()); jsonLegs.add(jsonLeg); } - TrackedRace trackedRace = getService().getDomainFactory().trackEvent(event).getTrackedRace(race); + TrackedRace trackedRace = getService().getDomainFactory().getOrCreateTrackedEvent(event).getTrackedRace(race); if (trackedRace.getStart() != null) { jsonRace.put("start", trackedRace.getStart().asMillis()); } diff --git a/java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventServiceImpl.java b/java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventServiceImpl.java index 5e8044167c5..7387a13572d 100755 --- a/java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventServiceImpl.java +++ b/java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventServiceImpl.java @@ -143,7 +143,7 @@ public class RacingEventServiceImpl implements RacingEventService { public synchronized void startTrackingWind(Event event, RaceDefinition race, int port, DeclinationService declinationService) throws SocketException { if (!windTrackers.containsKey(race)) { - DynamicTrackedEvent trackedEvent = getDomainFactory().trackEvent(event); + DynamicTrackedEvent trackedEvent = getDomainFactory().getOrCreateTrackedEvent(event); DynamicTrackedRace trackedRace = trackedEvent.getTrackedRace(race); WindTracker windTracker = new WindTracker(trackedRace, declinationService); UDPExpeditionReceiver receiver = getOrCreateWindReceiverForPort(port); From cd79b0346a3275c56da076d4d90f1659f3217b3c Mon Sep 17 00:00:00 2001 From: Simon Pamies Date: Mon, 13 Jun 2011 19:28:03 +0200 Subject: [PATCH 09/28] First version of leaderboard that works - not good but shows right numbers --- .../sailing.db/sailing/db/model/entities.py | 2 +- .../sailing/web/browser/functions.py | 55 ++++ .../web/browser/moderator-static/app.js | 66 ++++ .../web/browser/templates/leaderboard-live.pt | 300 +++++------------- 4 files changed, 201 insertions(+), 222 deletions(-) diff --git a/python/src/sailing.db/sailing/db/model/entities.py b/python/src/sailing.db/sailing/db/model/entities.py index d2dc2a9ecb5..5a131414277 100644 --- a/python/src/sailing.db/sailing/db/model/entities.py +++ b/python/src/sailing.db/sailing/db/model/entities.py @@ -67,7 +67,7 @@ class Competitor(BaseDocument): 'leg_indexes': {}, # holds association between leg position and unique id : - 'total': float, + 'total': int, # total rank 'current_rank': int, # current rank for given time 'races' : [float, ], 'marks' : [[float, ], ], # ranks for marks diff --git a/python/src/sailing.web/sailing/web/browser/functions.py b/python/src/sailing.web/sailing/web/browser/functions.py index 33131e84b38..434addbdbfd 100644 --- a/python/src/sailing.web/sailing/web/browser/functions.py +++ b/python/src/sailing.web/sailing/web/browser/functions.py @@ -533,3 +533,58 @@ def adminLiveData(context, request): return results +@jsonize +def moderatorLiveData(context, request): + """ Returns data for the moderators leaderboard """ + + view = core.BaseView(context, request) + event = view.currentLeaderboardEvent() + + sortby = request.params.get('sortby', '') + race_range = request.params.get('races', '1:3') + competitor_range = request.params.get('competitors', '1:20') + + race_start_index, race_end_index = race_range.split(':') + races_list = event.races[int(race_start_index)-1:int(race_end_index)] + + competitors = model.CompetitorImpl.queryBy(event=event.name) + + races = [] + for racename in races_list: + races.append(model.RaceImpl.queryOneBy(name=racename, event=event.name)) + + # list of competitors with corresponding data + data = {} + + for competitor in competitors: + racedata = competitor.races[int(race_start_index)-1:int(race_end_index)] + + # for each race found compute the marks and values + markranks = []; legvalues = []; racecounter = 0 + for racename in races_list: + real_racepos = event.races.index(racename) + if len(markranks) < racecounter+1: + markranks.append([]) + legvalues.append([]) + + markranks[racecounter] = markranks[racecounter] + competitor.marks[real_racepos] + + # prepare values according to UI + # UI: RANK, DSTTRAV, SPEED, VMG, SGAP, DSTGO, ETA + # INTERN: RANK, AVGSPEED, DSTRV, VMG, AVMG, SGAP, ETA, DSTGO + iv = competitor.values[real_racepos] + newvalues = [iv[0], iv[2], iv[1], iv[3], iv[5], iv[-1], iv[-2]] + + for valpos in range(len(newvalues)): + newvalues[valpos] = ['%.2f' % val for val in newvalues[valpos]] + + legvalues[racecounter] = legvalues[racecounter] + newvalues + + racecounter += 1 + + cd = data.setdefault(competitor.name, {}) + cd.update({'raceranks': racedata, 'markranks': markranks, 'legvalues': legvalues, + 'nationality': competitor.nationality, 'global_rank': competitor.total}) + + return data + diff --git a/python/src/sailing.web/sailing/web/browser/moderator-static/app.js b/python/src/sailing.web/sailing/web/browser/moderator-static/app.js index 5ec810a351a..88e63821cc1 100644 --- a/python/src/sailing.web/sailing/web/browser/moderator-static/app.js +++ b/python/src/sailing.web/sailing/web/browser/moderator-static/app.js @@ -1,6 +1,72 @@ + +/* + * Loads leaderboard data. Parameters: + * + * races: Slice that indicates which data to load (e.g. "0:2") + * sortby: Sorting parameters (e.g "1,1,1") + * competitors: Slice indicating which competitors to show (e.g. "0:20") + */ +function loadLeaderboard(races, sortby, competitors) { + $.getJSON('/++/moderatorLiveData', + {races:races, sortby:sortby, competitors:competitors}, + function(data) { + displayLeaderboard(data); + } + ); +} + +/** + * Puts data into the right context for the leaderboard + */ +function displayLeaderboard(data) { + rowid = 1; + for (key in data) { + competitor = data[key]; + + $('#overall-clipping tr[rowid='+rowid+'] td[colid=3] span').each(function(index) { + if ($(this).html() != key) { + /* competitor position has changed - refresh whole line */ + + $(this).html(key); + $(this).closest('tr').find('td[colid=2] span').html(competitor.nationality); + $(this).closest('tr').find('td[colid=1] span').html(competitor.global_rank); + + /* now set values independent what has been there before */ + racepos = 1; + for (racerank in competitor.raceranks) { + $('#race-'+racepos+' .main-box ul li[rowid='+rowid+']').html(competitor.raceranks[racerank]); + + markpos = 1; + for (markrank in competitor.markranks[racepos-1]) { + $('#race-'+racepos+' #leg-'+markpos+' .leg-box ul li[rowid='+rowid+']').html(competitor.markranks[racepos-1][markrank]); + + legpos = 1; + for (legvalue in competitor.legvalues[racepos-1][markpos-1]) { + if (legvalue == 0) { + $('#race-'+racepos+' #leg-'+markpos+' .table-box ul li[rowid='+rowid+']').html(parseFloat(competitor.legvalues[racepos-1][markpos-1][legvalue]).toFixed()); + } else { + $('#r'+racepos+'-m'+markpos+' tr[rowid='+rowid+'] td[colid='+(legpos-1)+'] span').html(competitor.legvalues[racepos-1][markpos-1][legvalue]); + } + legpos += 1; + } + + markpos += 1; + } + } + } else { + /* check if values have changed */ + } + }); + + rowid += 1; + } +} + $(document).ready(function() { var wHeight = $(window).height(); $("#rootwrapper").css("height", wHeight); $("#appinterface").css("height", wHeight-131); + + loadLeaderboard(); }); diff --git a/python/src/sailing.web/sailing/web/browser/templates/leaderboard-live.pt b/python/src/sailing.web/sailing/web/browser/templates/leaderboard-live.pt index fc1207d6f98..cc99952dd3f 100644 --- a/python/src/sailing.web/sailing/web/browser/templates/leaderboard-live.pt +++ b/python/src/sailing.web/sailing/web/browser/templates/leaderboard-live.pt @@ -35,7 +35,7 @@

- + @@ -303,10 +303,12 @@ -
+ + +
- M1 + M${markid}
    @@ -333,7 +335,7 @@
-
+ -
+
+ @@ -395,6 +400,9 @@ + + + + + + + + + + + + + + + + + + + + +
- -
-
- M2 - - -
    -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
- -
-
-
-
- M3 - - -
    -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
- -
-
-
-
- M4 - - -
    -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
- -
-
-
-
- M5 - - -
    -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
- -
-
-
-
- M6 - - -
    -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
- -
-
-
-
- M7 - - -
    -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
- -
-
-
-
- M8 - - -
    -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
- -
-
+
From 464a1c6e64f44208ad70f5dfe017459d1da6e912 Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Mon, 13 Jun 2011 19:48:25 +0200 Subject: [PATCH 10/28] first successful test that starts/stops/starts tracking for same race and gets different TrackedRaces --- .../domain/test/ReceiveTrackingDataTest.java | 3 +++ .../impl/RaceCourseReceiver.java | 13 ++++++++--- .../tractracadapter/impl/RaceTrackerImpl.java | 3 ++- .../domain/tracking/DynamicTrackedEvent.java | 2 ++ .../sailing/domain/tracking/RaceListener.java | 2 ++ .../sailing/domain/tracking/TrackedEvent.java | 10 +++++++- .../tracking/impl/TrackedEventImpl.java | 23 +++++++++++++++++++ .../sailing/server/test/RaceTrackerTest.java | 6 +++-- .../server/RacingEventServiceImpl.java | 1 + 9 files changed, 56 insertions(+), 7 deletions(-) diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ReceiveTrackingDataTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ReceiveTrackingDataTest.java index 05d576acae5..05e3238bbb4 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ReceiveTrackingDataTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ReceiveTrackingDataTest.java @@ -79,6 +79,9 @@ public class ReceiveTrackingDataTest extends AbstractTracTracLiveTest { System.out.println("Subscribing raw position listener for race "+trackedRace); ((DynamicTrackedRace) trackedRace).addListener(positionListener); } + @Override + public void raceRemoved(TrackedRace trackedRace) { + } }); for (Receiver receiver : domainFactory.getUpdateReceivers(trackedEvent, getEvent(), EmptyWindStore.INSTANCE)) { for (TypeController raceListener : receiver.getTypeControllers()) { diff --git a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceCourseReceiver.java b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceCourseReceiver.java index fad07ba397a..70546d30b01 100755 --- a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceCourseReceiver.java +++ b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceCourseReceiver.java @@ -84,6 +84,9 @@ public class RaceCourseReceiver extends AbstractReceiverWithQueuenull if no tracking information currently exists + * for race. See also {@link #getTrackedRace(RaceDefinition)} for a blocking variant. + */ + TrackedRace getExistingTrackedRace(RaceDefinition race); + void addTrackedRace(TrackedRace trackedRace); + void removedTrackedRace(TrackedRace trackedRace); + /** * Listener will be notified when {@link #addTrackedRace(TrackedRace)} is called and * upon registration for each tracked race already known. Therefore, the listener @@ -31,5 +39,5 @@ public interface TrackedEvent { int getTotalPoints(Competitor competitor, TimePoint timePoint); int getNetPoints(Competitor competitor, TimePoint timePoint) throws NoWindException; - + } \ No newline at end of file diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedEventImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedEventImpl.java index cb4d55da0a7..26413737dbb 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedEventImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedEventImpl.java @@ -47,6 +47,24 @@ public class TrackedEventImpl implements TrackedEvent { trackedRaces.notifyAll(); } } + + @Override + public void removedTrackedRace(TrackedRace trackedRace) { + synchronized (trackedRaces) { + trackedRaces.remove(trackedRace.getRace()); + Collection trbbc = trackedRacesByBoatClass.get(trackedRace.getRace().getBoatClass()); + if (trbbc != null) { + trbbc.remove(trackedRace); + if (trbbc.isEmpty()) { + trbbc.remove(trackedRace.getRace().getBoatClass()); + } + } + for (RaceListener listener : raceListeners) { + listener.raceRemoved(trackedRace); + } + trackedRaces.notifyAll(); + } + } @Override public Event getEvent() { @@ -79,6 +97,11 @@ public class TrackedEventImpl implements TrackedEvent { } return result; } + + @Override + public TrackedRace getExistingTrackedRace(RaceDefinition race) { + return trackedRaces.get(race); + } @Override public void addRaceListener(RaceListener listener) { diff --git a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceTrackerTest.java b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceTrackerTest.java index f7f94231191..1e3f7759faa 100755 --- a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceTrackerTest.java +++ b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceTrackerTest.java @@ -18,7 +18,6 @@ import com.sap.sailing.domain.tracking.RaceListener; import com.sap.sailing.domain.tracking.TrackedEvent; import com.sap.sailing.domain.tracking.TrackedRace; import com.sap.sailing.domain.tracking.impl.EmptyWindStore; -import com.sap.sailing.domain.tractracadapter.DomainFactory; import com.sap.sailing.domain.tractracadapter.RaceHandle; import com.sap.sailing.server.RacingEventServiceImpl; @@ -62,6 +61,9 @@ public class RaceTrackerTest { trackedRaces.notifyAll(); } } + @Override + public void raceRemoved(TrackedRace trackedRace) { + } }); synchronized (trackedRaces) { if (trackedRaces[0] == null) { @@ -85,7 +87,7 @@ public class RaceTrackerTest { service.stopTracking(raceHandle.getEvent()); RaceHandle myRaceHandle = service.addRace(paramUrl, liveUri, storedUri, EmptyWindStore.INSTANCE); TrackedEvent newTrackedEvent = myRaceHandle.getTrackedEvent(); - TrackedRace newTrackedRace = newTrackedEvent.getTrackedRaces().iterator().next(); + TrackedRace newTrackedRace = getTrackedRace(newTrackedEvent); // expecting a new tracked race to be created when starting over with tracking assertNotSame(oldTrackedRace, newTrackedRace); } diff --git a/java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventServiceImpl.java b/java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventServiceImpl.java index 7387a13572d..ca683019afb 100755 --- a/java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventServiceImpl.java +++ b/java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventServiceImpl.java @@ -85,6 +85,7 @@ public class RacingEventServiceImpl implements RacingEventService { @Override public RaceHandle addRace(URL paramURL, URI liveURI, URI storedURI, WindStore windStore) throws MalformedURLException, FileNotFoundException, URISyntaxException { + // FIXME check if a tracker for this parameter combination already exists and if so, return its race handle RaceTracker tracker = getDomainFactory().createRaceTracker(paramURL, liveURI, storedURI, windStore); Set trackers = raceTrackers.get(tracker.getEvent()); if (trackers == null) { From 9b4ca2fe6aaddf7588376e5dee640f21931ffb9e Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Mon, 13 Jun 2011 19:51:21 +0200 Subject: [PATCH 11/28] added missing files --- .../domain/tractracadapter/RaceHandle.java | 28 +++++++++++++++ .../tractracadapter/impl/RaceHandleImpl.java | 36 +++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100755 java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/RaceHandle.java create mode 100755 java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceHandleImpl.java diff --git a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/RaceHandle.java b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/RaceHandle.java new file mode 100755 index 00000000000..9d349d71914 --- /dev/null +++ b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/RaceHandle.java @@ -0,0 +1,28 @@ +package com.sap.sailing.domain.tractracadapter; + +import com.sap.sailing.domain.base.Event; +import com.sap.sailing.domain.base.RaceDefinition; +import com.sap.sailing.domain.tracking.DynamicTrackedEvent; +import com.sap.sailing.domain.tractracadapter.impl.RaceCourseReceiver; + +/** + * Gives clients a way to refer to a specific race even though the {@link RaceDefinition} object may not have + * been created yet, but without exposing the TracTrac internals. The {@link #getRace()} call will block + * until the {@link RaceDefinition} has been created. + * + * @author Axel Uhl (d043530) + * + */ +public interface RaceHandle { + + Event getEvent(); + + /** + * Fetch the race definition. If the race definition represented by this handle hasn't been created yet, the call + * blocks until such a definition is provided by another call, usually by the {@link RaceCourseReceiver}. + */ + RaceDefinition getRace(); + + DynamicTrackedEvent getTrackedEvent(); + +} diff --git a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceHandleImpl.java b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceHandleImpl.java new file mode 100755 index 00000000000..a466934ef05 --- /dev/null +++ b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceHandleImpl.java @@ -0,0 +1,36 @@ +package com.sap.sailing.domain.tractracadapter.impl; + +import com.sap.sailing.domain.base.RaceDefinition; +import com.sap.sailing.domain.tracking.DynamicTrackedEvent; +import com.sap.sailing.domain.tractracadapter.DomainFactory; +import com.sap.sailing.domain.tractracadapter.RaceHandle; +import com.tractrac.clientmodule.Event; + +public class RaceHandleImpl implements RaceHandle { + private final Event tractracEvent; + private final DomainFactory domainFactory; + private final DynamicTrackedEvent trackedEvent; + + public RaceHandleImpl(DomainFactory domainFactory, Event tractracEvent, DynamicTrackedEvent trackedEvent) { + this.domainFactory = domainFactory; + this.tractracEvent = tractracEvent; + this.trackedEvent = trackedEvent; + } + + @Override + public com.sap.sailing.domain.base.Event getEvent() { + return domainFactory.createEvent(tractracEvent); + } + + @Override + public RaceDefinition getRace() { + // we assume there is exactly one Race per TracTrac event + return domainFactory.getRaceDefinition(tractracEvent.getRaceList().iterator().next()); + } + + @Override + public DynamicTrackedEvent getTrackedEvent() { + return trackedEvent; + } + +} From b958df7181f2f0ef9dca06f233221fbba5dd0751 Mon Sep 17 00:00:00 2001 From: Simon Pamies Date: Mon, 13 Jun 2011 20:09:12 +0200 Subject: [PATCH 12/28] Rewrote leaderboard to only use element ids - now much faster and working --- .../web/browser/moderator-static/app.js | 51 +- .../web/browser/templates/leaderboard-live.pt | 691 +----------------- 2 files changed, 46 insertions(+), 696 deletions(-) diff --git a/python/src/sailing.web/sailing/web/browser/moderator-static/app.js b/python/src/sailing.web/sailing/web/browser/moderator-static/app.js index 88e63821cc1..909331e9f43 100644 --- a/python/src/sailing.web/sailing/web/browser/moderator-static/app.js +++ b/python/src/sailing.web/sailing/web/browser/moderator-static/app.js @@ -23,40 +23,39 @@ function displayLeaderboard(data) { for (key in data) { competitor = data[key]; - $('#overall-clipping tr[rowid='+rowid+'] td[colid=3] span').each(function(index) { - if ($(this).html() != key) { - /* competitor position has changed - refresh whole line */ + name_element = $('#clipping-'+rowid+'-3 span'); + if (true || name_element.html() == key) { + /* competitor position has changed - refresh whole line */ - $(this).html(key); - $(this).closest('tr').find('td[colid=2] span').html(competitor.nationality); - $(this).closest('tr').find('td[colid=1] span').html(competitor.global_rank); + name_element.html(key); + $('#clipping-'+rowid+'-1 span').html(competitor.global_rank); + $('#clipping-'+rowid+'-2 span').html(competitor.nationality); - /* now set values independent what has been there before */ - racepos = 1; - for (racerank in competitor.raceranks) { - $('#race-'+racepos+' .main-box ul li[rowid='+rowid+']').html(competitor.raceranks[racerank]); + /* now set values independent what has been there before */ + racepos = 1; + for (racerank in competitor.raceranks) { + $('#race-'+racepos+'-rankrow-'+rowid).html(competitor.raceranks[racerank]); - markpos = 1; - for (markrank in competitor.markranks[racepos-1]) { - $('#race-'+racepos+' #leg-'+markpos+' .leg-box ul li[rowid='+rowid+']').html(competitor.markranks[racepos-1][markrank]); + markpos = 1; + for (markrank in competitor.markranks[racepos-1]) { + $('#race-'+racepos+'-mark-'+markpos+'-row-'+rowid).html(competitor.markranks[racepos-1][markrank]); - legpos = 1; - for (legvalue in competitor.legvalues[racepos-1][markpos-1]) { - if (legvalue == 0) { - $('#race-'+racepos+' #leg-'+markpos+' .table-box ul li[rowid='+rowid+']').html(parseFloat(competitor.legvalues[racepos-1][markpos-1][legvalue]).toFixed()); - } else { - $('#r'+racepos+'-m'+markpos+' tr[rowid='+rowid+'] td[colid='+(legpos-1)+'] span').html(competitor.legvalues[racepos-1][markpos-1][legvalue]); - } - legpos += 1; + legpos = 1; + for (legvalue in competitor.legvalues[racepos-1][markpos-1]) { + if (legvalue == 0) { + $('#race-'+racepos+'-mark-'+markpos+'-legrow-'+rowid).html(parseFloat(competitor.legvalues[racepos-1][markpos-1][legvalue]).toFixed()); + } else { + $('#race-'+racepos+'-mark-'+markpos+'-valrow-'+rowid+'-pos-'+(legpos-1)+' span').html(competitor.legvalues[racepos-1][markpos-1][legvalue]); } - - markpos += 1; + legpos += 1; } + + markpos += 1; } - } else { - /* check if values have changed */ } - }); + } else { + /* check if values have changed */ + } rowid += 1; } diff --git a/python/src/sailing.web/sailing/web/browser/templates/leaderboard-live.pt b/python/src/sailing.web/sailing/web/browser/templates/leaderboard-live.pt index cc99952dd3f..73fb60b8d3a 100644 --- a/python/src/sailing.web/sailing/web/browser/templates/leaderboard-live.pt +++ b/python/src/sailing.web/sailing/web/browser/templates/leaderboard-live.pt @@ -39,226 +39,19 @@ - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+ +
+ - -
- - - - - -
- - - - - -
- - - - - -
- - - - - -
- - - - - -
- - - - - -
- - - - - -
- - - - - -
- - - - - -
- - - - - -
- - - - - -
- - - - - -
- - - - - -
- - - - - -
- - - - - -
- - - - - -
- - - - - -
- - - - - -
- - - - +
    @@ -278,26 +71,9 @@
      -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • + +
    • +
    1     @@ -312,51 +88,17 @@
      -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • + +
    • +
    @@ -404,406 +146,15 @@ - - -   - - -   - - -   - - -   - - -   - - -   - - - - -   - - -   - - -   - - -   - - -   - - -   - - - - -   - - -   - - -   - - -   - - -   - - -   - - - - -   - - -   - - -   - - -   - - -   - - -   - - - - -   - - -   - - -   - - -   - - -   - - -   - - - - -   - - -   - - -   - - -   - - -   - - -   - - - - -   - - -   - - -   - - -   - - -   - - -   - - - - -   - - -   - - -   - - -   - - -   - - -   - - - - -   - - -   - - -   - - -   - - -   - - -   - - - - -   - - -   - - -   - - -   - - -   - - -   - - - - -   - - -   - - -   - - -   - - -   - - -   - - - - -   - - -   - - -   - - -   - - -   - - -   - - - - -   - - -   - - -   - - -   - - -   - - -   - - - - -   - - -   - - -   - - -   - - -   - - -   - - - - -   - - -   - - -   - - -   - - -   - - -   - - - - -   - - -   - - -   - - -   - - -   - - -   - - - - -   - - -   - - -   - - -   - - -   - - -   - - - - -   - - -   - - -   - - -   - - -   - - -   - - - - -   - - -   - - -   - - -   - - -   - - -   - - - - -   - - -   - - -   - - -   - - -   - - + + + +   + + From 93a8ff9f923e0396d946950afa6fc183e96720b0 Mon Sep 17 00:00:00 2001 From: Simon Pamies Date: Mon, 13 Jun 2011 20:30:24 +0200 Subject: [PATCH 13/28] Leaderboard working with sorting of single column --- .../sailing/web/browser/functions.py | 12 +++--- .../web/browser/moderator-static/app.js | 41 ++++++++++++++++--- .../web/browser/templates/leaderboard-live.pt | 2 +- 3 files changed, 44 insertions(+), 11 deletions(-) diff --git a/python/src/sailing.web/sailing/web/browser/functions.py b/python/src/sailing.web/sailing/web/browser/functions.py index 434addbdbfd..b047a0b39d0 100644 --- a/python/src/sailing.web/sailing/web/browser/functions.py +++ b/python/src/sailing.web/sailing/web/browser/functions.py @@ -540,21 +540,24 @@ def moderatorLiveData(context, request): view = core.BaseView(context, request) event = view.currentLeaderboardEvent() - sortby = request.params.get('sortby', '') + sortby = request.params.get('sortby', 'name') race_range = request.params.get('races', '1:3') competitor_range = request.params.get('competitors', '1:20') + if race_range in ['null', 'undefined']: + race_range = '1:3' + race_start_index, race_end_index = race_range.split(':') races_list = event.races[int(race_start_index)-1:int(race_end_index)] - competitors = model.CompetitorImpl.queryBy(event=event.name) + competitors = view.competitorsSortedBy(event.name, sortby.strip()) races = [] for racename in races_list: races.append(model.RaceImpl.queryOneBy(name=racename, event=event.name)) # list of competitors with corresponding data - data = {} + data = [] for competitor in competitors: racedata = competitor.races[int(race_start_index)-1:int(race_end_index)] @@ -582,8 +585,7 @@ def moderatorLiveData(context, request): racecounter += 1 - cd = data.setdefault(competitor.name, {}) - cd.update({'raceranks': racedata, 'markranks': markranks, 'legvalues': legvalues, + data.append({'name': competitor.name, 'raceranks': racedata, 'markranks': markranks, 'legvalues': legvalues, 'nationality': competitor.nationality, 'global_rank': competitor.total}) return data diff --git a/python/src/sailing.web/sailing/web/browser/moderator-static/app.js b/python/src/sailing.web/sailing/web/browser/moderator-static/app.js index 909331e9f43..d166a974f13 100644 --- a/python/src/sailing.web/sailing/web/browser/moderator-static/app.js +++ b/python/src/sailing.web/sailing/web/browser/moderator-static/app.js @@ -15,20 +15,26 @@ function loadLeaderboard(races, sortby, competitors) { ); } +function yieldValue(element, newvalue) { + element.html(newvalue); +} + /** * Puts data into the right context for the leaderboard */ function displayLeaderboard(data) { rowid = 1; - for (key in data) { - competitor = data[key]; + for (cpos in data) { + competitor = data[cpos]; + + /* always change global rank */ + $('#clipping-'+rowid+'-1 span').html(competitor.global_rank); name_element = $('#clipping-'+rowid+'-3 span'); - if (true || name_element.html() == key) { + if (name_element.html() != competitor.name) { /* competitor position has changed - refresh whole line */ - name_element.html(key); - $('#clipping-'+rowid+'-1 span').html(competitor.global_rank); + name_element.html(competitor.name); $('#clipping-'+rowid+'-2 span').html(competitor.nationality); /* now set values independent what has been there before */ @@ -55,6 +61,29 @@ function displayLeaderboard(data) { } } else { /* check if values have changed */ + name_element.html(competitor.name); + $('#clipping-'+rowid+'-2 span').html(competitor.nationality); + + for (racerank in competitor.raceranks) { + yieldValue($('#race-'+racepos+'-rankrow-'+rowid), competitor.raceranks[racerank]); + + markpos = 1; + for (markrank in competitor.markranks[racepos-1]) { + yieldValue($('#race-'+racepos+'-mark-'+markpos+'-row-'+rowid), competitor.markranks[racepos-1][markrank]); + + legpos = 1; + for (legvalue in competitor.legvalues[racepos-1][markpos-1]) { + if (legvalue == 0) { + yieldValue($('#race-'+racepos+'-mark-'+markpos+'-legrow-'+rowid), parseFloat(competitor.legvalues[racepos-1][markpos-1][legvalue]).toFixed()); + } else { + yieldValue($('#race-'+racepos+'-mark-'+markpos+'-valrow-'+rowid+'-pos-'+(legpos-1)+' span'), competitor.legvalues[racepos-1][markpos-1][legvalue]); + } + legpos += 1; + } + + markpos += 1; + } + } } rowid += 1; @@ -67,5 +96,7 @@ $(document).ready(function() { $("#rootwrapper").css("height", wHeight); $("#appinterface").css("height", wHeight-131); + $.ajaxSetup({cache:false}); + loadLeaderboard(); }); diff --git a/python/src/sailing.web/sailing/web/browser/templates/leaderboard-live.pt b/python/src/sailing.web/sailing/web/browser/templates/leaderboard-live.pt index 73fb60b8d3a..62c6afcb5cb 100644 --- a/python/src/sailing.web/sailing/web/browser/templates/leaderboard-live.pt +++ b/python/src/sailing.web/sailing/web/browser/templates/leaderboard-live.pt @@ -35,7 +35,7 @@
    - + From 7267e3861a79a3959f58d7e4eda20da1959621a6 Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Mon, 13 Jun 2011 20:34:34 +0200 Subject: [PATCH 14/28] added test that ensures that re-launching tracker for same race parameter yields same tracker --- .../domain/tractracadapter/RaceHandle.java | 5 ++ .../domain/tractracadapter/RaceTracker.java | 14 ++++ .../tractracadapter/impl/RaceHandleImpl.java | 10 ++- .../tractracadapter/impl/RaceTrackerImpl.java | 17 ++++- .../sailing/server/test/RaceTrackerTest.java | 19 ++++- .../sailing/server/RacingEventService.java | 30 +++++--- .../server/RacingEventServiceImpl.java | 70 ++++++++++++------- 7 files changed, 127 insertions(+), 38 deletions(-) diff --git a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/RaceHandle.java b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/RaceHandle.java index 9d349d71914..64176826d29 100755 --- a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/RaceHandle.java +++ b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/RaceHandle.java @@ -25,4 +25,9 @@ public interface RaceHandle { DynamicTrackedEvent getTrackedEvent(); + /** + * The tracker managing the tracking of the race to which this is a handle. + */ + RaceTracker getRaceTracker(); + } diff --git a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/RaceTracker.java b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/RaceTracker.java index d79e9ff14dd..1f90c0436f7 100755 --- a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/RaceTracker.java +++ b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/RaceTracker.java @@ -2,12 +2,22 @@ package com.sap.sailing.domain.tractracadapter; import java.io.IOException; import java.net.MalformedURLException; +import java.net.URI; +import java.net.URL; import com.sap.sailing.domain.base.RaceDefinition; import com.sap.sailing.domain.tracking.DynamicTrackedEvent; +import com.sap.sailing.domain.tracking.TrackedEvent; +import com.sap.sailing.domain.tracking.WindStore; +import com.sap.sailing.util.Util.Triple; public interface RaceTracker { + /** + * Stops tracking the race and removes the {@link TrackedRace} object one gets from calling + * {@link #getTrackedEvent()}.{@link TrackedEvent#getTrackedRace(RaceDefinition) getTrackedRace(}{@link #getRace() getRace())} + * from the {@link #getTrackedEvent() tracked event}. + */ void stop() throws MalformedURLException, IOException, InterruptedException; com.sap.sailing.domain.base.Event getEvent(); @@ -22,5 +32,9 @@ public interface RaceTracker { RaceHandle getRaceHandle(); DynamicTrackedEvent getTrackedEvent(); + + WindStore getWindStore(); + + Triple getURLs(); } diff --git a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceHandleImpl.java b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceHandleImpl.java index a466934ef05..01542a9a04c 100755 --- a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceHandleImpl.java +++ b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceHandleImpl.java @@ -4,17 +4,20 @@ import com.sap.sailing.domain.base.RaceDefinition; import com.sap.sailing.domain.tracking.DynamicTrackedEvent; import com.sap.sailing.domain.tractracadapter.DomainFactory; import com.sap.sailing.domain.tractracadapter.RaceHandle; +import com.sap.sailing.domain.tractracadapter.RaceTracker; import com.tractrac.clientmodule.Event; public class RaceHandleImpl implements RaceHandle { private final Event tractracEvent; private final DomainFactory domainFactory; private final DynamicTrackedEvent trackedEvent; + private final RaceTracker raceTracker; - public RaceHandleImpl(DomainFactory domainFactory, Event tractracEvent, DynamicTrackedEvent trackedEvent) { + public RaceHandleImpl(DomainFactory domainFactory, Event tractracEvent, DynamicTrackedEvent trackedEvent, RaceTracker raceTracker) { this.domainFactory = domainFactory; this.tractracEvent = tractracEvent; this.trackedEvent = trackedEvent; + this.raceTracker = raceTracker; } @Override @@ -32,5 +35,10 @@ public class RaceHandleImpl implements RaceHandle { public DynamicTrackedEvent getTrackedEvent() { return trackedEvent; } + + @Override + public RaceTracker getRaceTracker() { + return raceTracker; + } } diff --git a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceTrackerImpl.java b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceTrackerImpl.java index 6fddf32cfc4..049426bcc33 100755 --- a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceTrackerImpl.java +++ b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceTrackerImpl.java @@ -22,6 +22,7 @@ import com.sap.sailing.domain.tractracadapter.DomainFactory; import com.sap.sailing.domain.tractracadapter.RaceHandle; import com.sap.sailing.domain.tractracadapter.RaceTracker; import com.sap.sailing.domain.tractracadapter.Receiver; +import com.sap.sailing.util.Util.Triple; import com.tractrac.clientmodule.Event; import com.tractrac.clientmodule.data.DataController; import com.tractrac.clientmodule.data.DataController.Listener; @@ -35,6 +36,8 @@ public class RaceTrackerImpl implements Listener, RaceTracker { private final Set receivers; private final DomainFactory domainFactory; private final DynamicTrackedEvent trackedEvent; + private final WindStore windStore; + private final Triple urls; /** * Creates a race tracked for the specified URL/URIs and starts receiving all available existing and future push @@ -60,6 +63,8 @@ public class RaceTrackerImpl implements Listener, RaceTracker { */ protected RaceTrackerImpl(DomainFactory domainFactory, URL paramURL, URI liveURI, URI storedURI, WindStore windStore) throws URISyntaxException, MalformedURLException, FileNotFoundException { + urls = new Triple(paramURL, liveURI, storedURI); + this.windStore = windStore; this.domainFactory = domainFactory; // Read event data from configuration file tractracEvent = KeyValue.setup(paramURL); @@ -87,6 +92,16 @@ public class RaceTrackerImpl implements Listener, RaceTracker { addListenersForStoredDataAndStartController(typeControllers); } + @Override + public Triple getURLs() { + return urls; + } + + @Override + public WindStore getWindStore() { + return windStore; + } + @Override public DynamicTrackedEvent getTrackedEvent() { return trackedEvent; @@ -94,7 +109,7 @@ public class RaceTrackerImpl implements Listener, RaceTracker { @Override public RaceHandle getRaceHandle() { - return new RaceHandleImpl(domainFactory, tractracEvent, getTrackedEvent()); + return new RaceHandleImpl(domainFactory, tractracEvent, getTrackedEvent(), this); } @Override diff --git a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceTrackerTest.java b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceTrackerTest.java index 1e3f7759faa..a4ce1056b32 100755 --- a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceTrackerTest.java +++ b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceTrackerTest.java @@ -2,6 +2,7 @@ package com.sap.sailing.server.test; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotSame; +import static org.junit.Assert.assertSame; import java.io.FileNotFoundException; import java.io.IOException; @@ -83,7 +84,7 @@ public class RaceTrackerTest { @Test public void testStopTracking() throws MalformedURLException, IOException, InterruptedException, URISyntaxException { TrackedEvent oldTrackedEvent = raceHandle.getTrackedEvent(); - TrackedRace oldTrackedRace = oldTrackedEvent.getTrackedRaces().iterator().next(); + TrackedRace oldTrackedRace = getTrackedRace(oldTrackedEvent); service.stopTracking(raceHandle.getEvent()); RaceHandle myRaceHandle = service.addRace(paramUrl, liveUri, storedUri, EmptyWindStore.INSTANCE); TrackedEvent newTrackedEvent = myRaceHandle.getTrackedEvent(); @@ -91,4 +92,20 @@ public class RaceTrackerTest { // expecting a new tracked race to be created when starting over with tracking assertNotSame(oldTrackedRace, newTrackedRace); } + + /** + * This test asserts that tracking the same race twice doesn't create another tracker and in particular no + * new tracked event / tracked race. + */ + @Test + public void testTrackingSameRaceWithoutStopping() throws MalformedURLException, IOException, InterruptedException, URISyntaxException { + TrackedEvent oldTrackedEvent = raceHandle.getTrackedEvent(); + TrackedRace oldTrackedRace = getTrackedRace(oldTrackedEvent); + RaceHandle myRaceHandle = service.addRace(paramUrl, liveUri, storedUri, EmptyWindStore.INSTANCE); + TrackedEvent newTrackedEvent = myRaceHandle.getTrackedEvent(); + TrackedRace newTrackedRace = getTrackedRace(newTrackedEvent); + // expecting a new tracked race to be created when starting over with tracking + assertSame(oldTrackedRace, newTrackedRace); + assertSame(raceHandle.getRaceTracker(), myRaceHandle.getRaceTracker()); + } } diff --git a/java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java b/java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java index 8846d3cd47c..421b6c531db 100755 --- a/java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java +++ b/java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java @@ -46,10 +46,11 @@ public interface RacingEventService { DomainFactory getDomainFactory(); /** - * Defines the event and for each race listed in the JSON document creates a {@link RaceTracker} that starts - * tracking the respective race. The {@link RaceDefinition}s obtained this way are all grouped into the single - * {@link Event} produced for the event listed in the JSON response. Note that the many race trackers will have - * their TracTrac Event each, all with the same name, meaning the same event but being distinct. + * Defines the event and for each race listed in the JSON document that is not already being tracked by this service + * creates a {@link RaceTracker} that starts tracking the respective race. The {@link RaceDefinition}s obtained this + * way are all grouped into the single {@link Event} produced for the event listed in the JSON response. Note that + * the many race trackers will have their TracTrac Event each, all with the same name, meaning the same + * event but being distinct. * * @param jsonURL * URL of a JSON response that contains an "event" object telling the event's name and ID, as well as a @@ -60,22 +61,31 @@ public interface RacingEventService { URISyntaxException, IOException, ParseException, org.json.simple.parser.ParseException; /** - * Adds a single race tracker and starts tracking the race, using the race's parameter URL which delivers the single - * configuration text file for that race. While the result of passing this URL to the TracTrac - * KeyValue.setup is a TracTrac Event, those events only manage a single race. In our - * domain model, we group those races into a single instance of our {@link Event} class. + * If not already tracking the URL/URI/URI combination, adds a single race tracker and starts tracking the race, + * using the race's parameter URL which delivers the single configuration text file for that race. While the result + * of passing this URL to the TracTrac KeyValue.setup is a TracTrac Event, those events + * only manage a single race. In our domain model, we group those races into a single instance of our {@link Event} + * class. *

    * * If this is the first race of an event, the {@link Event} is created as well. If the {@link RaceDefinition} for * the race already exists, it isn't created again. Also, if a {@link RaceTracker} for the given race already - * exists, it is not added again. + * exists, it is not added again.

    + * + * Note that when the race identified by paramURL, liveURI and storedURI is + * already being tracked, then regardless of the windStore selection the existing tracker will be used + * and its race handle will be returned. A log message will indicate a potential wind store mismatch (based on + * {@link WindStore#equals(Object)}). */ RaceHandle addRace(URL paramURL, URI liveURI, URI storedURI, WindStore windStore) throws MalformedURLException, FileNotFoundException, URISyntaxException; /** * Stops tracking all races of the event specified. This will also stop tracking wind for all races of this event. - * See {@link #stopTrackingWind(Event, RaceDefinition)}. + * See {@link #stopTrackingWind(Event, RaceDefinition)}. If there were multiple calls to + * {@link #addRace(URL, URI, URI, WindStore)} with an equal combination of URLs/URIs, the {@link RaceTracker} + * already tracking the race was re-used. The trackers will be stopped by this call regardless of how many calls + * were made that ensured they were tracking. */ void stopTracking(Event event) throws MalformedURLException, IOException, InterruptedException; diff --git a/java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventServiceImpl.java b/java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventServiceImpl.java index ca683019afb..b5aa646282c 100755 --- a/java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventServiceImpl.java +++ b/java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventServiceImpl.java @@ -16,6 +16,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.logging.Logger; import com.sap.sailing.declination.DeclinationService; import com.sap.sailing.domain.base.Event; @@ -34,11 +35,13 @@ import com.sap.sailing.util.Util.Pair; import com.sap.sailing.util.Util.Triple; public class RacingEventServiceImpl implements RacingEventService { + private static final Logger logger = Logger.getLogger(RacingEventServiceImpl.class.getName()); + private final DomainFactory domainFactory; private final Map eventsByName; - private final Map> raceTrackers; + private final Map> raceTrackersByEvent; /** * Remembers the wind tracker and the port on which the UDP receiver with which the wind tracker is @@ -46,13 +49,19 @@ public class RacingEventServiceImpl implements RacingEventService { */ private final Map> windTrackers; + /** + * Remembers the trackers by paramURL/liveURI/storedURI to avoid duplication + */ + private final Map, RaceTracker> raceTrackersByURLs; + private final Map windReceivers; public RacingEventServiceImpl() { domainFactory = DomainFactory.INSTANCE; eventsByName = new HashMap(); - raceTrackers = new HashMap>(); + raceTrackersByEvent = new HashMap>(); windTrackers = new HashMap>(); + raceTrackersByURLs = new HashMap, RaceTracker>(); windReceivers = new HashMap(); } @@ -85,33 +94,44 @@ public class RacingEventServiceImpl implements RacingEventService { @Override public RaceHandle addRace(URL paramURL, URI liveURI, URI storedURI, WindStore windStore) throws MalformedURLException, FileNotFoundException, URISyntaxException { - // FIXME check if a tracker for this parameter combination already exists and if so, return its race handle - RaceTracker tracker = getDomainFactory().createRaceTracker(paramURL, liveURI, storedURI, windStore); - Set trackers = raceTrackers.get(tracker.getEvent()); - if (trackers == null) { - trackers = new HashSet(); - raceTrackers.put(tracker.getEvent(), trackers); - } - trackers.add(tracker); - String eventName = tracker.getEvent().getName(); - Event eventWithName = eventsByName.get(eventName); - if (eventWithName != null) { - if (eventWithName != tracker.getEvent()) { - throw new RuntimeException("Internal error. Two Event objects with equal name "+eventName); + Triple key = new Triple(paramURL, liveURI, storedURI); + RaceTracker tracker = raceTrackersByURLs.get(key); + if (tracker == null) { + tracker = getDomainFactory().createRaceTracker(paramURL, liveURI, storedURI, windStore); + raceTrackersByURLs.put(key, tracker); + Set trackers = raceTrackersByEvent.get(tracker.getEvent()); + if (trackers == null) { + trackers = new HashSet(); + raceTrackersByEvent.put(tracker.getEvent(), trackers); + } + trackers.add(tracker); + String eventName = tracker.getEvent().getName(); + Event eventWithName = eventsByName.get(eventName); + if (eventWithName != null) { + if (eventWithName != tracker.getEvent()) { + throw new RuntimeException("Internal error. Two Event objects with equal name "+eventName); + } + } else { + eventsByName.put(eventName, tracker.getEvent()); } } else { - eventsByName.put(eventName, tracker.getEvent()); + WindStore existingTrackersWindStore = tracker.getWindStore(); + if (!existingTrackersWindStore.equals(windStore)) { + logger.warning("Wind store mismatch. Requested wind store: "+windStore+ + ". Wind store in use by existing tracker: "+existingTrackersWindStore); + } } return tracker.getRaceHandle(); } @Override public void stopTracking(Event event) throws MalformedURLException, IOException, InterruptedException { - if (raceTrackers.containsKey(event)) { - for (RaceTracker raceTracker : raceTrackers.get(event)) { - raceTracker.stop(); + if (raceTrackersByEvent.containsKey(event)) { + for (RaceTracker raceTracker : raceTrackersByEvent.get(event)) { + raceTracker.stop(); // this also removes the TrackedRace from trackedEvent + raceTrackersByURLs.remove(raceTracker.getURLs()); } - raceTrackers.remove(event); + raceTrackersByEvent.remove(event); } if (event != null && event.getName() != null) { eventsByName.remove(event.getName()); @@ -123,19 +143,19 @@ public class RacingEventServiceImpl implements RacingEventService { @Override public void stopTracking(Event event, RaceDefinition race) throws MalformedURLException, IOException, InterruptedException { - if (raceTrackers.containsKey(event)) { - Iterator trackerIter = raceTrackers.get(event).iterator(); + if (raceTrackersByEvent.containsKey(event)) { + Iterator trackerIter = raceTrackersByEvent.get(event).iterator(); while (trackerIter.hasNext()) { RaceTracker raceTracker = trackerIter.next(); if (raceTracker.getRace() == race) { - raceTracker.stop(); + raceTracker.stop(); // this also removes the TrackedRace from trackedEvent trackerIter.remove(); + raceTrackersByURLs.remove(raceTracker.getURLs()); } } } - // FIXME remove TrackedRace from TrackedEvent // if the last tracked race was removed, remove the entire event - if (raceTrackers.get(event).isEmpty()) { + if (raceTrackersByEvent.get(event).isEmpty()) { stopTracking(event); } } From 706e29ca544c1a37b83b97b3077d5434a059aad2 Mon Sep 17 00:00:00 2001 From: Simon Pamies Date: Mon, 13 Jun 2011 20:41:40 +0200 Subject: [PATCH 15/28] Fixed position of leg values --- .../sailing/connector/provider.py | 2 +- .../sailing.web/sailing/web/browser/functions.py | 16 ++++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/python/src/sailing.connector/sailing/connector/provider.py b/python/src/sailing.connector/sailing/connector/provider.py index 51cfeb8fa8d..aefd2cca228 100644 --- a/python/src/sailing.connector/sailing/connector/provider.py +++ b/python/src/sailing.connector/sailing/connector/provider.py @@ -321,7 +321,7 @@ def liveRaceInformation(configurator): # check for cases where calculations from backend yield # strange numbers - this happens in cases where the competitor # has no speed during mark passing - if k in ['Infinity', 'Infinite']: + if k in ['Infinity', 'Infinite'] or float(k) > 150000.0: # use a magic number (that is very unlikely to occur) # to indicate that competitor has no speed diff --git a/python/src/sailing.web/sailing/web/browser/functions.py b/python/src/sailing.web/sailing/web/browser/functions.py index b047a0b39d0..4d41838bae6 100644 --- a/python/src/sailing.web/sailing/web/browser/functions.py +++ b/python/src/sailing.web/sailing/web/browser/functions.py @@ -572,14 +572,18 @@ def moderatorLiveData(context, request): markranks[racecounter] = markranks[racecounter] + competitor.marks[real_racepos] - # prepare values according to UI - # UI: RANK, DSTTRAV, SPEED, VMG, SGAP, DSTGO, ETA - # INTERN: RANK, AVGSPEED, DSTRV, VMG, AVMG, SGAP, ETA, DSTGO iv = competitor.values[real_racepos] - newvalues = [iv[0], iv[2], iv[1], iv[3], iv[5], iv[-1], iv[-2]] - for valpos in range(len(newvalues)): - newvalues[valpos] = ['%.2f' % val for val in newvalues[valpos]] + newvalues = iv + for valpos in range(len(iv)): + nv = ['%.2f' % (val < 15000 and val or 0.0) for val in newvalues[valpos]] + + # prepare values according to UI + # UI: RANK, DSTTRAV, SPEED, VMG, SGAP, DSTGO, ETA + # INTERN: RANK, AVGSPEED, DSTRV, VMG, AVMG, SGAP, ETA, DSTGO + if nv: + nv = [nv[0], nv[2], nv[1], nv[3], nv[5], nv[-1], nv[-2]] + newvalues[valpos] = nv legvalues[racecounter] = legvalues[racecounter] + newvalues From b44c05c5c6349b545fa790a1292ff46d5a680691 Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Mon, 13 Jun 2011 20:56:36 +0200 Subject: [PATCH 16/28] added first simple distance traveled test; made Expedition time conversion test more lenient --- TODO | 6 ++---- .../src/com/sap/sailing/domain/test/TrackTest.java | 11 +++++++++++ .../sailing/domain/base/impl/AbstractDistance.java | 10 ++++++++++ .../tracking/impl/TrackedLegOfCompetitorImpl.java | 2 +- .../test/UDPExpeditionReceiverTest.java | 3 ++- 5 files changed, 26 insertions(+), 6 deletions(-) diff --git a/TODO b/TODO index daf4af420b8..329a3f74ff3 100644 --- a/TODO +++ b/TODO @@ -4,12 +4,10 @@ Axel - What about distance traveled in first leg? It seems to jump too high at the beginning. + - Why is average VMG always zero? + - smoothen / dampen VMG and hence the ETA / sGAP - - Test duplicate addrace for the same race; consider cleaning cache when stopRace/stopEvent is invoked - - - Test duplicate addevent for the same event - - Open test server firewall ports for UDP / Expedition wind integration - test UDP ports diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackTest.java index 5185397d1f6..246ecd3dfc7 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackTest.java @@ -224,4 +224,15 @@ public class TrackTest { } } } + + @Test + public void testDistanceTraveledOnInBetweenSectionFromFixToFix() { + // take second and third fix and compute distance between them + Iterator iter = track.getFixes().iterator(); + iter.next(); // skip first; + GPSFix second = iter.next(); + GPSFix third = iter.next(); + assertEquals(second.getPosition().getDistance(third.getPosition()), + track.getDistanceTraveled(second.getTimePoint(), third.getTimePoint())); + } } diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/AbstractDistance.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/AbstractDistance.java index 8641a6b9474..bd32b85e8c1 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/AbstractDistance.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/AbstractDistance.java @@ -6,6 +6,16 @@ import com.sap.sailing.domain.base.Speed; public abstract class AbstractDistance implements Distance { + @Override + public boolean equals(Object o) { + return (o instanceof Distance) && this.compareTo((Distance) o) == 0; + } + + @Override + public int hashCode() { + return 9128347 ^ (int) getMeters(); + } + @Override public int compareTo(Distance o) { return getMeters() > o.getMeters() ? 1 : getMeters() == o.getMeters() ? 0 : -1; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedLegOfCompetitorImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedLegOfCompetitorImpl.java index 6e7492e252b..0aa508a7df3 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedLegOfCompetitorImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedLegOfCompetitorImpl.java @@ -77,7 +77,7 @@ public class TrackedLegOfCompetitorImpl implements TrackedLegOfCompetitor { if (legStart == null) { return Distance.NULL; } else { - MarkPassing legEnd = getTrackedRace().getMarkPassing(getCompetitor(), getLeg().getTo()); + MarkPassing legEnd = getMarkPassingForLegEnd(); TimePoint end = timePoint; if (legEnd != null && timePoint.compareTo(legEnd.getTimePoint()) > 0) { // timePoint is after leg finish; take leg end and end time point diff --git a/java/com.sap.sailing.expeditionconnector.test/src/com/sap/sailing/expeditionconnector/test/UDPExpeditionReceiverTest.java b/java/com.sap.sailing.expeditionconnector.test/src/com/sap/sailing/expeditionconnector/test/UDPExpeditionReceiverTest.java index 47d804f02b1..40ed7ad3b37 100755 --- a/java/com.sap.sailing.expeditionconnector.test/src/com/sap/sailing/expeditionconnector/test/UDPExpeditionReceiverTest.java +++ b/java/com.sap.sailing.expeditionconnector.test/src/com/sap/sailing/expeditionconnector/test/UDPExpeditionReceiverTest.java @@ -160,7 +160,8 @@ public class UDPExpeditionReceiverTest { assertEquals(19, cal.get(Calendar.DAY_OF_MONTH)); assertEquals(13, cal.get(Calendar.HOUR_OF_DAY)); assertEquals(52, cal.get(Calendar.MINUTE)); - assertEquals(46, cal.get(Calendar.SECOND)); + // for some bizarre reason the conversion doesn't seem to be predictable; a calendar / platform issue? + assertTrue(cal.get(Calendar.SECOND) == 46 || cal.get(Calendar.SECOND) == 45); } @Test From e7d6006bfb6af1fa313835081c26614fdb8f584b Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Mon, 13 Jun 2011 21:30:10 +0200 Subject: [PATCH 17/28] fixed time point check for average velocity made good; fixed localhost default for MongoDB wind store --- .../tracking/impl/TrackedLegOfCompetitorImpl.java | 14 ++++++++------ .../mongodb/impl/MongoWindStoreFactoryImpl.java | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedLegOfCompetitorImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedLegOfCompetitorImpl.java index 0aa508a7df3..36c971e1817 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedLegOfCompetitorImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedLegOfCompetitorImpl.java @@ -245,7 +245,7 @@ public class TrackedLegOfCompetitorImpl implements TrackedLegOfCompetitor { public Speed getAverageVelocityMadeGood(TimePoint timePoint) throws NoWindException { Speed result = null; MarkPassing start = getMarkPassingForLegStart(); - if (start != null && start.getTimePoint().compareTo(timePoint) > 0) { + if (start != null && start.getTimePoint().compareTo(timePoint) <= 0) { MarkPassing end = getMarkPassingForLegEnd(); if (end != null) { TimePoint to; @@ -254,11 +254,13 @@ public class TrackedLegOfCompetitorImpl implements TrackedLegOfCompetitor { } else { to = timePoint; } - Position endPos = getTrackedRace().getTrack(getCompetitor()).getEstimatedPosition(to, false); - Distance d = getWindwardDistance( - getTrackedRace().getTrack(getCompetitor()).getEstimatedPosition(start.getTimePoint(), false), endPos, - to); - result = d.inTime(to.asMillis() - start.getTimePoint().asMillis()); + Position endPos = getTrackedRace().getTrack(getCompetitor()).getEstimatedPosition(to, /* extrapolate */ false); + if (endPos != null) { + Distance d = getWindwardDistance( + getTrackedRace().getTrack(getCompetitor()) + .getEstimatedPosition(start.getTimePoint(), false), endPos, to); + result = d.inTime(to.asMillis() - start.getTimePoint().asMillis()); + } } } return result; diff --git a/java/com.sap.sailing.mongodb/src/com/sap/sailing/mongodb/impl/MongoWindStoreFactoryImpl.java b/java/com.sap.sailing.mongodb/src/com/sap/sailing/mongodb/impl/MongoWindStoreFactoryImpl.java index e1861b95a69..f32cb928e6a 100755 --- a/java/com.sap.sailing.mongodb/src/com/sap/sailing/mongodb/impl/MongoWindStoreFactoryImpl.java +++ b/java/com.sap.sailing.mongodb/src/com/sap/sailing/mongodb/impl/MongoWindStoreFactoryImpl.java @@ -65,7 +65,7 @@ public class MongoWindStoreFactoryImpl implements MongoWindStoreFactory, BundleA } defaultHostName = context.getProperty(MONGO_HOSTNAME); if (defaultHostName == null) { - defaultHostName = "localhost"; + defaultHostName = "127.0.0.1"; } else { logger.log(Level.INFO, "found mongo.hostname="+defaultHostName); } From 0f7daa3ffdf1873d298cc177287f8c327845bb93 Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Mon, 13 Jun 2011 21:41:21 +0200 Subject: [PATCH 18/28] added currentSpeedOverGroundInKnots to showrace output --- .../sap/sailing/domain/tracking/TrackedLegOfCompetitor.java | 3 +++ .../domain/tracking/impl/TrackedLegOfCompetitorImpl.java | 3 ++- .../src/com/sap/sailing/server/ModeratorApp.java | 5 +++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedLegOfCompetitor.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedLegOfCompetitor.java index 7edc0c8afb0..405ef7a64b3 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedLegOfCompetitor.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedLegOfCompetitor.java @@ -4,6 +4,7 @@ import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.Distance; import com.sap.sailing.domain.base.Leg; import com.sap.sailing.domain.base.Speed; +import com.sap.sailing.domain.base.SpeedWithBearing; import com.sap.sailing.domain.base.TimePoint; public interface TrackedLegOfCompetitor { @@ -91,4 +92,6 @@ public interface TrackedLegOfCompetitor { */ Double getEstimatedTimeToNextMarkInSeconds(TimePoint timePoint) throws NoWindException; + SpeedWithBearing getSpeedOverGround(TimePoint at); + } diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedLegOfCompetitorImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedLegOfCompetitorImpl.java index 36c971e1817..f986b3cc386 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedLegOfCompetitorImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedLegOfCompetitorImpl.java @@ -361,7 +361,8 @@ public class TrackedLegOfCompetitorImpl implements TrackedLegOfCompetitor { } } - private SpeedWithBearing getSpeedOverGround(TimePoint at) { + @Override + public SpeedWithBearing getSpeedOverGround(TimePoint at) { if (hasStartedLeg(at)) { return getTrackedRace().getTrack(getCompetitor()).getEstimatedSpeed(at); } else { diff --git a/java/com.sap.sailing.server/src/com/sap/sailing/server/ModeratorApp.java b/java/com.sap.sailing.server/src/com/sap/sailing/server/ModeratorApp.java index 95d975f9730..15e9fe9fc63 100755 --- a/java/com.sap.sailing.server/src/com/sap/sailing/server/ModeratorApp.java +++ b/java/com.sap.sailing.server/src/com/sap/sailing/server/ModeratorApp.java @@ -236,6 +236,11 @@ public class ModeratorApp extends Servlet { TrackedLegOfCompetitor trackedLegOfCompetitor = leg.getTrackedLeg(competitor); if (trackedLegOfCompetitor != null) { jsonCompetitorInLeg.put("name", competitor.getName()); + Speed currentSpeedOverGround = trackedLegOfCompetitor.getSpeedOverGround(timePoint); + if (currentSpeedOverGround != null) { + jsonCompetitorInLeg.put("currentSpeedOverGroundInKnots", + currentSpeedOverGround == null ? null : currentSpeedOverGround.getKnots()); + } Speed averageSpeedOverGround = trackedLegOfCompetitor.getAverageSpeedOverGround(timePoint); if (averageSpeedOverGround != null) { jsonCompetitorInLeg.put("averageSpeedOverGroundInKnots", From b749c4e804516975e4035724b31c89b274d945da Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Mon, 13 Jun 2011 21:45:53 +0200 Subject: [PATCH 19/28] added missing getSpeedOverGround implementation --- .../impl/TracTracTrackedLegOfCompetitor.java | 10 ++++++++++ 1 file changed, 10 insertions(+) mode change 100755 => 100644 java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracTrackedLegOfCompetitor.java diff --git a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracTrackedLegOfCompetitor.java b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracTrackedLegOfCompetitor.java old mode 100755 new mode 100644 index cb7ff26d22a..74b0a4733af --- a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracTrackedLegOfCompetitor.java +++ b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracTrackedLegOfCompetitor.java @@ -7,6 +7,7 @@ import com.sap.sailing.domain.base.Leg; import com.sap.sailing.domain.base.Mile; import com.sap.sailing.domain.base.Position; import com.sap.sailing.domain.base.Speed; +import com.sap.sailing.domain.base.SpeedWithBearing; import com.sap.sailing.domain.base.TimePoint; import com.sap.sailing.domain.base.impl.KilometersPerHourSpeedImpl; import com.sap.sailing.domain.base.impl.KnotSpeedImpl; @@ -139,4 +140,13 @@ public class TracTracTrackedLegOfCompetitor implements TrackedLegOfCompetitor { return trackedRace; } + @Override + public SpeedWithBearing getSpeedOverGround(TimePoint at) { + if (hasStartedLeg(at)) { + return getTrackedRace().getTrack(getCompetitor()).getEstimatedSpeed(at); + } else { + return null; + } + } + } From a07a83469b2c51cb89283f5f3531719ee8149bf5 Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Mon, 13 Jun 2011 21:48:40 +0200 Subject: [PATCH 20/28] No change --- .../tractracadapter/impl/TracTracTrackedLegOfCompetitor.java | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracTrackedLegOfCompetitor.java diff --git a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracTrackedLegOfCompetitor.java b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracTrackedLegOfCompetitor.java old mode 100644 new mode 100755 From 6d9ad23575ffd49601e149d9a1655ab9d61ed578 Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Mon, 13 Jun 2011 22:05:34 +0200 Subject: [PATCH 21/28] use timeOfLastEvent instead of timeOfNewestEvent as default for time point in showrace; increased interval for speed smoothening to 30s of which usually only the left half (15s) is used --- TODO | 5 ----- .../domain/tractracadapter/impl/DomainFactoryImpl.java | 2 +- .../src/com/sap/sailing/server/ModeratorApp.java | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/TODO b/TODO index 329a3f74ff3..8f1642f9632 100644 --- a/TODO +++ b/TODO @@ -1,13 +1,8 @@ - Axel ==== - What about distance traveled in first leg? It seems to jump too high at the beginning. - - Why is average VMG always zero? - - - smoothen / dampen VMG and hence the ETA / sGAP - - Open test server firewall ports for UDP / Expedition wind integration - test UDP ports diff --git a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/DomainFactoryImpl.java b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/DomainFactoryImpl.java index 5871119c315..a83e7d429eb 100755 --- a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/DomainFactoryImpl.java +++ b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/DomainFactoryImpl.java @@ -74,7 +74,7 @@ import difflib.PatchFailedException; public class DomainFactoryImpl implements DomainFactory { private static final Logger logger = Logger.getLogger(DomainFactoryImpl.class.getName()); - private final long millisecondsOverWhichToAverageSpeed = 5000; + private final long millisecondsOverWhichToAverageSpeed = 15000; // TODO clarify how millisecondsOverWhichToAverageWind could be updated and propagated live private final long millisecondsOverWhichToAverageWind = 30000; diff --git a/java/com.sap.sailing.server/src/com/sap/sailing/server/ModeratorApp.java b/java/com.sap.sailing.server/src/com/sap/sailing/server/ModeratorApp.java index 15e9fe9fc63..c61bceeb201 100755 --- a/java/com.sap.sailing.server/src/com/sap/sailing/server/ModeratorApp.java +++ b/java/com.sap.sailing.server/src/com/sap/sailing/server/ModeratorApp.java @@ -183,7 +183,7 @@ public class ModeratorApp extends Servlet { } else { try { TimePoint timePoint = getTimePoint(req, PARAM_NAME_TIME, PARAM_NAME_TIME_MILLIS, - trackedRace.getTimePointOfNewestEvent()==null?MillisecondsTimePoint.now():trackedRace.getTimePointOfNewestEvent()); + trackedRace.getTimePointOfLastEvent()==null?MillisecondsTimePoint.now():trackedRace.getTimePointOfLastEvent()); String sinceUpdateString = req.getParameter(PARAM_NAME_SINCE_UPDATE); if (sinceUpdateString != null) { System.out.println("Blocking..."); From 2f9ec4f693e07e495e45e03396ac2199f627ec23 Mon Sep 17 00:00:00 2001 From: Simon Pamies Date: Mon, 13 Jun 2011 22:16:16 +0200 Subject: [PATCH 22/28] Updated TODO --- TODO | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/TODO b/TODO index daf4af420b8..8610918e242 100644 --- a/TODO +++ b/TODO @@ -36,8 +36,6 @@ Simon + Server: Mehr RAM bestellen + Prüfen, warum in der Map Anzeige manchmal ein Competitor doppelt ist -+ Simulator mit Speed = 1 anschmeissen und dann prüfen was passiert -+ Prüfen warum im live leaderbaord manchmal 4 legs angezeigt werden (max ist 2+1) -+ Prüfen warum der Listener thread manchmal nicht richtig gestoppt wird ++ ANCHOR anzeigen für große Werte (Bei DSTTRV raussuchen was da z.B. groß ist) + Implementierung Leaderboard auf Basis HTML Designer + Wenn Axel Branches eingerichtet hat, dann MongoDBs auf Server startbar machen über supervisord From fe35d208d095052d5c69408d46211b5e76440939 Mon Sep 17 00:00:00 2001 From: Simon Pamies Date: Mon, 13 Jun 2011 22:16:40 +0200 Subject: [PATCH 23/28] Added loader images --- .../static/images/ajax-loader-blackbg.gif | Bin 0 -> 3208 bytes .../browser/static/images/ajax-loader-greybg.gif | Bin 0 -> 3208 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 python/src/sailing.web/sailing/web/browser/static/images/ajax-loader-blackbg.gif create mode 100644 python/src/sailing.web/sailing/web/browser/static/images/ajax-loader-greybg.gif diff --git a/python/src/sailing.web/sailing/web/browser/static/images/ajax-loader-blackbg.gif b/python/src/sailing.web/sailing/web/browser/static/images/ajax-loader-blackbg.gif new file mode 100644 index 0000000000000000000000000000000000000000..f9d0919dc821b65028350646255cf6f9547abfbd GIT binary patch literal 3208 zcmc(ic~BGg0>_u^m1I|+?gkqOlz>D8Ed&+HsX_<=0&)lliXt&8c*`LW1i}##kTZnK zfRaFBh*m^AK&#~tK`jo}TdNOf>w$M2TYJoV4{Yr)@837mw}0;J?9S)&`+mPOD+u&= zb5CFcY~U>bP*L=^Uw`rT^4yyx2^I=BZQ68kV8C!lzrewPZDr-p=Rf%N{?9+X13q5X z|1#$#Z%jztC}yW8r6#fywj^Y1+nFGCOxm$&Ct&>x1kfiRwf;A@f*-k(=M%ns?Qa~u66A3zUTAL(D25TqDR0) zoTxw1(fzr1%I0^u2R4+x-8gPZ+;Jc(ZWV0;KKGl{@Ii;kboPlU_Sn{m;X|?hE{rDs z${X4Uq+b;&VhYX#$oWoDt-y4mXaVQdK4+F}byM-&Kmov7N3N~kPbHHM+JTF?| z8toc+VpWDtBWQ!@nQhv(L+$dGQ?+XjaO=*nz7(9OVj1*dMUqBhF!9oP&4v1{l0G8I zyzUY;v%LA*<;1;`n~6%ngTnFX0d0HUQ{YASv$#a^@tXGXSHNJaqU7DYngvzOs}6jA z+HKTq$eQveK4m)o%Sn8D=Slp>&H@+lTG{*>O~l}FRpg>l)t2DGtp4j>Y;w(r%V-GW z{3x9}VrDNhqqBp%=ClSlr5?co(6IqGNf`x=joYHGf?PJoLRK1xdp_ zNs2^5$>tWuuxRw+m0WORx@9J`)eCLp&<=*Sv=mpfjgqqyn?{*=h*$k@?xU+w%3Ehz&Nmfu=nA2 zPk{FGtmkfT9>;pMmrf9ubX2#u@Ozp(*W;1@& ztfpG_&E^Psf-2H?*4@^bd@kRaXRz0@Va>5=wq|Qvk!sjerOv&QrAxX}WG6B3f-6Aua11dOn z5sghG-mJl3TDh#$TVurahnf!KExJRC51bOza=KN!&Ya`w=?!FOP{dA|3prH84ZNV= zp1D;4^=Ax|)JR2q_R#zaKz4iG_;{wUsXXN*@x1Zr(xi9;r~Ky29lv_tCC2Yv-hF4u z#^KLG`da@=KQx{F!|^*9CWh_o`8x61no5$X?+=Th`A}6J)?fT4Nmk}pH;U4$XK-Al zHiFjqV%s$~a^?G=j!%316ThfLzyyL74uzGi-^H=$D{}Jn4~yFnHDi3nvdEEC$||Q_ z2r8Htn(7B9#9O35nU>r9>_X}rNUX7GH?1UfLw%DD(`Xy?n5bF1Xn%(vSX~(c;<$%p z)k*X2ZmdGAQE(_o502z&mvB<-v7WP4X$4RLe=(yAZvkSXq-Oho)O)p$9#viRE3thP zloay9YczJ$v*gY(Qd%$es%D2$@>64e^xAE=V7Bkfzm6ZCuHfy|07SG+4uDM%huu_L z$$Q7fs6tZ)5Faa zXvGZCDokD`O{s!hp*-rc#G40kGR6J^br$p&yj$=x4Ufu1A+=n}`8Q(8yeS zLiUec(X;z{Y(FjmGTpDBKlUZD0T>QFgZNtdDAv5%R#jwzvo39f28t9 zYih1@ROq4yezb=8WY@r-M08E-4>v9Z)a`ep`PO;TjvukHqZ%7m-@li7PARgG3g`0d zgoi6vzIB#RA7}-SOZohNnA^sJ;027A%q}st`E;(Ko8E#cF#qRB50~4&JxDr zpi>5;p9|A71H`ay5;k;%=ZWXzw*cA|tV6hpxP=p!F{C8Kca%h~fQrBqPYLLrBEd4qpGC9LPMVXrYhOWcNW{Hj@QmdVNt^9Er5!NGFQ|CT5FtdJOjKGlxL1 zf31}_tT&J-h8d8_3=DyJ(e~Fdvs(y3zgL1>9~md%A$J~l{X62B-y`7@tP*%fy!cY6 zmub_=Xs3xm2MaE@a^-jWT6O16cJwozWbhN#lmnO{tPIsZj=KRFYtw-BYSAYhd1Ews* zw|5kPplg_yQxx?s7#rZP9CKerg!FOfV}dJRKjn>WeGBX{ubUk-S4P`wYq|Z* zPbkrfj}5@4!~a(UqVPXfkk-#s1@&xszhY5}(6xfzp~l7g0%u8wOzkl<`mEqP0moKp z1h^}Wa`_Ws3{y`OJa6t$I=X7b#|*3-3L>dayxYe>)6&pnCs%fi3sMm18DC_Piov0C z`LwK1wOZjGjUw8X#slsxh9yl0n2@Heu|r+w8C}bBqJyBc+m*?pp6##CaX3fV^}{9R zAv>+Qh%;wl>5i*|BCD7_(1XZXyCB+Oc)RHjkeM)kH1t}s5O~wMV!0zQp}r>m1<1L& edqn@e6`5y2_-Rq!Tl+Ao%VYyQr~U&zT>k-NbF32p literal 0 HcmV?d00001 diff --git a/python/src/sailing.web/sailing/web/browser/static/images/ajax-loader-greybg.gif b/python/src/sailing.web/sailing/web/browser/static/images/ajax-loader-greybg.gif new file mode 100644 index 0000000000000000000000000000000000000000..6d798ab7f54bc6b8b4799e6cad716910dbaa5b2c GIT binary patch literal 3208 zcmc(iX;2es0*0IPk)vBzyMq%5i~)%V<3LbhI8_J`ARvc;L_j4*1uv9CAP9sbBp_!9 zmr0Za5<_%E!~?trK?c;p!tr)i7Z^{x$8yFwYIngMEo%R6)olOl>gulN`QG=fYF==l zyGIfWU;%FdASfv4_uqa^P2H~1sKq%sm6es(uU$KL_KZ*{6bJ;nGBY1O`0@QOKLZ~x zn}1qz(>5e!Y!I=sQZkZRNt=_hx27hEoKm)LOa*Lyg#g;*qc;CSR|G__IAtLl>~!rdi8!Uy-5{hEY}@8r0KG5;+#01 z!LAKTFWZwQ@D3_)DkKKVPBu`_DTLn;t1X3t;Q^aGp{4?!AknGU=dSNR!Xwq`rH_D# z1Yv)&lgD$P^iA&y_N}jYyJ6fKzwL-u-z?n-eC0o>;e!sd>Fg6z?1Hw5;RAv|SGp#! z=DIEl=~qSz8N5>=($l@q4~3dEqA|?F*(Gb6n(|C$`hIg!%X*5KXiq-gF^2Kx73r$A(|3CYCc_>QVqz+jua{N4QeFKSy>?fdGa z`>4f`4e3vO(scZnllTrUllYHac&?&E>4JJ~)ZkHN^r8yo=FpPd{%hVWB7VemG>m?3 zl*SpcaFANiSfSl>+JZ@?ueV8u1B`>~=*J*<2dsX%j&4L263AySMl{B)9!Xt+lf{kyT@wp zY5Li~j+6?QJ|#z9CXpE~pAj5W5qtaHFJza0qo|;Y_g`FIhL_#)zIPB92lfu0zyISC zpyM3#x%->P0`HEB3H+j-;{H~4AVC&kZg>2&-bQhL#_W#?0H-UMN`E^;H!-})A|Pg# zrh#>%B}$g0jP{##r)?%Nc5cT~`xEtT8z}GWW@e(1a~3Zq<#Gy<6qjfz58jkzm6OK?hx7Li0=kPUE>BsTs>ZeOn)*9JWH(qZ4&F2n2e)rPO+e`;gAhdjpfdu0g;goEZs4RIb~>w(2W&_6v+iSRXTEe8#fqkqpu*=N$-{ zH$ObXA5L0pl@8@tZ}qniYicG?wPq)^JY#*6MvrQB%?4E1qFc1L(;uv>2?H_A)4KM! zWls-UEz-)_B%~KZ3Uo`@=?-Y`>DtUYIjRYaM!U+{2aDK@IIJcY-WD2g#@jb zAzX#ZDkYhrVA+^r9X;WNS|`saOASH{+~AXeHs#GQ6@u6zw5kV`pTcXaRN;pk78h`K$1o7=8&w%ESCd3FI;;4?gx3hwjS5eBR*X z%Wceb;{AB{S$F>=vtn2qLSMH$ln4E}gyiY`ul@>to|rKSEU$LY6PGC}mHFi=c3cUc z1cDyc#hyB2At$emO@)mhJVg#6ew5C(t&H^;XbB<+IaDW%EJQGD5WNae2ap;$dSO)54cB=2fFy+mHYS;yn8_Y0DJ!U`=7kHxZn6w;Z`PGETrl9$fI+kN7kHNBk#f4e$M|>-C-Ff?D-Ne-<>%m~j8B_Loi5=oDZ*qBU=*vVEfc%aY8$aSWo30!`F^g{lL}6W zKvDRE2*hNX5<%`l$tRfslOEblh#No|u#Bfu=K4S;eK&&W!CSzp?D-DY5sO>j2YblL z*AD?>%Tu}Vbuuv#y^MeV+o!h)(GSd5^q&&npZEJp+Y1!6xKS7*2mL=5fi|80$^R4r z3ihqU{KF8;;!qaPflXb?KtWKTV$5S19@fXEjqxsj_mn%fE`A#35oS8{Zb9Q6Jxgy2EUTaIOGEg{t zUH~;WT&0qG#F7zRt9qYDt8s~D9|O|1t2 Date: Mon, 13 Jun 2011 22:17:08 +0200 Subject: [PATCH 24/28] Sorting now seems to work correctly --- .../sailing/web/browser/functions.py | 7 +++- .../web/browser/moderator-static/app.js | 35 ++++++++++++++++--- .../web/browser/templates/leaderboard-live.pt | 22 ++++++------ 3 files changed, 48 insertions(+), 16 deletions(-) diff --git a/python/src/sailing.web/sailing/web/browser/functions.py b/python/src/sailing.web/sailing/web/browser/functions.py index 4d41838bae6..5201863191a 100644 --- a/python/src/sailing.web/sailing/web/browser/functions.py +++ b/python/src/sailing.web/sailing/web/browser/functions.py @@ -543,6 +543,7 @@ def moderatorLiveData(context, request): sortby = request.params.get('sortby', 'name') race_range = request.params.get('races', '1:3') competitor_range = request.params.get('competitors', '1:20') + direction = request.params.get('direction', 'asc'); if race_range in ['null', 'undefined']: race_range = '1:3' @@ -552,6 +553,9 @@ def moderatorLiveData(context, request): competitors = view.competitorsSortedBy(event.name, sortby.strip()) + if direction == 'asc': + competitors.reverse() + races = [] for racename in races_list: races.append(model.RaceImpl.queryOneBy(name=racename, event=event.name)) @@ -592,5 +596,6 @@ def moderatorLiveData(context, request): data.append({'name': competitor.name, 'raceranks': racedata, 'markranks': markranks, 'legvalues': legvalues, 'nationality': competitor.nationality, 'global_rank': competitor.total}) - return data + c_range_start, c_range_end = competitor_range.split(':') + return data[int(c_range_start)-1:int(c_range_end)] diff --git a/python/src/sailing.web/sailing/web/browser/moderator-static/app.js b/python/src/sailing.web/sailing/web/browser/moderator-static/app.js index d166a974f13..d568b396f77 100644 --- a/python/src/sailing.web/sailing/web/browser/moderator-static/app.js +++ b/python/src/sailing.web/sailing/web/browser/moderator-static/app.js @@ -1,20 +1,47 @@ +var global_sortkey = 'name'; +var global_direction = 'desc'; +var global_race = '1:3'; +var global_competitors = '1:20'; + +var loader_image = ""; + /* * Loads leaderboard data. Parameters: * - * races: Slice that indicates which data to load (e.g. "0:2") + * races: Slice that indicates which data to load (e.g. "1:3") * sortby: Sorting parameters (e.g "1,1,1") - * competitors: Slice indicating which competitors to show (e.g. "0:20") + * competitors: Slice indicating which competitors to show (e.g. "1:20") */ -function loadLeaderboard(races, sortby, competitors) { +function loadLeaderboard(races, sortby, competitors, direction) { + showLoader(); $.getJSON('/++/moderatorLiveData', - {races:races, sortby:sortby, competitors:competitors}, + {races:races, sortby:sortby, competitors:competitors, direction:direction}, function(data) { displayLeaderboard(data); + hideLoader(); } ); } +function showLoader() { + $('.refresh-btn').html(loader_image); +} + +function hideLoader() { + $('.refresh-btn').html(''); +} +function sortBy(param, element) { + element.toggleClass('sort-asc').toggleClass('sort-desc'); + + if (element.hasClass('sort-asc')) + global_direction = 'asc'; + else global_direction = 'desc'; + + global_sortkey = param; + loadLeaderboard(global_race, param, global_competitors, global_direction); +} + function yieldValue(element, newvalue) { element.html(newvalue); } diff --git a/python/src/sailing.web/sailing/web/browser/templates/leaderboard-live.pt b/python/src/sailing.web/sailing/web/browser/templates/leaderboard-live.pt index 62c6afcb5cb..0be0a7b8367 100644 --- a/python/src/sailing.web/sailing/web/browser/templates/leaderboard-live.pt +++ b/python/src/sailing.web/sailing/web/browser/templates/leaderboard-live.pt @@ -35,8 +35,8 @@

    - - + +
    @@ -77,7 +77,7 @@ 1 - + @@ -85,7 +85,7 @@
    M${markid} - +
      @@ -100,7 +100,7 @@
    -     +
    @@ -128,22 +128,22 @@ From 98efb3f4f7728739568a74140c3d2d7d1f7dbad3 Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Mon, 13 Jun 2011 22:27:49 +0200 Subject: [PATCH 25/28] increased timeout for declination read-out; notify about mark passings changes only after all of a competitor's known mark passings have been re-established --- .../sap/sailing/declination/test/DeclinationImportTest.java | 2 +- .../sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/DeclinationImportTest.java b/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/DeclinationImportTest.java index 8f4862a82f2..552d9b9aeb1 100755 --- a/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/DeclinationImportTest.java +++ b/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/DeclinationImportTest.java @@ -55,7 +55,7 @@ public class DeclinationImportTest extends AbstractDeclinationTest { public void readOnlineOrFromFile() throws IOException, ClassNotFoundException, ParseException { Declination declination = importer.getDeclination(new DegreePosition(53, 3), new MillisecondsTimePoint(simpleDateFormat.parse("2011-05-27").getTime()), - /* timeoutForOnlineFetchInMilliseconds */ 5000); + /* timeoutForOnlineFetchInMilliseconds */ 10000); assertNotNull(declination); System.out.println(declination); } diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java index 987025b927b..0044ee2b24d 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java @@ -119,6 +119,9 @@ public class DynamicTrackedRaceImpl extends TrackedRaceImpl implements competitorMarkPassings.add(markPassing); getMarkPassingsInOrder(markPassing.getWaypoint()).add(markPassing); updated(markPassing.getTimePoint()); + } + // notify *after* all mark passings have been re-established; should avoid flicker + for (MarkPassing markPassing : markPassings) { notifyListeners(markPassing); } } From 1770fa8896e38ba3349b9292cb32fa77bc54b54c Mon Sep 17 00:00:00 2001 From: Simon Pamies Date: Mon, 13 Jun 2011 22:43:59 +0200 Subject: [PATCH 26/28] Puase and unpause working - tweaked sorting --- .../web/browser/moderator-static/app.js | 27 +++++++++++++++++- .../browser/moderator-static/pause_button.png | Bin 0 -> 165 bytes .../web/browser/moderator-static/screen.css | 4 +-- .../web/browser/templates/leaderboard-live.pt | 2 +- 4 files changed, 29 insertions(+), 4 deletions(-) create mode 100644 python/src/sailing.web/sailing/web/browser/moderator-static/pause_button.png diff --git a/python/src/sailing.web/sailing/web/browser/moderator-static/app.js b/python/src/sailing.web/sailing/web/browser/moderator-static/app.js index d568b396f77..7009ecd5355 100644 --- a/python/src/sailing.web/sailing/web/browser/moderator-static/app.js +++ b/python/src/sailing.web/sailing/web/browser/moderator-static/app.js @@ -6,6 +6,8 @@ var global_competitors = '1:20'; var loader_image = ""; +var listener_paused = false; + /* * Loads leaderboard data. Parameters: * @@ -19,11 +21,33 @@ function loadLeaderboard(races, sortby, competitors, direction) { {races:races, sortby:sortby, competitors:competitors, direction:direction}, function(data) { displayLeaderboard(data); + + global_race = races; + global_sortkey = sortby; + global_competitors = competitors; + global_direction = direction; + hideLoader(); } ); } +function liveRefresh() { + if (listener_paused == false) + loadLeaderboard(global_race, global_sortkey, global_competitors, global_direction); +} + +function toggleListener() { + $('#refresh-button').toggleClass('refresh'); + if ($('#refresh-button').hasClass('refresh')) { + $('#refresh-button').css('background-image', 'url(/moderator-static/refresh-icon.png)'); + listener_paused = true; + } else { + listener_paused = false; + $('#refresh-button').css('background-image', 'url(/moderator-static/pause_button.png)'); + } +} + function showLoader() { $('.refresh-btn').html(loader_image); } @@ -125,5 +149,6 @@ $(document).ready(function() { $.ajaxSetup({cache:false}); - loadLeaderboard(); + loadLeaderboard(global_race, global_sortkey, global_competitors, global_direction); + window.setInterval('liveRefresh()', 5000); }); diff --git a/python/src/sailing.web/sailing/web/browser/moderator-static/pause_button.png b/python/src/sailing.web/sailing/web/browser/moderator-static/pause_button.png new file mode 100644 index 0000000000000000000000000000000000000000..9b81898237af13cf92fc791d67eb05398342f680 GIT binary patch literal 165 zcmeAS@N?(olHy`uVBq!ia0vp^>LAR)0wmQ|&D;m17>k44ofy`glX(f`a29w(7Bet# z3xhBt!>l
    - +
    From cbbffbb3b804fe121d4649f5f48b7f950f68085c Mon Sep 17 00:00:00 2001 From: Simon Pamies Date: Mon, 13 Jun 2011 22:44:20 +0200 Subject: [PATCH 27/28] Added cleaned run configuration --- .../SailingServer (No Proxy, No Tests).launch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/com.sap.sailing.server/SailingServer (No Proxy, No Tests).launch b/java/com.sap.sailing.server/SailingServer (No Proxy, No Tests).launch index 3aa5be308b0..c27228dbfae 100644 --- a/java/com.sap.sailing.server/SailingServer (No Proxy, No Tests).launch +++ b/java/com.sap.sailing.server/SailingServer (No Proxy, No Tests).launch @@ -19,7 +19,7 @@ - + From 31b973602f5455a4001dd8502f48f6be46dd7ed7 Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Tue, 14 Jun 2011 10:51:51 +0200 Subject: [PATCH 28/28] increased max VM heap size to 2G; added comment for refactoring of getEstimatedSpeed --- java/target/start | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/target/start b/java/target/start index a3079140312..b69bcfec51c 100755 --- a/java/target/start +++ b/java/target/start @@ -1 +1 @@ -java -jar plugins/org.eclipse.equinox.launcher_1.2.0.v20110124-0830.jar -console -configuration ./ +java -Xmx2048m -jar plugins/org.eclipse.equinox.launcher_1.2.0.v20110124-0830.jar -console -configuration ./