eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-19 20:25:31 +00:00
Code Activity

use wind "from" direction for TracTrac ResultAPI; improved defaults for time points

Browse Source
This commit is contained in:
Axel Uhl
2011-06-04 13:28:23 +02:00
parent e83c4ce989
commit abc48cd498
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracTrackedRaceImpl.java
+1 -1
View File
@@ -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());
}
}
com.sap.sailing.server/src/com/sap/sailing/server/ModeratorApp.java
+8 -3
View File
@@ -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();