eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-04 11:23:50 +00:00
Code Activity

added speeds in meters per second to showrace output

Browse Source
This commit is contained in:
Axel Uhl committed 2011-06-14 15:14:13 +02:00
1 parent 7d400ead63
commit 519e5a099e
1 file changed
+9 -1
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.server/src/com/sap/sailing/server/ModeratorApp.java
+9 -1
View File
@@ -213,7 +213,8 @@ public class ModeratorApp extends Servlet {
if (currentWind != null) {
JSONObject jsonWind = new JSONObject();
jsonWind.put("truebearingdeg", currentWind.getBearing().getDegrees());
jsonWind.put("knowspeed", currentWind.getKnots());
jsonWind.put("knotspeed", currentWind.getKnots());
jsonWind.put("meterspersecondspeed", currentWind.getMetersPerSecond());
jsonWind.put("source", trackedRace.getWindSource().toString());
jsonRace.put("wind", jsonWind);
}
@@ -240,11 +241,15 @@ public class ModeratorApp extends Servlet {
if (currentSpeedOverGround != null) {
jsonCompetitorInLeg.put("currentSpeedOverGroundInKnots",
currentSpeedOverGround == null ? null : currentSpeedOverGround.getKnots());
jsonCompetitorInLeg.put("currentSpeedOverGroundInMetersPerSecond",
currentSpeedOverGround == null ? null : currentSpeedOverGround.getMetersPerSecond());
}
Speed averageSpeedOverGround = trackedLegOfCompetitor.getAverageSpeedOverGround(timePoint);
if (averageSpeedOverGround != null) {
jsonCompetitorInLeg.put("averageSpeedOverGroundInKnots",
averageSpeedOverGround.getKnots());
jsonCompetitorInLeg.put("averageSpeedOverGroundInMetersPerSecond",
averageSpeedOverGround.getMetersPerSecond());
}
Distance distanceTraveled = trackedLegOfCompetitor.getDistanceTraveled(timePoint);
if (distanceTraveled != null) {
@@ -255,6 +260,7 @@ public class ModeratorApp extends Servlet {
Speed velocityMadeGood = trackedLegOfCompetitor.getVelocityMadeGood(timePoint);
if (velocityMadeGood != null) {
jsonCompetitorInLeg.put("velocityMadeGoodInKnots", velocityMadeGood.getKnots());
jsonCompetitorInLeg.put("velocityMadeGoodInMetersPerSecond", velocityMadeGood.getMetersPerSecond());
}
} catch (NoWindException e) {
// well, we don't know the wind direction... then no VMG will be shown...
@@ -265,6 +271,8 @@ public class ModeratorApp extends Servlet {
if (averageVelocityMadeGood != null) {
jsonCompetitorInLeg.put("averageVelocityMadeGoodInKnots",
averageVelocityMadeGood.getKnots());
jsonCompetitorInLeg.put("averageVelocityMadeGoodInMetersPerSecond",
averageVelocityMadeGood.getMetersPerSecond());
}
} catch (NoWindException e1) {
// well, we don't know the wind direction... then no average VMG will be shown...