eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-03 10:53:49 +00:00
Code Activity

Merge branch 'master' into test

Browse Source
This commit is contained in:
Axel Uhl committed 2011-06-20 00:09:04 +02:00
2 parents 020c57b030 9e1a5aa299
commit 4bdd6740f9
2 files changed
+32 -15
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.server/src/com/sap/sailing/server/ModeratorApp.java
+26 -14
View File
@@ -260,6 +260,15 @@ public class ModeratorApp extends Servlet {
jsonCompetitorInLeg.put("averageSpeedOverGroundInMetersPerSecond",
averageSpeedOverGround.getMetersPerSecond());
}
Speed currentSpeedOverGroundOrAverageSpeedOverGroundIfLegFinished =
trackedLegOfCompetitor.hasFinishedLeg(timePoint) ?
averageSpeedOverGround : currentSpeedOverGround;
if (currentSpeedOverGroundOrAverageSpeedOverGroundIfLegFinished != null) {
jsonCompetitorInLeg.put("currentSpeedOverGroundOrAverageSpeedOverGroundIfLegFinishedInKnots",
currentSpeedOverGroundOrAverageSpeedOverGroundIfLegFinished.getKnots());
jsonCompetitorInLeg.put("currentSpeedOverGroundOrAverageSpeedOverGroundIfLegFinishedInMetersPerSecond",
currentSpeedOverGroundOrAverageSpeedOverGroundIfLegFinished.getMetersPerSecond());
}
Distance distanceTraveled = trackedLegOfCompetitor.getDistanceTraveled(timePoint);
if (distanceTraveled != null) {
jsonCompetitorInLeg.put("distanceTraveledOverGroundInMeters",
@@ -375,21 +384,24 @@ public class ModeratorApp extends Servlet {
jsonEvent.put("competitors", jsonCompetitors);
JSONArray jsonRaces = new JSONArray();
for (RaceDefinition race : event.getAllRaces()) {
JSONObject jsonRace = new JSONObject();
jsonRace.put("name", race.getName());
jsonRace.put("boatclass", race.getBoatClass()==null?"":race.getBoatClass().getName());
TrackedRace trackedRace = getService().getDomainFactory().getOrCreateTrackedEvent(event).getTrackedRace(race);
TimePoint start = trackedRace.getStart();
jsonRace.put("start", start==null?Long.MAX_VALUE:start.asMillis());
JSONArray jsonLegs = new JSONArray();
for (Leg leg : race.getCourse().getLegs()) {
JSONObject jsonLeg = new JSONObject();
jsonLeg.put("start", leg.getFrom().getName());
jsonLeg.put("end", leg.getTo().getName());
jsonLegs.add(jsonLeg);
// don't wait for the arrival of a tracked race; just ignore it if it's not currently being tracked
TrackedRace trackedRace = getService().getDomainFactory().getOrCreateTrackedEvent(event).getExistingTrackedRace(race);
if (trackedRace != null) {
JSONObject jsonRace = new JSONObject();
jsonRace.put("name", race.getName());
jsonRace.put("boatclass", race.getBoatClass() == null ? "" : race.getBoatClass().getName());
TimePoint start = trackedRace.getStart();
jsonRace.put("start", start == null ? Long.MAX_VALUE : start.asMillis());
JSONArray jsonLegs = new JSONArray();
for (Leg leg : race.getCourse().getLegs()) {
JSONObject jsonLeg = new JSONObject();
jsonLeg.put("start", leg.getFrom().getName());
jsonLeg.put("end", leg.getTo().getName());
jsonLegs.add(jsonLeg);
}
jsonRace.put("legs", jsonLegs);
jsonRaces.add(jsonRace);
}
jsonRace.put("legs", jsonLegs);
jsonRaces.add(jsonRace);
}
jsonEvent.put("races", jsonRaces);
eventList.add(jsonEvent);