From abc48cd4983eb48aee52e7bd45409fc61b1114dc Mon Sep 17 00:00:00 2001
From: Axel Uhl <axel.uhl@sap.com>
Date: Sat, 4 Jun 2011 13:28:23 +0200
Subject: [PATCH] use wind "from" direction for TracTrac ResultAPI; improved
 defaults for time points

---
 .../tractracadapter/impl/TracTracTrackedRaceImpl.java |  2 +-
 .../src/com/sap/sailing/server/ModeratorApp.java      | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracTrackedRaceImpl.java b/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracTrackedRaceImpl.java
index 2fe69738ff9..fa1ccce6459 100755
--- a/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracTrackedRaceImpl.java
+++ b/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracTrackedRaceImpl.java
@@ -43,7 +43,7 @@ public class TracTracTrackedRaceImpl extends DynamicTrackedRaceImpl implements D
             resultGeneratorValidFor = timePoint;
             Position p = getTrack(getRace().getCourse().getFirstWaypoint().getBuoys().iterator().next())
                     .getEstimatedPosition(timePoint);
-            resultGenerator.recalcuateWithWind(timePoint.asMillis(), getWind(p, timePoint).getBearing().getDegrees());
+            resultGenerator.recalcuateWithWind(timePoint.asMillis(), getWind(p, timePoint).getFrom().getDegrees());
         }
     }
 
diff --git a/com.sap.sailing.server/src/com/sap/sailing/server/ModeratorApp.java b/com.sap.sailing.server/src/com/sap/sailing/server/ModeratorApp.java
index e6121442913..b95e5daf09c 100755
--- a/com.sap.sailing.server/src/com/sap/sailing/server/ModeratorApp.java
+++ b/com.sap.sailing.server/src/com/sap/sailing/server/ModeratorApp.java
@@ -21,6 +21,7 @@ import com.sap.sailing.domain.base.RaceDefinition;
 import com.sap.sailing.domain.base.Speed;
 import com.sap.sailing.domain.base.TimePoint;
 import com.sap.sailing.domain.base.Waypoint;
+import com.sap.sailing.domain.base.impl.MillisecondsTimePoint;
 import com.sap.sailing.domain.tracking.GPSFix;
 import com.sap.sailing.domain.tracking.GPSFixMoving;
 import com.sap.sailing.domain.tracking.GPSFixTrack;
@@ -129,7 +130,8 @@ public class ModeratorApp extends Servlet {
             resp.sendError(500, "Race not found");
         } else {
             try {
-                TimePoint timePoint = getTimePoint(req, PARAM_NAME_TIME, PARAM_NAME_TIME_MILLIS, trackedRace.getTimePointOfNewestEvent());
+                TimePoint timePoint = getTimePoint(req, PARAM_NAME_TIME, PARAM_NAME_TIME_MILLIS,
+                        trackedRace.getTimePointOfNewestEvent() == null ? MillisecondsTimePoint.now() : trackedRace.getTimePointOfNewestEvent());
                 JSONArray jsonWaypoints = new JSONArray();
                 for (Waypoint waypoint : trackedRace.getRace().getCourse().getWaypoints()) {
                     JSONObject jsonWaypoint = new JSONObject();
@@ -177,7 +179,8 @@ public class ModeratorApp extends Servlet {
             resp.sendError(500, "Race not found");
         } else {
             try {
-                TimePoint timePoint = getTimePoint(req, PARAM_NAME_TIME, PARAM_NAME_TIME_MILLIS, trackedRace.getTimePointOfNewestEvent());
+                TimePoint timePoint = getTimePoint(req, PARAM_NAME_TIME, PARAM_NAME_TIME_MILLIS,
+                        trackedRace.getTimePointOfNewestEvent()==null?MillisecondsTimePoint.now():trackedRace.getTimePointOfNewestEvent());
                 String sinceUpdateString = req.getParameter(PARAM_NAME_SINCE_UPDATE);
                 if (sinceUpdateString != null) {
                     int sinceUpdate = Integer.valueOf(sinceUpdateString);
@@ -291,7 +294,9 @@ public class ModeratorApp extends Servlet {
         for (Event event : getService().getAllEvents()) {
             JSONObject jsonEvent = new JSONObject();
             jsonEvent.put("name", event.getName());
-            jsonEvent.put("boatclass", event.getBoatClass().getName());
+            if (event.getBoatClass() != null) {
+                jsonEvent.put("boatclass", event.getBoatClass().getName());
+            }
             JSONArray jsonCompetitors = new JSONArray();
             for (Competitor competitor : event.getCompetitors()) {
                 JSONObject jsonCompetitor = new JSONObject();